type validation, if the allow null for optional value in the json schema

chenyan71 · chenyan71 · commit b270f1333900 · 2018-07-11T10:12:54.000-04:00
diff --git a/src/main/java/com/networknt/schema/TypeValidator.java b/src/main/java/com/networknt/schema/TypeValidator.java
@@ -49,10 +49,12 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         JsonType nodeType = TypeFactory.getValueNodeType(node);
         if (nodeType != schemaType) {
-            if (schemaType == JsonType.ANY) {
+            if (schemaType == JsonType.ANY ) {
+                return Collections.emptySet();
+            }
+            if (schemaType == JsonType.NULL ) {
                 return Collections.emptySet();
             }
-
             if (schemaType == JsonType.NUMBER && nodeType == JsonType.INTEGER) {
                 return Collections.emptySet();
             }

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,12 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String`
`49`	`49`
`50`	`50`	`JsonType nodeType = TypeFactory.getValueNodeType(node);`
`51`	`51`	`if (nodeType != schemaType) {`
`52`		`- if (schemaType == JsonType.ANY) {`
	`52`	`+ if (schemaType == JsonType.ANY ) {`
	`53`	`+ return Collections.emptySet();`
	`54`	`+ }`
	`55`	`+ if (schemaType == JsonType.NULL ) {`
`53`	`56`	`return Collections.emptySet();`
`54`	`57`	`}`
`55`		`-`
`56`	`58`	`if (schemaType == JsonType.NUMBER && nodeType == JsonType.INTEGER) {`
`57`	`59`	`return Collections.emptySet();`
`58`	`60`	`}`