Merge pull request #219 from aznan2/master

Fix for oneOf when not all properties are matched

Author: stevehu

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

@@ -48,7 +48,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         	state = new ValidatorState();
         	validatorState.set(state);
         }
-        
+
         for (Map.Entry<String, JsonSchema> entry : schemas.entrySet()) {
             JsonSchema propertySchema = entry.getValue();
             JsonNode propertyNode = node.get(entry.getKey());
@@ -62,27 +62,32 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             	}
             	// reset the complex validator for child element validation, and reset it after the return from the recursive call
             	state.setComplexValidator(false);
-            	
+
             	//validate the child element(s)
-                errors.addAll(propertySchema.validate(propertyNode, rootNode, at + "." + entry.getKey()));
-                
-                // reset the complex flag to the original value before the recursive call
-                state.setComplexValidator(isComplex);
-                // if this was a complex validator, the node has matched and has been validated
+              errors.addAll(propertySchema.validate(propertyNode, rootNode, at + "." + entry.getKey()));
+
+              // reset the complex flag to the original value before the recursive call
+              state.setComplexValidator(isComplex);
+              // if this was a complex validator, the node has matched and has been validated
             	if(state.isComplexValidator()) {
             		state.setMatchedNode(true);
             	}
             } else {
-            	// decide which behavior to eomploy when validator has not matched
-            	if(state.isComplexValidator()) {
-            		// this was a complex validator (ex oneOf) and the node has not been matched
-            		state.setMatchedNode(false);
-            		return Collections.unmodifiableSet(new LinkedHashSet<ValidationMessage>());
-            	}
-            		
-            	// check whether the node which has not matched was mandatory or not
-        		if(getParentSchema().hasRequiredValidator())
-            		errors.addAll(getParentSchema().getRequiredValidator().validate(node,  rootNode, at));     
+              // check whether the node which has not matched was mandatory or not
+              if (getParentSchema().hasRequiredValidator()) {
+                Set<ValidationMessage> requiredErrors = getParentSchema().getRequiredValidator().validate(node, rootNode, at);
+
+                if(!requiredErrors.isEmpty()) {
+                  // the node was mandatory, decide which behavior to employ when validator has not matched
+                  if (state.isComplexValidator()) {
+                    // this was a complex validator (ex oneOf) and the node has not been matched
+                    state.setMatchedNode(false);
+                    return Collections.unmodifiableSet(new LinkedHashSet<ValidationMessage>());
+                  } else {
+                    errors.addAll(requiredErrors);
+                  }
+                }
+              }
             }
         }
 

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

@@ -202,5 +202,47 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "oneOf with missing optional property",
+        "schema": {
+            "oneOf": [
+                {
+                    "properties": {
+                        "bar": true,
+                        "baz": true
+                    },
+                    "required": ["bar"]
+                },
+                {
+                    "properties": {
+                        "foo": true
+                    },
+                    "required": ["foo"]
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "first oneOf valid",
+                "data": {"bar": 8},
+                "valid": true
+            },
+            {
+                "description": "second oneOf valid",
+                "data": {"foo": "foo"},
+                "valid": true
+            },
+            {
+                "description": "both oneOf valid",
+                "data": {"foo": "foo", "bar": 8},
+                "valid": false
+            },
+            {
+                "description": "neither oneOf valid",
+                "data": {"baz": "quux"},
+                "valid": false
+            }
+        ]
     }
 ]

src/test/resources/draft4/oneOf.json

@@ -128,6 +128,9 @@
             "oneOf": [
                 {
                     "type": "object",
+                    "required": [
+                        "id"
+                    ],
                     "properties": {
                         "color": {
                           "type": "string"
@@ -175,6 +178,13 @@
                     "type": "INVALID_TYPE"
                 },
                 "valid": false
+            },
+            {
+                "description": "first oneOf missing property but still valid",
+                "data": {
+                    "id": "abc"
+                },
+                "valid": true
             }
         ]
     },

src/test/resources/draft6/oneOf.json

@@ -202,5 +202,47 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "oneOf with missing optional property",
+        "schema": {
+            "oneOf": [
+                {
+                    "properties": {
+                        "bar": true,
+                        "baz": true
+                    },
+                    "required": ["bar"]
+                },
+                {
+                    "properties": {
+                        "foo": true
+                    },
+                    "required": ["foo"]
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "first oneOf valid",
+                "data": {"bar": 8},
+                "valid": true
+            },
+            {
+                "description": "second oneOf valid",
+                "data": {"foo": "foo"},
+                "valid": true
+            },
+            {
+                "description": "both oneOf valid",
+                "data": {"foo": "foo", "bar": 8},
+                "valid": false
+            },
+            {
+                "description": "neither oneOf valid",
+                "data": {"baz": "quux"},
+                "valid": false
+            }
+        ]
     }
 ]

src/test/resources/draft7/oneOf.json

@@ -202,5 +202,47 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "oneOf with missing optional property",
+        "schema": {
+            "oneOf": [
+                {
+                    "properties": {
+                        "bar": true,
+                        "baz": true
+                    },
+                    "required": ["bar"]
+                },
+                {
+                    "properties": {
+                        "foo": true
+                    },
+                    "required": ["foo"]
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "first oneOf valid",
+                "data": {"bar": 8},
+                "valid": true
+            },
+            {
+                "description": "second oneOf valid",
+                "data": {"foo": "foo"},
+                "valid": true
+            },
+            {
+                "description": "both oneOf valid",
+                "data": {"foo": "foo", "bar": 8},
+                "valid": false
+            },
+            {
+                "description": "neither oneOf valid",
+                "data": {"baz": "quux"},
+                "valid": false
+            }
+        ]
     }
 ]