Merge pull request #3 from networknt/master

merging last changes

Author: eskabetxe

CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 0.1.7 - 2017-04-26
+### Added
+
+### Changed
+- Fixes #25 Enable Undertow server to test remote schemas
+- Add test with id schema as url Thanks @eskabetxe
+- If schema not valid to oneOf, added all errors. Thanks @eskabetxe
+
 ## 0.1.6 - 2017-04-03
 ### Added
 

README.md

@@ -42,7 +42,7 @@ Add the following to your `pom.xml`:
 <dependency>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>0.1.5</version>
+    <version>0.1.7</version>
 </dependency>
 ```
 

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
     <description>A json schema validator that supports draft v4</description>
     <url>https://github.com/networknt/json-schema-validator</url>
     <name>JsonSchemaValidator</name>

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")),

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

@@ -259,5 +259,10 @@ public void testTypeValidator() throws Exception {
     public void testUniqueItemsValidator() throws Exception {
         runTestFile("tests/uniqueItems.json");
     }
+    
+    @Test
+    public void testIdSchemaWithUrl() throws Exception {
+        runTestFile("tests/id_schema/property.json");
+    }
 
 }

src/test/resources/tests/id_schema/property.json

@@ -0,0 +1,35 @@
+[
+  {
+    "description": "id as schema",
+    "schema": {
+		"id": "http://localhost:1234/id_schema/schema/features.json",
+		"title": "property object",
+		"type": "object",
+        "properties": {
+            "featuresInteger": {
+		      "$ref": "#/featuresInteger"
+		    },
+		    "featuresBoolean": {
+		      "$ref": "#/featuresBoolean"
+		    }
+        },
+        "additionalProperties": false
+    },
+    "tests": [
+        {
+            "data": {
+		                "featuresInteger": 4,
+		                "featuresBoolean": true
+		            },
+            "valid": true
+        },
+        {
+            "data": {
+		                "featuresInteger": 4.0,
+		                "featuresBoolean": true
+		            },
+            "valid": false
+        }
+    ]
+  }
+]

src/test/resources/tests/id_schema/schema/features.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "features fields",
+  "featuresBoolean": {
+    "title": "boolean feature",
+    "type": "boolean"
+  },
+  "featuresInteger": {
+    "title": "integer feature",
+    "type": "integer",
+    "minimum": 1,
+    "maximum": 99999
+  }
+}