Merge branch 'master' of github.com:networknt/json-schema-validator

Author: stevehu

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

@@ -40,16 +40,16 @@ public class JsonSchema extends BaseJsonValidator {
     protected final Map<String, JsonValidator> validators;
     private final ValidationContext validationContext;
 
-    JsonSchema(ValidationContext validationContext,  JsonNode schemaNode) {
+    public JsonSchema(ValidationContext validationContext,  JsonNode schemaNode) {
         this(validationContext,  "#", schemaNode, null);
     }
 
-    JsonSchema(ValidationContext validationContext,  String schemaPath, JsonNode schemaNode,
+    public JsonSchema(ValidationContext validationContext,  String schemaPath, JsonNode schemaNode,
                JsonSchema parent) {
         this(validationContext,  schemaPath, schemaNode, parent, false);
     }
 
-    JsonSchema(ValidationContext validatorFactory,  String schemaPath, JsonNode schemaNode,
+    public JsonSchema(ValidationContext validatorFactory,  String schemaPath, JsonNode schemaNode,
                JsonSchema parent, boolean suppressSubSchemaRetrieval) {
         super(schemaPath, schemaNode, parent, null, suppressSubSchemaRetrieval);
         this.validationContext = validatorFactory;

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

@@ -141,14 +141,14 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 continue;
             }
             JsonSchema schema = validator.schema;
-        	Set<ValidationMessage> schemaErrors = schema.validate(node, rootNode, at);
+        	    Set<ValidationMessage> schemaErrors = schema.validate(node, rootNode, at);
             if (schemaErrors.isEmpty()) {
                 numberOfValidSchema++;
                 errors = new LinkedHashSet<ValidationMessage>();
             }
             if(numberOfValidSchema == 0){
         		errors.addAll(schemaErrors);
-        	}
+        	    }
             if (numberOfValidSchema > 1) {
                 break;
             }
@@ -161,10 +161,10 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 if (ValidatorTypeCode.ADDITIONAL_PROPERTIES.getValue().equals(msg.getType())) {
                     it.remove();
                 }
-                if (errors.isEmpty()) {
-                    // ensure there is always an error reported if number of valid schemas is 0
-                    errors.add(buildValidationMessage(at, ""));
-                }
+            }
+            if (errors.isEmpty()) {
+                // ensure there is always an error reported if number of valid schemas is 0
+                errors.add(buildValidationMessage(at, ""));
             }
         }
         if (numberOfValidSchema > 1) {

src/test/java/com/networknt/schema/JsonSchemaTest.java

@@ -228,7 +228,7 @@ public void testNotValidator() throws Exception {
     public void testOneOfValidator() throws Exception {
         runTestFile("tests/oneOf.json");
     }
-
+    
     @Test
     public void testPatternValidator() throws Exception {
         runTestFile("tests/pattern.json");

src/test/resources/tests/oneOf.json

@@ -64,5 +64,62 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "oneOf with objects and type pattern",
+        "schema": {
+			"oneOf": [
+				{
+					"type": "object",
+					"required": [
+						"type"
+					],
+					"properties": {
+						"type": {
+							"enum": [
+								"TYPE_1"
+							]
+						}
+					}
+				},			
+				{
+					"type": "object",
+					"required": [
+						"type"
+					],
+					"properties": {
+						"type": {
+							"enum": [
+								"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
+            }
+        ]
     }
 ]