Merge pull request #207 from andersonf/bugfix/ref-with-name-duplicate-files

Fixing ref validation with same name but different files

Author: stevehu

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

@@ -45,6 +45,8 @@ public RefValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSch
     }
 
     static JsonSchemaRef getRefSchema(JsonSchema parentSchema, ValidationContext validationContext, String refValue) {
+        final String refValueOriginal = refValue;
+
         if (!refValue.startsWith(REF_CURRENT)) {
             // This will be the uri extracted from the refValue (this may be a relative or absolute uri).
             final String refUri;
@@ -76,10 +78,10 @@ static JsonSchemaRef getRefSchema(JsonSchema parentSchema, ValidationContext val
         } else {
             JsonNode node = parentSchema.getRefSchemaNode(refValue);
             if (node != null) {
-                JsonSchemaRef ref = validationContext.getReferenceParsingInProgress(refValue);
+                JsonSchemaRef ref = validationContext.getReferenceParsingInProgress(refValueOriginal);
                 if (ref == null) {
                     ref = new JsonSchemaRef(validationContext, refValue);
-                    validationContext.setReferenceParsingInProgress(refValue, ref);
+                    validationContext.setReferenceParsingInProgress(refValueOriginal, ref);
                     JsonSchema ret = new JsonSchema(validationContext, refValue, parentSchema.getCurrentUri(), node, parentSchema);
                     ref.set(ret);
                 }

src/test/resources/tests/ref.json

@@ -95,6 +95,29 @@
             }
         ]
     },
+    {
+        "description": "nested refs with duplicate ref values for different files",
+        "schema": {
+            "definitions": {
+                "a": {"$ref": "subSchemas.json#/definitions/a"},
+                "b": {"$ref": "#/definitions/a"},
+                "c": {"$ref": "#/definitions/b"}
+            },
+            "$ref": "#/definitions/c"
+        },
+        "tests": [
+            {
+                "description": "nested ref valid",
+                "data": 5,
+                "valid": true
+            },
+            {
+                "description": "nested ref invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "remote ref, containing refs itself",
         "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},

src/test/resources/tests/subSchemas.json

@@ -4,5 +4,8 @@
 	},
 	"refToInteger" : {
 		"$ref" : "#/integer"
+	},
+	"definitions" : {
+		"a" : { "type": "integer" }
 	}
 }