Fixes #110 Validation Error when using OneOf in OpenAPI specs - additional recursive validation fix

Author: ddobrin

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

@@ -152,8 +152,17 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 errors = new LinkedHashSet<ValidationMessage>();
             }
             if(numberOfValidSchema == 0){
-        		errors.addAll(schemaErrors);
-        	    }
+            	// one of has matched one of the elements
+            	// if it has an error here, it is due to an element validation error
+            	// within its child elements
+            	if(config.hasElementValidationError()) {
+            		errors.clear();
+            		errors.addAll(schemaErrors);
+            		break;
+            	} else {
+            		errors.addAll(schemaErrors);
+            	}
+        	}
             if (numberOfValidSchema > 1) {
                 break;
             }

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

@@ -47,6 +47,11 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
             if (propertyNode != null) {
                 errors.addAll(propertySchema.validate(propertyNode, rootNode, at + "." + entry.getKey())); 
+                
+                // this was a regular validation error; mark it as such
+                if(!errors.isEmpty()) {
+                	config.setElementValidationError(true);
+                }
             } else {
             	// if a node could not be found, treat is as error/continue, depending on the SchemaValidatorsConfig
             	if(config.isMissingNodeAsError())

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

@@ -12,6 +12,12 @@ public class SchemaValidatorsConfig {
      */
     private boolean missingNodeAsError = false;
 
+    /**
+     * if HAS_ELEMENT_VALIDATION_ERROR = true, the caller can decide, in conjunction with a missing node flag
+     * on how to treat the error
+     */
+    private boolean elementValidationError = false;
+    
     public boolean isTypeLoose() {
         return typeLoose;
     }
@@ -28,6 +34,14 @@ public void setMissingNodeAsError(boolean missingNodeAsError) {
     	this.missingNodeAsError = missingNodeAsError;
     }
 
+    public boolean hasElementValidationError() {
+    	return elementValidationError;
+    }
+    
+    public void setElementValidationError(boolean elementValidationError) {
+    	this.elementValidationError = elementValidationError;
+    }
+    
     public SchemaValidatorsConfig() {
         loadDefaultConfig();
     }