fixes #54 add boolean schema validator to resolve some of the test cases

stevehu · stevehu · commit 9f8febda96fb · 2019-11-15T18:45:33.000-05:00
diff --git a/src/main/java/com/networknt/schema/FalseValidator.java b/src/main/java/com/networknt/schema/FalseValidator.java
@@ -0,0 +1,25 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class FalseValidator extends BaseJsonValidator implements JsonValidator {
+    private static final Logger logger = LoggerFactory.getLogger(FalseValidator.class);
+
+    public FalseValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
+        super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.FALSE, validationContext);
+    }
+
+    public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
+        debug(logger, node, rootNode, at);
+        // For the false validator, it is always not valid
+        Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
+        errors.add(buildValidationMessage(at));
+        return Collections.unmodifiableSet(errors);
+    }
+}
diff --git a/src/main/java/com/networknt/schema/JsonSchema.java b/src/main/java/com/networknt/schema/JsonSchema.java
@@ -142,19 +142,29 @@ public JsonSchema findAncestor() {
 
     private Map<String, JsonValidator> read(JsonNode schemaNode) {
         Map<String, JsonValidator> validators = new HashMap<String, JsonValidator>();
-        Iterator<String> pnames = schemaNode.fieldNames();
-        while (pnames.hasNext()) {
-            String pname = pnames.next();
-            JsonNode nodeToUse = pname.equals("if") ? schemaNode : schemaNode.get(pname);
-
-            JsonValidator validator = validationContext.newValidator(getSchemaPath(), pname, nodeToUse, this);
-            if (validator != null) {
-                validators.put(getSchemaPath() + "/" + pname, validator);
-                
-                if (pname.equals("required"))
-                	requiredValidator = validator;
+        if(schemaNode.isBoolean()) {
+            if(schemaNode.booleanValue()) {
+                JsonValidator validator = validationContext.newValidator(getSchemaPath(), "true", schemaNode, this);
+                validators.put(getSchemaPath() + "/true", validator);
+            } else {
+                JsonValidator validator = validationContext.newValidator(getSchemaPath(), "false", schemaNode, this);
+                validators.put(getSchemaPath() + "/false", validator);
             }
+        } else {
+            Iterator<String> pnames = schemaNode.fieldNames();
+            while (pnames.hasNext()) {
+                String pname = pnames.next();
+                JsonNode nodeToUse = pname.equals("if") ? schemaNode : schemaNode.get(pname);
+
+                JsonValidator validator = validationContext.newValidator(getSchemaPath(), pname, nodeToUse, this);
+                if (validator != null) {
+                    validators.put(getSchemaPath() + "/" + pname, validator);
+
+                    if (pname.equals("required"))
+                        requiredValidator = validator;
+                }
 
+            }
         }
         return validators;
     }
diff --git a/src/main/java/com/networknt/schema/TrueValidator.java b/src/main/java/com/networknt/schema/TrueValidator.java
@@ -0,0 +1,22 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class TrueValidator extends BaseJsonValidator implements JsonValidator {
+    private static final Logger logger = LoggerFactory.getLogger(TrueValidator.class);
+
+    public TrueValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
+        super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.TRUE, validationContext);
+    }
+
+    public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
+        debug(logger, node, rootNode, at);
+        // For the true validator, it is always valid which means there is no ValidationMessage.
+        return Collections.emptySet();
+    }
+}
diff --git a/src/main/java/com/networknt/schema/ValidatorTypeCode.java b/src/main/java/com/networknt/schema/ValidatorTypeCode.java
@@ -68,7 +68,9 @@ public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSc
     ID("id", "1036", new MessageFormat("{0}: {1} is an invalid segment for URI {2}"), null, 15),
     IF_THEN_ELSE("if", "1037", null, IfValidator.class, 12),  // V7|V201909
     EXCLUSIVE_MAXIMUM("exclusiveMaximum", "1038", new MessageFormat("{0}: must have a exclusive maximum value of {1}"), ExclusiveMaximumValidator.class, 14),  // V6|V7|V201909
-    EXCLUSIVE_MINIMUM("exclusiveMinimum", "1039", new MessageFormat("{0}: must have a exclusive minimum value of {1}"), ExclusiveMinimumValidator.class, 14);
+    EXCLUSIVE_MINIMUM("exclusiveMinimum", "1039", new MessageFormat("{0}: must have a exclusive minimum value of {1}"), ExclusiveMinimumValidator.class, 14),
+    TRUE("true", "1040", null, TrueValidator.class, 14),
+    FALSE("false", "1041", new MessageFormat("Boolean schema false is not valid"), FalseValidator.class, 14);
 
     private static Map<String, ValidatorTypeCode> constants = new HashMap<String, ValidatorTypeCode>();
     private static SpecVersion specVersion = new SpecVersion();
diff --git a/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java b/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java
@@ -240,7 +240,6 @@ public void testAdditionalPropertiesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testAllOfValidator() throws Exception {
         runTestFile("draft2019-09/allOf.json");
     }
@@ -252,13 +251,11 @@ public void testAnchorValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testAnyOfValidator() throws Exception {
         runTestFile("draft2019-09/anyOf.json");
     }
 
     @Test
-    @Ignore
     public void testBooleanSchemaValidator() throws Exception {
         runTestFile("draft2019-09/boolean_schema.json");
     }
@@ -376,13 +373,11 @@ public void testMultipleOfValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testNotValidator() throws Exception {
         runTestFile("draft2019-09/not.json");
     }
 
     @Test
-    @Ignore
     public void testOneOfValidator() throws Exception {
         runTestFile("draft2019-09/oneOf.json");
     }
@@ -393,13 +388,11 @@ public void testPatternValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testPatternPropertiesValidator() throws Exception {
         runTestFile("draft2019-09/patternProperties.json");
     }
 
     @Test
-    @Ignore
     public void testPropertiesValidator() throws Exception {
         runTestFile("draft2019-09/properties.json");
     }
@@ -438,3 +431,4 @@ public void testUniqueItemsValidator() throws Exception {
     }
 
 }
+    
diff --git a/src/test/java/com/networknt/schema/V6JsonSchemaTest.java b/src/test/java/com/networknt/schema/V6JsonSchemaTest.java
@@ -140,19 +140,16 @@ public void testAdditionalPropertiesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testAllOfValidator() throws Exception {
         runTestFile("draft6/allOf.json");
     }
 
     @Test
-    @Ignore
     public void testAnyOfValidator() throws Exception {
         runTestFile("draft6/anyOf.json");
     }
 
     @Test
-    @Ignore
     public void testBooleanSchemaValidator() throws Exception {
         runTestFile("draft6/boolean_schema.json");
     }
@@ -258,13 +255,11 @@ public void testMultipleOfValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testNotValidator() throws Exception {
         runTestFile("draft6/not.json");
     }
 
     @Test
-    @Ignore
     public void testOneOfValidator() throws Exception {
         runTestFile("draft6/oneOf.json");
     }
@@ -275,13 +270,11 @@ public void testPatternValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testPatternPropertiesValidator() throws Exception {
         runTestFile("draft6/patternProperties.json");
     }
 
     @Test
-    @Ignore
     public void testPropertiesValidator() throws Exception {
         runTestFile("draft6/properties.json");
     }
diff --git a/src/test/java/com/networknt/schema/V7JsonSchemaTest.java b/src/test/java/com/networknt/schema/V7JsonSchemaTest.java
@@ -236,7 +236,6 @@ public void testAdditionalPropertiesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testAllOfValidator() throws Exception {
         runTestFile("draft7/allOf.json");
     }
@@ -248,13 +247,11 @@ public void testAnchorValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testAnyOfValidator() throws Exception {
         runTestFile("draft7/anyOf.json");
     }
 
     @Test
-    @Ignore
     public void testBooleanSchemaValidator() throws Exception {
         runTestFile("draft7/boolean_schema.json");
     }
@@ -372,13 +369,11 @@ public void testMultipleOfValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testNotValidator() throws Exception {
         runTestFile("draft7/not.json");
     }
 
     @Test
-    @Ignore
     public void testOneOfValidator() throws Exception {
         runTestFile("draft7/oneOf.json");
     }
@@ -389,13 +384,11 @@ public void testPatternValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testPatternPropertiesValidator() throws Exception {
         runTestFile("draft7/patternProperties.json");
     }
 
     @Test
-    @Ignore
     public void testPropertiesValidator() throws Exception {
         runTestFile("draft7/properties.json");
     }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,6 @@ public void testAdditionalPropertiesValidator() throws Exception {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`@Test`
`243`		`- @Ignore`
`244`	`243`	`public void testAllOfValidator() throws Exception {`
`245`	`244`	`runTestFile("draft2019-09/allOf.json");`
`246`	`245`	`}`
`@@ -252,13 +251,11 @@ public void testAnchorValidator() throws Exception {`
`252`	`251`	`}`
`253`	`252`
`254`	`253`	`@Test`
`255`		`- @Ignore`
`256`	`254`	`public void testAnyOfValidator() throws Exception {`
`257`	`255`	`runTestFile("draft2019-09/anyOf.json");`
`258`	`256`	`}`
`259`	`257`
`260`	`258`	`@Test`
`261`		`- @Ignore`
`262`	`259`	`public void testBooleanSchemaValidator() throws Exception {`
`263`	`260`	`runTestFile("draft2019-09/boolean_schema.json");`
`264`	`261`	`}`
`@@ -376,13 +373,11 @@ public void testMultipleOfValidator() throws Exception {`
`376`	`373`	`}`
`377`	`374`
`378`	`375`	`@Test`
`379`		`- @Ignore`
`380`	`376`	`public void testNotValidator() throws Exception {`
`381`	`377`	`runTestFile("draft2019-09/not.json");`
`382`	`378`	`}`
`383`	`379`
`384`	`380`	`@Test`
`385`		`- @Ignore`
`386`	`381`	`public void testOneOfValidator() throws Exception {`
`387`	`382`	`runTestFile("draft2019-09/oneOf.json");`
`388`	`383`	`}`
`@@ -393,13 +388,11 @@ public void testPatternValidator() throws Exception {`
`393`	`388`	`}`
`394`	`389`
`395`	`390`	`@Test`
`396`		`- @Ignore`
`397`	`391`	`public void testPatternPropertiesValidator() throws Exception {`
`398`	`392`	`runTestFile("draft2019-09/patternProperties.json");`
`399`	`393`	`}`
`400`	`394`
`401`	`395`	`@Test`
`402`		`- @Ignore`
`403`	`396`	`public void testPropertiesValidator() throws Exception {`
`404`	`397`	`runTestFile("draft2019-09/properties.json");`
`405`	`398`	`}`
`@@ -438,3 +431,4 @@ public void testUniqueItemsValidator() throws Exception {`
`438`	`431`	`}`
`439`	`432`
`440`	`433`	`}`
	`434`	`+`
Original file line number	Diff line number	Diff line change
`@@ -140,19 +140,16 @@ public void testAdditionalPropertiesValidator() throws Exception {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Test`
`143`		`- @Ignore`
`144`	`143`	`public void testAllOfValidator() throws Exception {`
`145`	`144`	`runTestFile("draft6/allOf.json");`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`@Test`
`149`		`- @Ignore`
`150`	`148`	`public void testAnyOfValidator() throws Exception {`
`151`	`149`	`runTestFile("draft6/anyOf.json");`
`152`	`150`	`}`
`153`	`151`
`154`	`152`	`@Test`
`155`		`- @Ignore`
`156`	`153`	`public void testBooleanSchemaValidator() throws Exception {`
`157`	`154`	`runTestFile("draft6/boolean_schema.json");`
`158`	`155`	`}`
`@@ -258,13 +255,11 @@ public void testMultipleOfValidator() throws Exception {`
`258`	`255`	`}`
`259`	`256`
`260`	`257`	`@Test`
`261`		`- @Ignore`
`262`	`258`	`public void testNotValidator() throws Exception {`
`263`	`259`	`runTestFile("draft6/not.json");`
`264`	`260`	`}`
`265`	`261`
`266`	`262`	`@Test`
`267`		`- @Ignore`
`268`	`263`	`public void testOneOfValidator() throws Exception {`
`269`	`264`	`runTestFile("draft6/oneOf.json");`
`270`	`265`	`}`
`@@ -275,13 +270,11 @@ public void testPatternValidator() throws Exception {`
`275`	`270`	`}`
`276`	`271`
`277`	`272`	`@Test`
`278`		`- @Ignore`
`279`	`273`	`public void testPatternPropertiesValidator() throws Exception {`
`280`	`274`	`runTestFile("draft6/patternProperties.json");`
`281`	`275`	`}`
`282`	`276`
`283`	`277`	`@Test`
`284`		`- @Ignore`
`285`	`278`	`public void testPropertiesValidator() throws Exception {`
`286`	`279`	`runTestFile("draft6/properties.json");`
`287`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ public void testAdditionalPropertiesValidator() throws Exception {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`@Test`
`239`		`- @Ignore`
`240`	`239`	`public void testAllOfValidator() throws Exception {`
`241`	`240`	`runTestFile("draft7/allOf.json");`
`242`	`241`	`}`
`@@ -248,13 +247,11 @@ public void testAnchorValidator() throws Exception {`
`248`	`247`	`}`
`249`	`248`
`250`	`249`	`@Test`
`251`		`- @Ignore`
`252`	`250`	`public void testAnyOfValidator() throws Exception {`
`253`	`251`	`runTestFile("draft7/anyOf.json");`
`254`	`252`	`}`
`255`	`253`
`256`	`254`	`@Test`
`257`		`- @Ignore`
`258`	`255`	`public void testBooleanSchemaValidator() throws Exception {`
`259`	`256`	`runTestFile("draft7/boolean_schema.json");`
`260`	`257`	`}`
`@@ -372,13 +369,11 @@ public void testMultipleOfValidator() throws Exception {`
`372`	`369`	`}`
`373`	`370`
`374`	`371`	`@Test`
`375`		`- @Ignore`
`376`	`372`	`public void testNotValidator() throws Exception {`
`377`	`373`	`runTestFile("draft7/not.json");`
`378`	`374`	`}`
`379`	`375`
`380`	`376`	`@Test`
`381`		`- @Ignore`
`382`	`377`	`public void testOneOfValidator() throws Exception {`
`383`	`378`	`runTestFile("draft7/oneOf.json");`
`384`	`379`	`}`
`@@ -389,13 +384,11 @@ public void testPatternValidator() throws Exception {`
`389`	`384`	`}`
`390`	`385`
`391`	`386`	`@Test`
`392`		`- @Ignore`
`393`	`387`	`public void testPatternPropertiesValidator() throws Exception {`
`394`	`388`	`runTestFile("draft7/patternProperties.json");`
`395`	`389`	`}`
`396`	`390`
`397`	`391`	`@Test`
`398`		`- @Ignore`
`399`	`392`	`public void testPropertiesValidator() throws Exception {`
`400`	`393`	`runTestFile("draft7/properties.json");`
`401`	`394`	`}`