adding more tests & following relative URIs during schema loading

Author: erosb

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

@@ -223,6 +223,28 @@ public static Schema load(final JSONObject schemaJson, final SchemaClient httpCl
     return loader.load().build();
   }
 
+  /**
+   * Returns the absolute URI without its fragment part.
+   *
+   * @param fullUri
+   *          the abslute URI
+   * @return the URI without the fragment part
+   */
+  static URI withoutFragment(final String fullUri) {
+    int hashmarkIdx = fullUri.indexOf('#');
+    String rval;
+    if (hashmarkIdx == -1) {
+      rval = fullUri;
+    } else {
+      rval = fullUri.substring(0, hashmarkIdx);
+    }
+    try {
+      return new URI(rval);
+    } catch (URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   private final SchemaClient httpClient;
 
   private URI id = null;
@@ -547,8 +569,9 @@ private Schema.Builder<?> lookupReference(final String relPointerString, final J
     pointerSchemas.put(absPointerString, refBuilder);
     QueryResult result = pointer.query();
     JSONObject resultObject = extend(withoutRef(ctx), result.getQueryResult());
-    SchemaLoader childLoader = selfBuilder().resolutionScope(isExternal ? null : id)
-        .schemaJson(resultObject)
+    SchemaLoader childLoader =
+            selfBuilder().resolutionScope(isExternal ? withoutFragment(absPointerString) : id)
+            .schemaJson(resultObject)
             .rootSchemaJson(result.getContainingDocument()).build();
     Schema referredSchema = childLoader.load().build();
     refBuilder.build().setReferredSchema(referredSchema);

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

@@ -101,13 +101,13 @@ public void booleanSchema() {
   public void builderhasDefaultFormatValidators() {
     SchemaLoader actual = SchemaLoader.builder().schemaJson(get("booleanSchema")).build();
     Assert
-        .assertTrue(actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
+    .assertTrue(actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("uri").get() instanceof URIFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("email").get() instanceof EmailFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("ipv4").get() instanceof IPV4Validator);
     Assert.assertTrue(actual.getFormatValidator("ipv6").get() instanceof IPV6Validator);
     Assert
-        .assertTrue(actual.getFormatValidator("hostname").get() instanceof HostnameFormatValidator);
+    .assertTrue(actual.getFormatValidator("hostname").get() instanceof HostnameFormatValidator);
   }
 
   @Test
@@ -424,4 +424,16 @@ public void unsupportedFormat() {
     schema.put("format", "unknown");
     SchemaLoader.builder().schemaJson(schema).build().load();
   }
+
+  @Test
+  public void withoutFragment() {
+    String actual = SchemaLoader.withoutFragment("http://example.com#frag").toString();
+    Assert.assertEquals("http://example.com", actual);
+  }
+
+  @Test
+  public void withoutFragmentNoFragment() {
+    String actual = SchemaLoader.withoutFragment("http://example.com").toString();
+    Assert.assertEquals("http://example.com", actual);
+  }
 }

tests/src/test/resources/org/everit/json/schema/relative-uri/schema/directory/subschemas.json

@@ -0,0 +1,8 @@
+{
+	"definitions" : {
+		"Identifier" : {
+			"type" : "string",
+			"maxLength" : 10
+		}
+	}
+}

tests/src/test/resources/org/everit/json/schema/relative-uri/schema/props.json

@@ -4,7 +4,8 @@
 			"type" : "object",
 			"properties" : {
 				"a" : { "$ref" : "#/definitions/Size" },
-				"b" : { "$ref" : "#/definitions/Size" }
+				"b" : { "$ref" : "#/definitions/Size" },
+				"id" : { "$ref" : "directory/subschemas.json#/definitions/Identifier"}
 			}
 		},
 		"Size" : {