Fixes #185 Validation issue in oneOf when elements have optional fields

Author: ddobrin

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

@@ -36,6 +36,10 @@ public abstract class BaseJsonValidator implements JsonValidator {
      */
     protected SchemaValidatorsConfig config;
 
+    /**
+     * ThreadLocal to allow to pass state in recursive validator calls
+     */
+    protected final static ThreadLocal<ValidatorState> validatorState = new ThreadLocal<ValidatorState>();
 
     public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
                              ValidatorTypeCode validatorType, ValidationContext validationContext) {

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

@@ -132,7 +132,9 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         debug(logger, node, rootNode, at);
 
         // this is a complex validator, we set the flag to true
-        config.setComplexValidator(true);
+        ValidatorState state = new ValidatorState();
+        state.setComplexValidator(true);
+        validatorState.set(state);
 
         int numberOfValidSchema = 0;
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
@@ -158,7 +160,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         	// check if any validation errors have occurred
             if (schemaErrors.isEmpty()) {
             	// check whether there are no errors HOWEVER we have validated the exact validator
-            	if(!config.hasMatchedNode())
+            	if(!state.hasMatchedNode())
             		continue;
 
                 numberOfValidSchema++;
@@ -190,6 +192,9 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             errors = Collections.singleton(buildValidationMessage(at, ""));
         }
 
+        // reset the ValidatorState object in the ThreadLocal
+        validatorState.remove();
+        
         return Collections.unmodifiableSet(errors);
     }
 

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

@@ -41,32 +41,42 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
+        // get the Validator state object storing validation data
+        ValidatorState state = validatorState.get();
+        if(state == null) {
+        	// if one has not been created, instantiate one
+        	state = new ValidatorState();
+        	validatorState.set(state);
+        }
+        
         for (Map.Entry<String, JsonSchema> entry : schemas.entrySet()) {
             JsonSchema propertySchema = entry.getValue();
             JsonNode propertyNode = node.get(entry.getKey());
 
             if (propertyNode != null) {
             	// check whether this is a complex validator. save the state
-            	boolean isComplex = config.isComplexValidator();
+            	boolean isComplex = state.isComplexValidator();
             	// if this is a complex validator, the node has matched, and all it's child elements, if available, are to be validated
-            	if(config.isComplexValidator()) {
-            		config.setMatchedNode(true);
+            	if(state.isComplexValidator()) {
+            		state.setMatchedNode(true);
             	}
             	// reset the complex validator for child element validation, and reset it after the return from the recursive call
-            	config.setComplexValidator(false);
+            	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
-                config.setComplexValidator(isComplex);
+                state.setComplexValidator(isComplex);
                 // if this was a complex validator, the node has matched and has been validated
-            	if(config.isComplexValidator()) {
-            		config.setMatchedNode(true);
+            	if(state.isComplexValidator()) {
+            		state.setMatchedNode(true);
             	}
             } else {
             	// decide which behavior to eomploy when validator has not matched
-            	if(config.isComplexValidator()) {
+            	if(state.isComplexValidator()) {
             		// this was a complex validator (ex oneOf) and the node has not been matched
-            		config.setMatchedNode(false);
+            		state.setMatchedNode(false);
             		return Collections.unmodifiableSet(new LinkedHashSet<ValidationMessage>());
             	}
 

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

@@ -25,18 +25,6 @@ public class SchemaValidatorsConfig {
      */
     private boolean typeLoose;
 
-    /**
-     * Flag set when a node has matched
-     * Works in conjunction with the next flag: isComplexValidator, to be used for complex validators such as oneOf, for ex
-     */
-    private boolean matchedNode = true;
-    
-    /**
-     * Flag set if complex validators such as oneOf, for ex, neeed to have their properties validated.
-     * The PropertiesValidator is not aware generally of a complex validator is being validated or a simple poperty tree
-     */
-    private boolean isComplexValidator = 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} 
@@ -87,19 +75,4 @@ private void loadDefaultConfig() {
         this.typeLoose = true;
         this.uriMappings = new HashMap<String, String>();
     }
-    
-    public void setMatchedNode(boolean matchedNode) {
-    	this.matchedNode = matchedNode;
-    }
-    public boolean hasMatchedNode() {
-    	return matchedNode;
-    }
-
-	public boolean isComplexValidator() {
-		return isComplexValidator;
-	}
-
-	public void setComplexValidator(boolean isComplexValidator) {
-		this.isComplexValidator = isComplexValidator;
-	}
 }

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

@@ -0,0 +1,32 @@
+package com.networknt.schema;
+
+public class ValidatorState {
+	/**
+	 * Flag set when a node has matched Works in conjunction with the next flag:
+	 * isComplexValidator, to be used for complex validators such as oneOf, for ex
+	 */
+	private boolean matchedNode = true;
+
+	/**
+	 * Flag set if complex validators such as oneOf, for ex, neeed to have their
+	 * properties validated. The PropertiesValidator is not aware generally of a
+	 * complex validator is being validated or a simple poperty tree
+	 */
+	private boolean isComplexValidator = false;
+
+    public void setMatchedNode(boolean matchedNode) {
+    	this.matchedNode = matchedNode;
+    }
+    public boolean hasMatchedNode() {
+    	return matchedNode;
+    }
+
+	public boolean isComplexValidator() {
+		return isComplexValidator;
+	}
+
+	public void setComplexValidator(boolean isComplexValidator) {
+		this.isComplexValidator = isComplexValidator;
+	}
+	
+}