Merge pull request #343 from oguzhanunlu/numeric-validation

stevehu · web-flow · commit 912ee75d51b9 · 2020-11-14T21:34:44.000-05:00
Improve type validation of numeric values
diff --git a/src/main/java/com/networknt/schema/DateTimeValidator.java b/src/main/java/com/networknt/schema/DateTimeValidator.java
@@ -51,7 +51,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             return errors;
         }
diff --git a/src/main/java/com/networknt/schema/EnumValidator.java b/src/main/java/com/networknt/schema/EnumValidator.java
@@ -96,7 +96,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
      * @param node JsonNode to check
      */
     private boolean isTypeLooseContainsInEnum(JsonNode node) {
-        if (TypeFactory.getValueNodeType(node) == JsonType.STRING) {
+        if (TypeFactory.getValueNodeType(node, super.config) == JsonType.STRING) {
             String nodeText = node.textValue();
             for (JsonNode n : nodes) {
                 String value = n.asText();
diff --git a/src/main/java/com/networknt/schema/ExclusiveMaximumValidator.java b/src/main/java/com/networknt/schema/ExclusiveMaximumValidator.java
@@ -99,7 +99,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, config.isTypeLoose())) {
+        if (!TypeValidator.isNumber(node, super.config)) {
             // maximum only applies to numbers
             return Collections.emptySet();
         }
diff --git a/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java b/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java
@@ -106,7 +106,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, config.isTypeLoose())) {
+        if (!TypeValidator.isNumber(node, super.config)) {
             // minimum only applies to numbers
             return Collections.emptySet();
         }
diff --git a/src/main/java/com/networknt/schema/FormatValidator.java b/src/main/java/com/networknt/schema/FormatValidator.java
@@ -41,7 +41,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             return errors;
         }
diff --git a/src/main/java/com/networknt/schema/MaxLengthValidator.java b/src/main/java/com/networknt/schema/MaxLengthValidator.java
@@ -41,7 +41,7 @@ public MaxLengthValidator(String schemaPath, JsonNode schemaNode, JsonSchema par
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             // ignore no-string typs
             return Collections.emptySet();
diff --git a/src/main/java/com/networknt/schema/MaximumValidator.java b/src/main/java/com/networknt/schema/MaximumValidator.java
@@ -108,7 +108,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, config.isTypeLoose())) {
+        if (!TypeValidator.isNumber(node, super.config)) {
             // maximum only applies to numbers
             return Collections.emptySet();
         }
diff --git a/src/main/java/com/networknt/schema/MinLengthValidator.java b/src/main/java/com/networknt/schema/MinLengthValidator.java
@@ -41,7 +41,7 @@ public MinLengthValidator(String schemaPath, JsonNode schemaNode, JsonSchema par
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             // ignore non-string types
             return Collections.emptySet();
diff --git a/src/main/java/com/networknt/schema/MinimumValidator.java b/src/main/java/com/networknt/schema/MinimumValidator.java
@@ -114,7 +114,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, config.isTypeLoose())) {
+        if (!TypeValidator.isNumber(node, super.config)) {
             // minimum only applies to numbers
             return Collections.emptySet();
         }
diff --git a/src/main/java/com/networknt/schema/PatternValidator.java b/src/main/java/com/networknt/schema/PatternValidator.java
@@ -94,7 +94,7 @@ private boolean matches(String value) {
         public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
             debug(logger, node, rootNode, at);
 
-            JsonType nodeType = TypeFactory.getValueNodeType(node);
+            JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
             if (nodeType != JsonType.STRING) {
                 return Collections.emptySet();
             }
@@ -151,7 +151,7 @@ private boolean matches(String value) {
         public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
             debug(logger, node, rootNode, at);
 
-            JsonType nodeType = TypeFactory.getValueNodeType(node);
+            JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
             if (nodeType != JsonType.STRING) {
                 return Collections.emptySet();
             }
diff --git a/src/main/java/com/networknt/schema/SchemaValidatorsConfig.java b/src/main/java/com/networknt/schema/SchemaValidatorsConfig.java
@@ -41,6 +41,11 @@ public class SchemaValidatorsConfig {
      */
     private boolean ecma262Validator;
 
+    /**
+     * When set to true, use Java-specific semantics rather than native JavaScript semantics
+     */
+    private boolean javaSemantics;
+
     /**
      * Map of public, normally internet accessible schema URLs to alternate locations; this allows for offline
      * validation of schemas that refer to public URLs. This is merged with any mappings the {@link JsonSchemaFactory}
@@ -112,7 +117,11 @@ public boolean isEcma262Validator() {
     public void setEcma262Validator(boolean ecma262Validator) {
         this.ecma262Validator = ecma262Validator;
     }
-    
+
+    public boolean isJavaSemantics() { return javaSemantics; }
+
+    public void setJavaSemantics(boolean javaSemantics) { this.javaSemantics = javaSemantics; }
+
     public void addKeywordWalkListener(JsonSchemaWalkListener keywordWalkListener) {
 		if (keywordWalkListenersMap.get(ALL_KEYWORD_WALK_LISTENER_KEY) == null) {
 			List<JsonSchemaWalkListener> keywordWalkListeners = new ArrayList<JsonSchemaWalkListener>();
diff --git a/src/main/java/com/networknt/schema/TypeFactory.java b/src/main/java/com/networknt/schema/TypeFactory.java
@@ -18,6 +18,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import javax.xml.validation.Schema;
+
 public class TypeFactory {
     public static JsonType getSchemaNodeType(JsonNode node) {
         //Single Type Definition
@@ -57,7 +59,7 @@ public static JsonType getSchemaNodeType(JsonNode node) {
         return JsonType.UNKNOWN;
     }
 
-    public static JsonType getValueNodeType(JsonNode node) {
+    public static JsonType getValueNodeType(JsonNode node, SchemaValidatorsConfig config) {
         if (node.isContainerNode()) {
             if (node.isObject())
                 return JsonType.OBJECT;
@@ -72,7 +74,10 @@ public static JsonType getValueNodeType(JsonNode node) {
             if (node.isIntegralNumber())
                 return JsonType.INTEGER;
             if (node.isNumber())
-                return JsonType.NUMBER;
+                if (config.isJavaSemantics() && node.canConvertToLong() && (node.asText().indexOf('.') == -1))
+                    return JsonType.INTEGER;
+                else
+                    return JsonType.NUMBER;
             if (node.isBoolean())
                 return JsonType.BOOLEAN;
             if (node.isNull())
diff --git a/src/main/java/com/networknt/schema/TypeValidator.java b/src/main/java/com/networknt/schema/TypeValidator.java
@@ -51,7 +51,7 @@ public JsonType getSchemaType() {
     }
 
     public boolean equalsToSchemaType(JsonNode node) {
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         // in the case that node type is not the same as schema type, try to convert node to the
         // same type of schema. In REST API, query parameters, path parameters and headers are all
         // string type and we must convert, otherwise, all schema validations will fail.
@@ -107,7 +107,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         }
 
         if (!equalsToSchemaType(node)) {
-            JsonType nodeType = TypeFactory.getValueNodeType(node);
+            JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
             return Collections.singleton(buildValidationMessage(at, nodeType.toString(), schemaType.toString()));
         }
         return Collections.emptySet();
@@ -218,14 +218,14 @@ public static boolean isNumeric(String str) {
      * status of typeLoose flag.
      *
      * @param node        the JsonNode to check
-     * @param isTypeLoose The flag to show whether typeLoose is enabled
+     * @param config      the SchemaValidatorsConfig to depend on
      * @return boolean to indicate if it is a number
      */
-    public static boolean isNumber(JsonNode node, boolean isTypeLoose) {
+    public static boolean isNumber(JsonNode node, SchemaValidatorsConfig config) {
         if (node.isNumber()) {
             return true;
-        } else if (isTypeLoose) {
-            if (TypeFactory.getValueNodeType(node) == JsonType.STRING) {
+        } else if (config.isTypeLoose()) {
+            if (TypeFactory.getValueNodeType(node, config) == JsonType.STRING) {
                 return isNumeric(node.textValue());
             }
         }
diff --git a/src/main/java/com/networknt/schema/UUIDValidator.java b/src/main/java/com/networknt/schema/UUIDValidator.java
@@ -43,7 +43,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             return errors;
         }
diff --git a/src/main/java/com/networknt/schema/UnionTypeValidator.java b/src/main/java/com/networknt/schema/UnionTypeValidator.java
@@ -66,7 +66,7 @@ public UnionTypeValidator(String schemaPath, JsonNode schemaNode, JsonSchema par
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
 
         boolean valid = false;
 
diff --git a/src/main/java/com/networknt/schema/format/EmailValidator.java b/src/main/java/com/networknt/schema/format/EmailValidator.java
@@ -147,7 +147,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
         if (nodeType != JsonType.STRING) {
             return errors;
         }
diff --git a/src/test/java/com/networknt/schema/TypeFactoryTest.java b/src/test/java/com/networknt/schema/TypeFactoryTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.node.DecimalNode;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static com.networknt.schema.TypeFactory.getValueNodeType;
+import static org.junit.Assert.*;
+
+public class TypeFactoryTest {
+
+    private static final String[] validIntegralValues = {
+            "1", "-1", "0E+1", "0E1", "-0E+1", "-0E1", "10.1E+1", "10.1E1", "-10.1E+1", "-10.1E1", "1E+0", "1E-0",
+            "1E0", "1E18", "9223372036854775807", "-9223372036854775808"
+    };
+
+    private final SchemaValidatorsConfig schemaValidatorsConfig = new SchemaValidatorsConfig();
+
+    @Test
+    public void testValidIntegralValuesWithJavaSemantics() {
+        schemaValidatorsConfig.setJavaSemantics(true);
+        for (String validValue : validIntegralValues) {
+            assertSame(validValue, JsonType.INTEGER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig));
+        }
+    }
+
+    @Test
+    public void testValidIntegralValuesWithoutJavaSemantics() {
+        schemaValidatorsConfig.setJavaSemantics(false);
+        for (String validValue : validIntegralValues) {
+            assertSame(validValue, JsonType.NUMBER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig));
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String`
`51`	`51`
`52`	`52`	`Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();`
`53`	`53`
`54`		`- JsonType nodeType = TypeFactory.getValueNodeType(node);`
	`54`	`+ JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);`
`55`	`55`	`if (nodeType != JsonType.STRING) {`
`56`	`56`	`return errors;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public String thresholdValue() {`
`99`	`99`	`public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {`
`100`	`100`	`debug(logger, node, rootNode, at);`
`101`	`101`
`102`		`- if (!TypeValidator.isNumber(node, config.isTypeLoose())) {`
	`102`	`+ if (!TypeValidator.isNumber(node, super.config)) {`
`103`	`103`	`// maximum only applies to numbers`
`104`	`104`	`return Collections.emptySet();`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public String thresholdValue() {`
`106`	`106`	`public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {`
`107`	`107`	`debug(logger, node, rootNode, at);`
`108`	`108`
`109`		`- if (!TypeValidator.isNumber(node, config.isTypeLoose())) {`
	`109`	`+ if (!TypeValidator.isNumber(node, super.config)) {`
`110`	`110`	`// minimum only applies to numbers`
`111`	`111`	`return Collections.emptySet();`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String`
`41`	`41`
`42`	`42`	`Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();`
`43`	`43`
`44`		`- JsonType nodeType = TypeFactory.getValueNodeType(node);`
	`44`	`+ JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);`
`45`	`45`	`if (nodeType != JsonType.STRING) {`
`46`	`46`	`return errors;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public String thresholdValue() {`
`108`	`108`	`public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {`
`109`	`109`	`debug(logger, node, rootNode, at);`
`110`	`110`
`111`		`- if (!TypeValidator.isNumber(node, config.isTypeLoose())) {`
	`111`	`+ if (!TypeValidator.isNumber(node, super.config)) {`
`112`	`112`	`// maximum only applies to numbers`
`113`	`113`	`return Collections.emptySet();`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public String thresholdValue() {`
`114`	`114`	`public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {`
`115`	`115`	`debug(logger, node, rootNode, at);`
`116`	`116`
`117`		`- if (!TypeValidator.isNumber(node, config.isTypeLoose())) {`
	`117`	`+ if (!TypeValidator.isNumber(node, super.config)) {`
`118`	`118`	`// minimum only applies to numbers`
`119`	`119`	`return Collections.emptySet();`
`120`	`120`	`}`