Finish configuration error messages conversion/improvements

Signed-off-by: Francis Galiegue <[email protected]>
rjainOS2015 · Jun 14, 2013 · c522aea · c522aea
1 parent 308e0ab
commit c522aea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java b/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java
@@ -187,8 +187,7 @@ private static Constructor<? extends KeywordValidator> getConstructor(
 
     private static NodeType checkType(final NodeType type)
     {
-        BUNDLE.checkNotNull(type, "nullType");
-        return type;
+        return BUNDLE.checkNotNull(type, "nullType");
     }
 
     private static NodeType[] checkTypes(final NodeType... types)

diff --git a/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java b/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java
@@ -138,7 +138,7 @@ public LibraryBuilder addFormatAttribute(final String name,
         final FormatAttribute attribute)
     {
         removeFormatAttribute(name);
-        BUNDLE.checkNotNull(attribute, "nullAttribute");
+        BUNDLE.checkNotNullPrintf(attribute, "nullAttribute", name);
         formatAttributes.addEntry(name, attribute);
         return this;
     }

diff --git a/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties b/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties
@@ -15,6 +15,6 @@ noChecker = attempt to build keyword "%s" without a syntax checker
 malformedKeyword = attempt to build keyword "%s" with a validator but no \
   digester
 nullFormat = format attribute name cannot be null
-nullAttribute = format attribute cannot be null
-nullKeyword = keyword cannot be null
-nullType = type must not be null
+nullAttribute = attempt to register null implementation of format attribute "%s"
+nullKeyword = attempt to add null keyword to library
+nullType = null type argument to digester constructor
diff --git a/src/test/java/com/github/fge/jsonschema/library/LibraryBuilderTest.java b/src/test/java/com/github/fge/jsonschema/library/LibraryBuilderTest.java
@@ -72,7 +72,8 @@ public void cannotAddNullFormatAttribute()
             Library.newBuilder().addFormatAttribute("foo", null);
             fail("No exception thrown!!");
         } catch (NullPointerException e) {
-            assertEquals(e.getMessage(), BUNDLE.getMessage("nullAttribute"));
+            assertEquals(e.getMessage(),
+                BUNDLE.printf("nullAttribute", "foo"));
         }
     }