Merge pull request #265 from networknt/issue255

Issue255

Author: stevehu

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

@@ -345,6 +345,7 @@ public JsonValidator newValidator(ValidationContext validationContext, String sc
             return kw.newValidator(schemaPath, schemaNode, parentSchema, validationContext);
         } catch (InvocationTargetException e) {
             if (e.getTargetException() instanceof JsonSchemaException) {
+                logger.error("Error:", e);
                 throw (JsonSchemaException) e.getTargetException();
             } else {
                 logger.warn("Could not load validator " + keyword);

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

@@ -82,6 +82,8 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
         final String id = validationContext.resolveSchemaId(schemaNode);
         if (id == null) {
             return currentUri;
+        } else if (isUriFragmentWithNoContext(currentUri, id)) {
+            return null;
         } else {
             try {
                 return this.validationContext.getURIFactory().create(currentUri, id);
@@ -90,6 +92,10 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
             }
         }
     }
+
+    private boolean isUriFragmentWithNoContext(URI currentUri, String id) {
+        return id.startsWith("#") && currentUri == null;
+    }
 
     public URI getCurrentUri()
     {

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

@@ -0,0 +1,34 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.InputStream;
+import java.util.Set;
+
+public class Issue255Test {
+    protected JsonSchema getJsonSchemaFromStreamContent(InputStream schemaContent) {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+        return factory.getSchema(schemaContent);
+    }
+
+    protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(content);
+        return node;
+    }
+
+    @Test
+    public void shouldFailWhenRequiredPropertiesDoNotExistInReferencedSubSchema() throws Exception {
+        String schemaPath = "/draft2019-09/issue255.json";
+        String dataPath = "/data/issue255.json";
+        InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
+        JsonSchema schema = getJsonSchemaFromStreamContent(schemaInputStream);
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        Set<ValidationMessage> errors = schema.validate(node);
+        Assert.assertEquals(2, errors.size());
+    }
+}

src/test/resources/data/issue255.json

@@ -0,0 +1,7 @@
+{
+  "cars": [
+    {
+
+    }
+  ]
+}

src/test/resources/draft2019-09/issue255.json

@@ -0,0 +1,84 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "cars": {
+      "type": "array",
+      "items": {
+        "$ref": "#car"
+      }
+    }
+  },
+  "definitions": {
+    "car": {
+      "$id": "#car",
+      "type": "object",
+      "properties": {
+        "model": {
+          "type": "string"
+        },
+        "manufacturer": {
+          "$ref": "#manufacturer"
+        }
+      },
+      "required": ["model", "manufacturer"]
+    },
+    "manufacturer": {
+      "$id": "#manufacturer",
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "factories": {
+          "type": "array",
+          "items": {
+            "$ref": "#factory"
+          }
+        }
+      }
+    },
+    "factory": {
+      "$id": "#factory",
+      "type": "object",
+      "properties": {
+        "location": {
+          "$ref": "#location"
+        }
+      }
+    },
+    "location": {
+      "$id": "#location",
+      "type": "object",
+      "properties": {
+        "country": {
+          "type": "string"
+        },
+        "city": {
+          "type": "string"
+        },
+        "employees": {
+          "type": "array",
+          "items": {
+            "$ref": "#employee"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "employee": {
+      "$id": "#employee",
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "surname": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": true,
+      "maxProperties": 3
+    }
+  }
+}