code cleanup in child loader initialization

 * adding `LoaderConfig#initLoader()` which creates a new SchemaLoaderBuilder, partially initialized wit the config
 * renaming `LoadingState#initChildLoader()` to `#initNewDocumentLoader()` which is just a copy of config plus pointers
 currently under resolution
 * removing duplicate value copies in ReferenceLookup and LoadingState

Author: erosb

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

@@ -3,6 +3,8 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Objects.requireNonNull;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_4;
+import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
+import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_7;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -58,4 +60,25 @@ static LoaderConfig defaultV4Config() {
         this.regexpFactory = requireNonNull(regexpFactory, "regexpFactory cannot be null");
     }
 
+    /**
+     * Creates a new loader builder with {@code this} configuration
+     *
+     * @return
+     */
+    SchemaLoader.SchemaLoaderBuilder initLoader() {
+        SchemaLoader.SchemaLoaderBuilder loaderBuilder = SchemaLoader.builder()
+                .schemaClient(this.schemaClient)
+                .useDefaults(this.useDefaults)
+                .regexpFactory(this.regexpFactory)
+                .nullableSupport(this.nullableSupport)
+                .formatValidators(new HashMap<>(this.formatValidators));
+        loaderBuilder.schemasByURI = schemasByURI;
+        if (DRAFT_6.equals(specVersion)) {
+            loaderBuilder.draftV6Support();
+        } else if (DRAFT_7.equals(specVersion)) {
+            loaderBuilder.draftV7Support();
+        }
+        return loaderBuilder;
+    }
+
 }

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

@@ -2,15 +2,12 @@
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
-import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_7;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -70,25 +67,8 @@ static URI extractChildId(URI parentScopeId, Object childJson, String idKeyword)
         this.schemaJson.ls = this;
     }
 
-    SchemaLoader.SchemaLoaderBuilder initChildLoader() {
-        SchemaLoader.SchemaLoaderBuilder rval = SchemaLoader.builder()
-                .schemaClient(this.config.schemaClient)
-                .useDefaults(this.config.useDefaults)
-                .regexpFactory(this.config.regexpFactory)
-                .nullableSupport(this.config.nullableSupport)
-                .formatValidators(new HashMap<>(this.config.formatValidators))
-                .resolutionScope(id)
-                .schemaJson(schemaJson)
-                .rootSchemaJson(rootSchemaJson)
-                .pointerSchemas(pointerSchemas)
-                .pointerToCurrentObj(pointerToCurrentObj);
-        rval.schemasByURI = this.config.schemasByURI;
-        if (DRAFT_6.equals(specVersion())) {
-            rval.draftV6Support();
-        } else if (DRAFT_7.equals(specVersion())) {
-            rval.draftV7Support();
-        }
-        return rval;
+    SchemaLoader.SchemaLoaderBuilder initNewDocumentLoader() {
+        return config.initLoader().pointerSchemas(pointerSchemas);
     }
 
     private Object getRawChildOfObject(JsonObject obj, String key) {

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

@@ -159,7 +159,7 @@ Schema.Builder<?> lookup(String relPointerString, JsonObject ctx) {
 
         URI resolutionScope = !isSameDocumentRef(absPointerString) ? withoutFragment(absPointerString) : ls.id;
         JsonObject containingDocument = result.getContainingDocument();
-        SchemaLoader childLoader = ls.initChildLoader()
+        SchemaLoader childLoader = ls.initNewDocumentLoader()
                 .pointerToCurrentObj(SchemaLocation.parseURI(absPointerString))
                 .resolutionScope(resolutionScope)
                 .schemaJson(result.getQueryResult())