fixes #54 convert all numbers to decimal node for comparison in enum

networknt · Nov 16, 2019 · 08ca9e4 · 08ca9e4
1 parent e83fc2e
commit 08ca9e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/com/networknt/schema/EnumValidator.java b/src/main/java/com/networknt/schema/EnumValidator.java
@@ -17,6 +17,7 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.DecimalNode;
 import com.fasterxml.jackson.databind.node.NullNode;
 
 import org.slf4j.Logger;
@@ -44,7 +45,12 @@ public EnumValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSc
             String separator = "";
 
             for (JsonNode n : schemaNode) {
-                nodes.add(n);
+                if(n.isNumber()) {
+                    // convert to DecimalNode for number comparison
+                    nodes.add(DecimalNode.valueOf(n.decimalValue()));
+                } else {
+                    nodes.add(n);
+                }
 
                 sb.append(separator);
                 sb.append(n.asText());
@@ -77,7 +83,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         debug(logger, node, rootNode, at);
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
-
+        if(node.isNumber()) node = DecimalNode.valueOf(node.decimalValue());
         if (!nodes.contains(node) && !(config.isTypeLoose() && isTypeLooseContainsInEnum(node))) {
             errors.add(buildValidationMessage(at, error));
         }

diff --git a/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java b/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java
@@ -289,7 +289,6 @@ public void testDependenciesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testEnumValidator() throws Exception {
         runTestFile("draft2019-09/enum.json");
     }

diff --git a/src/test/java/com/networknt/schema/V6JsonSchemaTest.java b/src/test/java/com/networknt/schema/V6JsonSchemaTest.java
@@ -183,7 +183,6 @@ public void testDependenciesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testEnumValidator() throws Exception {
         runTestFile("draft6/enum.json");
     }

diff --git a/src/test/java/com/networknt/schema/V7JsonSchemaTest.java b/src/test/java/com/networknt/schema/V7JsonSchemaTest.java
@@ -285,7 +285,6 @@ public void testDependenciesValidator() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testEnumValidator() throws Exception {
         runTestFile("draft7/enum.json");
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,7 +289,6 @@ public void testDependenciesValidator() throws Exception { @@
         }
         @Test
-        @Ignore
         public void testEnumValidator() throws Exception {
             runTestFile("draft2019-09/enum.json");
         }
@@ Expand Down @@