Merge pull request #30 from eskabetxe/features/oneOfValidator

Features/one of validator

Author: stevehu

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

@@ -25,6 +25,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class OneOfValidator extends BaseJsonValidator implements JsonValidator {
     private static final Logger logger = LoggerFactory.getLogger(RequiredValidator.class);
@@ -45,21 +46,33 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         debug(logger, node, rootNode, at);
 
         int numberOfValidSchema = 0;
-
+        Set<ValidationMessage> errors = new HashSet<>();
+        
         for (JsonSchema schema : schemas) {
-            Set<ValidationMessage> errors = schema.validate(node, rootNode, at);
-            if (errors == null || errors.isEmpty()) {
+        	Set<ValidationMessage> schemaErrors = schema.validate(node, rootNode, at);
+            if (schemaErrors.isEmpty()) {
                 numberOfValidSchema++;
+                errors = new HashSet<>();
             }
+            if(numberOfValidSchema == 0){
+        		errors.addAll(schemaErrors);
+        	}
             if (numberOfValidSchema > 1) {
                 break;
             }
         }
-
-        Set<ValidationMessage> errors = new HashSet<ValidationMessage>();
-        if (numberOfValidSchema != 1) {
-            errors.add(buildValidationMessage(at, ""));
+        
+        if (numberOfValidSchema == 0) {
+        	errors = errors.stream()
+        		.filter(msg -> !ValidatorTypeCode.ADDITIONAL_PROPERTIES
+        							.equals(ValidatorTypeCode.fromValue(msg.getType())))
+        		.collect(Collectors.toSet());
+        }
+        if (numberOfValidSchema > 1) {
+        	errors = new HashSet<>();
+        	errors.add(buildValidationMessage(at, ""));
         }
+        
         return errors;
     }
 

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

@@ -25,9 +25,9 @@ public enum ValidatorTypeCode {
             "{0}.{1}: is not defined in the schema and the schema does not allow additional properties")),
     ALL_OF("allOf", "1002", new MessageFormat("{0}: should be valid to all the schemas {1}")),
     ANY_OF("anyOf", "1003", new MessageFormat("{0}: should be valid to any of the schemas {1}")),
-    CROSS_EDITS("crossEdits", "", new MessageFormat("{0}: has an error with 'cross edits'")),
+    CROSS_EDITS("crossEdits", "1004", new MessageFormat("{0}: has an error with 'cross edits'")),
     DEPENDENCIES("dependencies", "1007", new MessageFormat("{0}: has an error with dependencies {1}")),
-    EDITS("edits", "", new MessageFormat("{0}: has an error with 'edits'")),
+    EDITS("edits", "1005", new MessageFormat("{0}: has an error with 'edits'")),
     ENUM("enum", "1008", new MessageFormat("{0}: does not have a value in the enumeration {1}")),
     FORMAT("format", "1009", new MessageFormat("{0}: does not match the {1} pattern {2}")),
     ITEMS("items", "1010", new MessageFormat("{0}[{1}]: no validator found at this index")),