Fixes #111 problem started from oneOf validation - Validation failure for optional field in a schema - in the PropertiesValidator

Author: ddobrin

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

@@ -33,6 +33,8 @@ public class JsonSchema extends BaseJsonValidator {
     private static final Pattern intPattern = Pattern.compile("^[0-9]+$");
     protected final Map<String, JsonValidator> validators;
     private final ValidationContext validationContext;
+    
+    private JsonValidator requiredValidator = null;
 
     public JsonSchema(ValidationContext validationContext,  JsonNode schemaNode) {
         this(validationContext,  "#", schemaNode, null);
@@ -111,6 +113,9 @@ private Map<String, JsonValidator> read(JsonNode schemaNode) {
             JsonValidator validator = validationContext.newValidator(getSchemaPath(), pname, n, this);
             if (validator != null) {
                 validators.put(getSchemaPath() + "/" + pname, validator);
+                
+                if(pname.equals("required"))
+                	requiredValidator = validator;
             }
 
         }
@@ -129,4 +134,12 @@ public Set<ValidationMessage> validate(JsonNode jsonNode, JsonNode rootNode, Str
     public String toString() {
         return "\"" + getSchemaPath() + "\" : " + getSchemaNode().toString();
     }
+
+    public boolean hasRequiredValidator() {
+    	return requiredValidator != null ? true : false;
+    }
+    
+	public JsonValidator getRequiredValidator() {
+		return requiredValidator;
+	}
 }

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

@@ -163,9 +163,6 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             		errors.addAll(schemaErrors);
             	}
         	}
-            if (numberOfValidSchema > 1) {
-                break;
-            }
         }
 
         if (numberOfValidSchema == 0) {

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

@@ -54,8 +54,12 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 }
             } else {
             	// if a node could not be found, treat is as error/continue, depending on the SchemaValidatorsConfig
-            	if(config.isMissingNodeAsError())
-            		errors.add(buildValidationMessage(at, node.toString()));
+            	if(config.isMissingNodeAsError()) {
+            		if(getParentSchema().hasRequiredValidator())
+                		errors.addAll(getParentSchema().getRequiredValidator().validate(node,  rootNode, at));     
+            		else 
+                		errors.add(buildValidationMessage(at, node.toString()));
+            	}
             }
         }