Potential fix for #383 (#384)

JonasProgrammer · web-flow · commit ca1847adf987 · 2021-03-14T17:25:17.000-04:00
- signal nodeMatch to parent handler in OneOfValidator
diff --git a/src/main/java/com/networknt/schema/OneOfValidator.java b/src/main/java/com/networknt/schema/OneOfValidator.java
@@ -197,6 +197,9 @@ else if (numberOfValidSchema < 1) {
             }
         }
 
+        // Make sure to signal parent handlers we matched
+        if (errors.isEmpty())
+            state.setMatchedNode(true);
 
         // reset the ValidatorState object in the ThreadLocal
         validatorState.remove();
diff --git a/src/test/java/com/networknt/schema/Issue383Test.java b/src/test/java/com/networknt/schema/Issue383Test.java
@@ -0,0 +1,35 @@
+package com.networknt.schema;
+
+import java.io.InputStream;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class Issue383Test {
+    protected JsonSchema getJsonSchemaFromStreamContentV7(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 nestedOneOfsShouldStillMatchV7() throws Exception {
+        String schemaPath = "/schema/issue383-v7.json";
+        String dataPath = "/data/issue383.json";
+        InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
+        JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        Set<ValidationMessage> errors = schema.validate(node);
+        Assert.assertEquals(0, errors.size());
+    }
+}
diff --git a/src/test/resources/data/issue383.json b/src/test/resources/data/issue383.json
@@ -0,0 +1,11 @@
+{
+  "validation": {
+    "all": [
+      {
+        "notEmpty": {
+          "field": "test"
+        }
+      }
+    ]
+  }
+}
diff --git a/src/test/resources/schema/issue383-v7.json b/src/test/resources/schema/issue383-v7.json
@@ -0,0 +1,85 @@
+{
+  "type": "object",
+  "properties": {
+    "validation": {
+      "$ref": "#/definitions/predicateOrNull"
+    }
+  },
+  "definitions": {
+    "fieldRef": {
+      "type": "object",
+      "properties": {
+        "field": {
+          "type": "string"
+        },
+        "set": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "field"
+      ]
+    },
+    "patternPredicate": {
+      "type": "object",
+      "oneOf": [
+        {
+          "properties": {
+            "notEmpty": {
+              "$ref": "#/definitions/fieldRef"
+            }
+          },
+          "required": [
+            "notEmpty"
+          ]
+        },
+        {
+          "properties": {
+            "notBlank": {
+              "$ref": "#/definitions/fieldRef"
+            }
+          },
+          "required": [
+            "notBlank"
+          ]
+        }
+      ]
+    },
+    "allPredicate": {
+      "type": "object",
+      "properties": {
+        "all": {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "$ref": "#/definitions/predicate"
+          }
+        }
+      },
+      "required": [
+        "all"
+      ]
+    },
+    "predicate": {
+      "type": "object",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/patternPredicate"
+        },
+        {
+          "$ref": "#/definitions/allPredicate"
+        }
+      ]
+    },
+    "predicateOrNull": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/predicate"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,9 @@ else if (numberOfValidSchema < 1) {`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ // Make sure to signal parent handlers we matched`
	`201`	`+ if (errors.isEmpty())`
	`202`	`+ state.setMatchedNode(true);`
`200`	`203`
`201`	`204`	`// reset the ValidatorState object in the ThreadLocal`
`202`	`205`	`validatorState.remove();`