Add support for subschema references in getSchema(URI) (networknt#619)

Author: Matti Hansson

src/main/java/com/networknt/schema/JsonSchema.java

@@ -26,6 +26,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.util.*;
 import java.util.Map.Entry;
@@ -53,7 +54,6 @@ public class JsonSchema extends BaseJsonValidator {
      * 'id' would still be able to specify an absolute uri.
      */
     private final URI currentUri;
-
     private JsonValidator requiredValidator = null;
 
     private JsonValidator unevaluatedPropertiesValidator = null;
@@ -80,7 +80,7 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
               validationContext.getConfig() != null ? validationContext.getConfig().getApplyDefaultsStrategy() : null);
         this.validationContext = validationContext;
         this.metaSchema = validationContext.getMetaSchema();
-        this.currentUri = this.combineCurrentUriWithIds(currentUri, schemaNode);
+        this.currentUri = currentUri = this.combineCurrentUriWithIds(currentUri, schemaNode);
         if (validationContext.getConfig() != null) {
             keywordWalkListenerRunner = new DefaultKeywordWalkListenerRunner(this.validationContext.getConfig().getKeywordWalkListenersMap());
             if (validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
@@ -98,6 +98,13 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
             if (fragmentSchemaNode == null) {
                 throw new JsonSchemaException("Fragment " + fragment + " cannot be resolved");
             }
+            URI currentUriWithoutFragment;
+            try {
+                currentUriWithoutFragment = new URI(currentUri.getScheme(), currentUri.getSchemeSpecificPart(), null);
+            } catch (URISyntaxException ex) {
+                throw new JsonSchemaException("Unable to create URI without fragment from " + currentUri + ": " + ex.getMessage());
+            }
+            this.parentSchema = new JsonSchema(this.validationContext, this.schemaPath, currentUriWithoutFragment, this.schemaNode, this.parentSchema);
             this.schemaPath = fragment;
             this.schemaNode = fragmentSchemaNode;
         }

src/test/java/com/networknt/schema/Issue619Test.java

@@ -40,7 +40,7 @@ public void setup() throws Exception {
 
     @Test
     public void checkThatBundledSchemaLoadsAndValidatesCorrectly() throws Exception {
-        JsonSchema rootSchema = factory.getSchema(new URI("resource:data/issue619.json"));
+        JsonSchema rootSchema = factory.getSchema(new URI("resource:schema/issue619.json"));
 
         assertTrue(rootSchema.validate(one).isEmpty());
         assertTrue(rootSchema.validate(two).isEmpty());
@@ -49,7 +49,7 @@ public void checkThatBundledSchemaLoadsAndValidatesCorrectly() throws Exception
 
     @Test
     public void checkThatSchemaThatReferencesBundledSchemaLoadsAndValidatesCorrectly() {
-        JsonSchema referencingRootSchema = factory.getSchema("{ \"$ref\": \"resource:data/issue619.json\" }");
+        JsonSchema referencingRootSchema = factory.getSchema("{ \"$ref\": \"resource:schema/issue619.json\" }");
 
         assertTrue(referencingRootSchema.validate(one).isEmpty());
         assertTrue(referencingRootSchema.validate(two).isEmpty());
@@ -58,7 +58,7 @@ public void checkThatSchemaThatReferencesBundledSchemaLoadsAndValidatesCorrectly
 
     @Test
     public void checkThatUriThatPointsToEmptyFragmentLoadsAndValidatesCorrectly() throws Exception {
-        JsonSchema rootSchema = factory.getSchema(new URI("resource:data/issue619.json#"));
+        JsonSchema rootSchema = factory.getSchema(new URI("resource:schema/issue619.json#"));
 
         assertTrue(rootSchema.validate(one).isEmpty());
         assertTrue(rootSchema.validate(two).isEmpty());
@@ -67,7 +67,7 @@ public void checkThatUriThatPointsToEmptyFragmentLoadsAndValidatesCorrectly() th
 
     @Test
     public void checkThatSchemaThatReferencesEmptyFragmentLoadsAndValidatesCorrectly() {
-        JsonSchema referencingRootSchema = factory.getSchema("{ \"$ref\": \"resource:data/issue619.json#\" }");
+        JsonSchema referencingRootSchema = factory.getSchema("{ \"$ref\": \"resource:schema/issue619.json#\" }");
 
         assertTrue(referencingRootSchema.validate(one).isEmpty());
         assertTrue(referencingRootSchema.validate(two).isEmpty());
@@ -76,7 +76,7 @@ public void checkThatSchemaThatReferencesEmptyFragmentLoadsAndValidatesCorrectly
 
     @Test
     public void loadingSchemaWithUriThatPointsToOneShouldOnlyValidateOne() throws Exception {
-        JsonSchema oneSchema = factory.getSchema(new URI("resource:data/issue619.json#/definitions/one"));
+        JsonSchema oneSchema = factory.getSchema(new URI("resource:schema/issue619.json#/definitions/one"));
 
         assertTrue(oneSchema.validate(one).isEmpty());
         assertFalse(oneSchema.validate(two).isEmpty());
@@ -85,13 +85,31 @@ public void loadingSchemaWithUriThatPointsToOneShouldOnlyValidateOne() throws Ex
 
     @Test
     public void referencingSchemaWithUriThatPointsToTwoShouldOnlyValidateTwo() {
-        JsonSchema referencingTwoSchema = factory.getSchema("{ \"$ref\": \"resource:data/issue619.json#/definitions/two\" }");
+        JsonSchema referencingTwoSchema = factory.getSchema("{ \"$ref\": \"resource:schema/issue619.json#/definitions/two\" }");
 
         assertFalse(referencingTwoSchema.validate(one).isEmpty());
         assertTrue(referencingTwoSchema.validate(two).isEmpty());
         assertFalse(referencingTwoSchema.validate(three).isEmpty());
     }
 
+    @Test
+    public void loadingSchemaWithUriThatPointsToNodeThatInTurnReferencesOneShouldOnlyValidateOne() throws Exception {
+        JsonSchema oneSchema = factory.getSchema(new URI("resource:schema/issue619.json#/definitions/refToOne"));
+
+        assertTrue(oneSchema.validate(one).isEmpty());
+        assertFalse(oneSchema.validate(two).isEmpty());
+        assertFalse(oneSchema.validate(three).isEmpty());
+    }
+
+    @Test
+    public void referencingSchemaWithUriThatPointsToNodeThatInTurnReferencesOneShouldOnlyValidateOne() {
+        JsonSchema referencingTwoSchema = factory.getSchema("{ \"$ref\": \"resource:schema/issue619.json#/definitions/refToOne\" }");
+
+        assertTrue(referencingTwoSchema.validate(one).isEmpty());
+        assertFalse(referencingTwoSchema.validate(two).isEmpty());
+        assertFalse(referencingTwoSchema.validate(three).isEmpty());
+    }
+
     @Test
     public void loadingSchemaWithUriThatPointsToSchemaThatDoesNotExistShouldFail() {
         assertThrows(JsonSchemaException.class, () -> factory.getSchema(new URI("resource:data/schema-that-does-not-exist.json#/definitions/something")));
@@ -106,12 +124,12 @@ public void referencingSchemaWithUriThatPointsToSchemaThatDoesNotExistShouldFail
 
     @Test
     public void loadingSchemaWithUriThatPointsToNodeThatDoesNotExistShouldFail() {
-        assertThrows(JsonSchemaException.class, () -> factory.getSchema(new URI("resource:data/issue619.json#/definitions/node-that-does-not-exist")));
+        assertThrows(JsonSchemaException.class, () -> factory.getSchema(new URI("resource:schema/issue619.json#/definitions/node-that-does-not-exist")));
     }
 
     @Test
     public void referencingSchemaWithUriThatPointsToNodeThatDoesNotExistShouldFail() {
-        JsonSchema referencingNonexistentSchema = factory.getSchema("{ \"$ref\": \"resource:data/issue619.json#/definitions/node-that-does-not-exist\" }");
+        JsonSchema referencingNonexistentSchema = factory.getSchema("{ \"$ref\": \"resource:schema/issue619.json#/definitions/node-that-does-not-exist\" }");
 
         assertThrows(JsonSchemaException.class, () -> referencingNonexistentSchema.validate(one));
     }

src/test/resources/data/issue619.json renamed to src/test/resources/schema/issue619.json

@@ -16,6 +16,9 @@
     "two": {
       "type": "integer",
       "enum": [2]
+    },
+    "refToOne": {
+      "$ref": "#/definitions/one"
     }
   }
 }