fixing #333 - mapping resolutionScope to root schema location

Author: erosb

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

@@ -176,8 +176,8 @@ Schema.Builder<?> lookup(String relPointerString, JsonObject ctx) {
         JsonObject containingDocument = result.getContainingDocument();
         SchemaLocation resultLocation = result.getQueryResult().ls.pointerToCurrentObj;
         SchemaLoader childLoader = ls.initNewDocumentLoader()
-                .pointerToCurrentObj(resultLocation)
                 .resolutionScope(resolutionScope)
+                .pointerToCurrentObj(resultLocation)
                 .schemaJson(result.getQueryResult())
                 .rootSchemaJson(containingDocument).build();
         Schema referredSchema = childLoader.load().build();

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

@@ -195,6 +195,7 @@ public SchemaLoaderBuilder resolutionScope(String id) {
 
         public SchemaLoaderBuilder resolutionScope(URI id) {
             this.id = id;
+            this.pointerToCurrentObj = new SchemaLocation(id, emptyList());
             return this;
         }
 

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

@@ -1,6 +1,7 @@
 package org.everit.json.schema.loader;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static org.everit.json.schema.JSONMatcher.sameJsonAs;
 import static org.everit.json.schema.TestSupport.asStream;
@@ -20,6 +21,8 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -41,6 +44,7 @@
 import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.SchemaException;
+import org.everit.json.schema.SchemaLocation;
 import org.everit.json.schema.StringSchema;
 import org.everit.json.schema.TestSupport;
 import org.everit.json.schema.TrueSchema;
@@ -811,4 +815,14 @@ public void httpsSchemaURI() {
     }
 
     private class CustomDateTimeFormatValidator extends DateTimeFormatValidator {}
+
+    @Test
+    public void explicitlySetResolutionScope_isMappedToSchemaLocation() throws URISyntaxException {
+        Schema actual = SchemaLoader.builder()
+            .resolutionScope("http://example.org")
+            .schemaJson(new JSONObject("{}"))
+            .build().load().build();
+        assertEquals(new SchemaLocation(new URI("http://example.org"), emptyList()), actual.getLocation());
+    }
+
 }