Use full schema path to look up type validators for anyOf operator (#…

…663)

* Add failing test for misleading validation of optional objects

* Look up `anyOf` type validators by the full schema path

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

@@ -30,11 +30,11 @@
  */
 public class BaseJsonSchemaValidatorTest {
 
-    private ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     protected JsonNode getJsonNodeFromClasspath(String name) throws IOException {
         InputStream is1 = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream(name);
+            .getResourceAsStream(name);
         return mapper.readTree(is1);
     }
 
@@ -46,10 +46,14 @@ protected JsonNode getJsonNodeFromUrl(String url) throws IOException {
         return mapper.readTree(new URL(url));
     }
 
-    protected JsonSchema getJsonSchemaFromClasspath(String name) {
-        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
+    protected static JsonSchema getJsonSchemaFromClasspath(String name) {
+        return getJsonSchemaFromClasspath(name, SpecVersion.VersionFlag.V4);
+    }
+
+    protected static JsonSchema getJsonSchemaFromClasspath(String name, SpecVersion.VersionFlag schemaVersion) {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(schemaVersion);
         InputStream is = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream(name);
+            .getResourceAsStream(name);
         return factory.getSchema(is);
     }
 

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

@@ -0,0 +1,60 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Issue662Test extends BaseJsonSchemaValidatorTest {
+
+    private static final String RESOURCE_PREFIX = "issues/662/";
+    private static JsonSchema schema;
+
+    @BeforeAll
+    static void setup() {
+        schema = getJsonSchemaFromClasspath(resource("schema.json"), SpecVersion.VersionFlag.V7);
+    }
+
+    @Test
+    void testNoErrorsForEmptyObject() throws IOException {
+        JsonNode node = getJsonNodeFromClasspath(resource("emptyObject.json"));
+        Set<ValidationMessage> errors = schema.validate(node);
+        assertTrue(errors.isEmpty(), "No validation errors for empty optional object");
+    }
+
+    @Test
+    void testNoErrorsForValidObject() throws IOException {
+        JsonNode node = getJsonNodeFromClasspath(resource("validObject.json"));
+        Set<ValidationMessage> errors = schema.validate(node);
+        assertTrue(errors.isEmpty(), "No validation errors for a valid optional object");
+    }
+
+    @Test
+    void testCorrectErrorForInvalidValue() throws IOException {
+        JsonNode node = getJsonNodeFromClasspath(resource("objectInvalidValue.json"));
+        Set<ValidationMessage> errors = schema.validate(node);
+        List<String> errorMessages = errors.stream()
+            .map(ValidationMessage::getMessage)
+            .collect(toList());
+
+        assertTrue(
+            errorMessages.contains("$.optionalObject.value: does not have a value in the enumeration [one, two]"),
+            "Validation error for invalid object property is captured"
+        );
+        assertFalse(
+            errorMessages.contains("$.optionalObject: object found, null expected"),
+            "No validation error that the object is not expected"
+        );
+    }
+
+    private static String resource(String name) {
+        return RESOURCE_PREFIX + name;
+    }
+}

src/test/resources/issues/662/emptyObject.json

@@ -0,0 +1 @@
+{}

src/test/resources/issues/662/objectInvalidValue.json

@@ -0,0 +1,5 @@
+{
+    "optionalObject": {
+        "value": "invalid"
+    }
+}

src/test/resources/issues/662/schema.json

@@ -0,0 +1,26 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "properties": {
+        "optionalObject": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "enum": [
+                                "one",
+                                "two"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                }
+            ]
+        }
+    }
+}

src/test/resources/issues/662/validObject.json

@@ -0,0 +1,5 @@
+{
+    "optionalObject": {
+        "value": "one"
+    }
+}