test for keeping format names of custom formats

Author: erosb

core/src/main/java/org/everit/json/schema/loader/SchemaLoader.java

@@ -77,7 +77,19 @@ public static class SchemaLoaderBuilder {
 
         public SchemaLoaderBuilder addFormatValidator(final String formatName,
                 final FormatValidator formatValidator) {
-            formatValidators.put(formatName, formatValidator);
+            FormatValidator wrappingFormatValidator = new FormatValidator() {
+
+                @Override
+                public Optional<String> validate(String subject) {
+                    return formatValidator.validate(subject);
+                }
+
+                @Override
+                public String formatName() {
+                    return formatName;
+                }
+            };
+            formatValidators.put(formatName, wrappingFormatValidator);
             return this;
         }
 

core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java

@@ -25,6 +25,8 @@
 
 import java.util.Optional;
 
+import static org.junit.Assert.assertEquals;
+
 public class CustomFormatValidatorTest {
 
     private final ResourceLoader loader = ResourceLoader.DEFAULT;
@@ -39,6 +41,11 @@ public Optional<String> validate(final String subject) {
                 return Optional.of(String.format("the length of srtring [%s] is odd", subject));
             }
         }
+
+        @Override
+        public String formatName() {
+            return "evenlength";
+        }
     }
 
     @Test
@@ -52,7 +59,20 @@ public void test() {
             Assert.fail("did not throw exception");
         } catch (ValidationException ve) {
         }
+    }
 
+    @Test
+    public void nameOverride() {
+        JSONObject rawSchemaJson = loader.readObj("customformat-schema.json");
+        JSONObject idPropSchema = (JSONObject) rawSchemaJson.query("/properties/id");
+        idPropSchema.put("format", "somethingelse");
+        SchemaLoader schemaLoader = SchemaLoader.builder()
+                .schemaJson(rawSchemaJson)
+                .addFormatValidator("somethingelse", new EvenCharNumValidator())
+                .build();
+        Object actual = new JSONObject(schemaLoader.load().build().toString())
+                .query("/properties/id/format");
+        assertEquals("somethingelse", actual);
     }
 
 }