Merge pull request #178 from jawaff/fix/#177-one-of-bug

Fix/#177 One Of Bug

Author: stevehu

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

@@ -152,16 +152,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 errors = new LinkedHashSet<ValidationMessage>();
             }
             if(numberOfValidSchema == 0){
-            	// 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);
-            	}
+                errors.addAll(schemaErrors);
         	}
         }
 

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

@@ -46,12 +46,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             JsonNode propertyNode = node.get(entry.getKey());
 
             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);
-                }
+                errors.addAll(propertySchema.validate(propertyNode, rootNode, at + "." + entry.getKey()));
             } 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

@@ -30,13 +30,7 @@ public class SchemaValidatorsConfig {
      * if set to false, then the validator will report an error
      */
     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;
-    
+
     /**
      * Map of public, normally internet accessible schema URLs to alternate locations; this allows for offline
      * validation of schemas that refer to public URLs. This is merged with any mappings the {@link JsonSchemaFactory} 
@@ -68,15 +62,7 @@ public boolean isMissingNodeAsError() {
     public void setMissingNodeAsError(boolean missingNodeAsError) {
     	this.missingNodeAsError = missingNodeAsError;
     }
-    
-    public boolean hasElementValidationError() {
-    	return elementValidationError;
-    }
-    
-    public void setElementValidationError(boolean elementValidationError) {
-    	this.elementValidationError = elementValidationError;
-    }
-    
+
     public SchemaValidatorsConfig() {
         loadDefaultConfig();
     }

src/test/resources/tests/oneOf.json

@@ -121,5 +121,59 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "oneOf with objects and regex pattern",
+        "schema": {
+			"oneOf": [
+				{
+					"type": "object",
+					"required": [
+						"type"
+					],
+					"properties": {
+						"type": {
+						  "type": "string",
+						  "pattern": "^TYPE_1$"
+						}
+					}
+				},
+				{
+					"type": "object",
+					"required": [
+						"type"
+					],
+					"properties": {
+						"type": {
+						  "type": "string",
+						  "pattern": "^TYPE_2$"
+						}
+					}
+				}
+			]
+		},
+        "tests": [
+            {
+                "description": "first oneOf valid",
+                "data": {
+				    "type": "TYPE_1"
+				},
+                "valid": true
+            },
+            {
+                "description": "second oneOf valid",
+                "data": {
+				    "type": "TYPE_2"
+				},
+                "valid": true
+            },
+            {
+                "description": "neither oneOf valid",
+                "data": {
+				    "type": "INVALID_TYPE"
+				},
+                "valid": false
+            }
+        ]
     }
 ]