Fix issue where loading the v6 schema overwrites all the custom validators

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

@@ -10,6 +10,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -73,7 +74,7 @@ static URI extractChildId(URI parentScopeId, Object childJson, String idKeyword)
     SchemaLoader.SchemaLoaderBuilder initChildLoader() {
         SchemaLoader.SchemaLoaderBuilder rval = SchemaLoader.builder()
                 .httpClient(this.config.httpClient)
-                .formatValidators(this.config.formatValidators)
+                .formatValidators(new HashMap<>(this.config.formatValidators))
                 .resolutionScope(id)
                 .schemaJson(schemaJson)
                 .rootSchemaJson(rootSchemaJson)

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

@@ -106,7 +106,9 @@ public SchemaLoaderBuilder addFormatValidator(String formatName,
 
         public SchemaLoaderBuilder draftV6Support() {
             this.specVersion = DRAFT_6;
-            this.formatValidators = new HashMap<>(DRAFT_6.defaultFormatValidators());
+            DRAFT_6.defaultFormatValidators().forEach((formatName, validator) -> {
+                addFormatValidator(formatName, validator);
+            });
             return this;
         }
 

tests/src/test/java/org/everit/json/schema/IssueTest.java

@@ -77,12 +77,33 @@ private static JSONObject fileAsJson(File file) {
         }
     }
 
+    static class EvenCharNumValidator implements FormatValidator {
+        @Override
+        public Optional<String> validate(final String subject) {
+            if (subject.length() % 2 == 0) {
+                return Optional.empty();
+            } else {
+                return Optional.of(String.format("the length of srtring [%s] is odd", subject));
+            }
+        }
+
+        @Override
+        public String formatName() {
+            return "evenlength";
+        }
+    }
+
     private Schema loadSchema() {
         Optional<File> schemaFile = fileByName("schema.json");
         try {
             if (schemaFile.isPresent()) {
                 JSONObject schemaObj = fileAsJson(schemaFile.get());
-                return SchemaLoader.load(schemaObj);
+                return SchemaLoader.builder()
+                    .addFormatValidator(new IssueTest.EvenCharNumValidator())
+                    .schemaJson(schemaObj)
+                    .build()
+                    .load()
+                    .build();
             }
             throw new RuntimeException(issueDir.getCanonicalPath() + "/schema.json is not found");
         } catch (IOException e) {
@@ -100,10 +121,13 @@ private void stopJetty() {
     public void test() {
         Assume.assumeFalse("issue dir starts with 'x' - ignoring", issueDir.getName().startsWith("x"));
         fileByName("remotes").ifPresent(this::initJetty);
-        Schema schema = loadSchema();
-        fileByName("subject-valid.json").ifPresent(file -> validate(file, schema, true));
-        fileByName("subject-invalid.json").ifPresent(file -> validate(file, schema, false));
-        stopJetty();
+        try {
+            Schema schema = loadSchema();
+            fileByName("subject-valid.json").ifPresent(file -> validate(file, schema, true));
+            fileByName("subject-invalid.json").ifPresent(file -> validate(file, schema, false));
+        } finally {
+            stopJetty();
+        }
     }
 
     private Validator createValidator() {

tests/src/test/resources/org/everit/json/schema/issues/issue152/remotes/customformat-schema.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "maxLength": 10,
+      "minLength": 3,
+      "format": "evenlength"
+    }
+  },
+  "required": [
+    "id"
+  ]
+}

tests/src/test/resources/org/everit/json/schema/issues/issue152/schema.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$ref": "http://localhost:1234/customformat-schema.json"
+}

tests/src/test/resources/org/everit/json/schema/issues/issue152/subject-invalid.json

@@ -0,0 +1,4 @@
+{
+	"id": "everitorg"
+}
+