Merge branch 'master' into url-map-performance

Author: rhwood

CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.0.7 - 2019-04-29
+
+### Added
+
+### Changed
+
+- fixes #140 Convert double to BigDecimal in MultipleOfValidator to make the validation more accurate. Thanks @jiachen1120
+
 ## 1.0.6 - 2019-04-10
 
 ### Added

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <packaging>bundle</packaging>
     <description>A json schema validator that supports draft v4</description>
     <url>https://github.com/networknt/json-schema-validator</url>

src/main/java/com/networknt/schema/BaseJsonValidator.java

@@ -83,7 +83,7 @@ private static JsonSchema obtainSubSchemaNode(JsonNode schemaNode, ValidationCon
             }
             else {
                 URL url = URLFactory.toURL(node.textValue());
-                return validationContext.getJsonSchemaFactory().getSchema(url);
+                return validationContext.getJsonSchemaFactory().getSchema(url, validationContext.getConfig());
             }
         } catch (MalformedURLException e) {
             return null;

src/main/java/com/networknt/schema/MultipleOfValidator.java

@@ -1,57 +1,60 @@
-/*
- * 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.JsonNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class MultipleOfValidator extends BaseJsonValidator implements JsonValidator {
-    private static final Logger logger = LoggerFactory.getLogger(MultipleOfValidator.class);
-
-    private double divisor = 0;
-
-    public MultipleOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
-
-        super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MULTIPLE_OF, validationContext);
-        if (schemaNode.isNumber()) {
-            divisor = schemaNode.doubleValue();
-        }
-
-        parseErrorCode(getValidatorType().getErrorCodeKey());
-    }
-
-    public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
-        debug(logger, node, rootNode, at);
-
-        if (node.isNumber()) {
-            double nodeValue = node.doubleValue();
-            if (divisor != 0) {
-                long multiples = Math.round(nodeValue / divisor);
-                if (Math.abs(multiples * divisor - nodeValue) > 1e-12) {
-                    return Collections.singleton(buildValidationMessage(at, "" + divisor));
-                }
-            }
-        }
-
-        return Collections.emptySet();
-    }
-
-}
+/*
+ * 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.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Set;
+
+public class MultipleOfValidator extends BaseJsonValidator implements JsonValidator {
+    private static final Logger logger = LoggerFactory.getLogger(MultipleOfValidator.class);
+
+    private double divisor = 0;
+
+    public MultipleOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
+
+        super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MULTIPLE_OF, validationContext);
+        if (schemaNode.isNumber()) {
+            divisor = schemaNode.doubleValue();
+        }
+
+        parseErrorCode(getValidatorType().getErrorCodeKey());
+    }
+
+    public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
+        debug(logger, node, rootNode, at);
+
+        if (node.isNumber()) {
+            double nodeValue = node.doubleValue();
+            if (divisor != 0) {
+                // convert to BigDecimal since double type is not accurate enough to do the division and multiple
+                BigDecimal accurateDividend = new BigDecimal(String.valueOf(nodeValue));
+                BigDecimal accurateDivisor = new BigDecimal(String.valueOf(divisor));
+                if (Math.abs(accurateDividend.divideAndRemainder(accurateDivisor)[1].doubleValue()) > 1e-12) {
+                    return Collections.singleton(buildValidationMessage(at, "" + divisor));
+                }
+            }
+        }
+
+        return Collections.emptySet();
+    }
+
+}

src/main/java/com/networknt/schema/RefValidator.java

@@ -62,7 +62,7 @@ static JsonSchema getRefSchema(JsonSchema parentSchema, ValidationContext valida
 
             try {
                 URL url = URLFactory.toURL(schemaUrl);
-                parentSchema = validationContext.getJsonSchemaFactory().getSchema(url);
+                parentSchema = validationContext.getJsonSchemaFactory().getSchema(url, validationContext.getConfig());
             } catch (MalformedURLException e) {
                 InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(schemaUrl);
                 parentSchema = validationContext.getJsonSchemaFactory().getSchema(is);

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

@@ -130,6 +130,17 @@ public void testValidatorConfigExampleMappings() throws IOException {
         assertEquals(0, schema.validate(mapper.createObjectNode()).size());
     }
 
+    @Test
+    public void testMappingsForRef() throws IOException {
+        JsonSchemaFactory instance = JsonSchemaFactory.getInstance();
+        URL mappings = URLFactory.toURL("resource:tests/url_mapping/schema-with-ref-mapping.json");
+        SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+        config.setUrlMappings(getUrlMappingsFromUrl(mappings));
+        JsonSchema schema = instance.getSchema(URLFactory.toURL("resource:tests/url_mapping/schema-with-ref.json"),
+                config);
+        assertEquals(0, schema.validate(mapper.readTree("[]")).size());
+    }
+
     private Map<String, String> getUrlMappingsFromUrl(URL url) throws MalformedURLException, IOException {
         HashMap<String, String> map = new HashMap<String, String>();
         for (JsonNode mapping : mapper.readTree(url)) {

src/test/resources/tests/multipleOf.json

@@ -56,5 +56,38 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "by small number",
+        "schema": {
+            "multipleOf": 0.01
+        },
+        "tests": [
+            {
+                "description": "9313.7 is a multiple of 0.01",
+                "data": 9313.7,
+                "valid": true
+            },
+            {
+                "description": "9313.9 is a multiple of 0.01",
+                "data": 9313.9,
+                "valid": true
+            },
+            {
+                "description": "9313.8 is a multiple of 0.01",
+                "data": 9313.8,
+                "valid": true
+            },
+            {
+                "description": "9313.8 is a multiple of 0.01",
+                "data": -9313.8861,
+                "valid": false
+            },
+            {
+                "description": "9313.8 is a multiple of 0.01",
+                "data": -9313.8,
+                "valid": true
+            }
+        ]
     }
 ]

src/test/resources/tests/url_mapping/schema-with-ref-mapping.json

@@ -0,0 +1,10 @@
+[
+    {
+        "publicURL": "http://json-schema.org/draft-04/schema#",
+        "localURL": "resource:/draftv4.schema.json"
+    },
+    {
+        "publicURL": "http://example.com/invalid/schema/url",
+        "localURL": "resource:/tests/url_mapping/example-schema.json"
+    }
+]

src/test/resources/tests/url_mapping/schema-with-ref.json

@@ -0,0 +1,10 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "json-object-with-schema",
+    "type": "array",
+    "properties": {
+        "schema": {
+            "$ref": "http://example.com/invalid/schema/url"
+        }
+    }
+}