Merge pull request #3 from networknt/master

Getting latest changes from networknt

Author: prashanthjos

CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.0.43 - 2020-08-10
+
+### Added
+
+### Changed
+
+- fixes #317 Compatible with Jackson 2.9.x. Thanks @pan3793
+- fixes #315 implement propertyNames validator for v6, v7 and v2019-09
+
 ## 1.0.42 - 2020-06-30
 
 ### Added

README.md

@@ -82,15 +82,15 @@ Maven:
 <dependency>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.42</version>
+    <version>1.0.43</version>
 </dependency>
 ```
 
 Gradle:
 
 ```
 dependencies {
-    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.42");
+    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.43");
 }
 ```
 

pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.42</version>
+    <version>1.0.43</version>
     <packaging>bundle</packaging>
     <description>A json schema validator that supports draft v4, v6, v7 and v2019-09</description>
     <url>https://github.com/networknt/json-schema-validator</url>

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

@@ -92,6 +92,7 @@ public Object get(String name) {
 
     /**
      * Returns all the collected data. Please look into {@link #get(String)} method for more details.
+     * @return Map
      */
     public Map<String, Object> getAll() {
         Map<String, Object> mergedMap = new HashMap<String, Object>();

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

@@ -47,7 +47,8 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             return Collections.emptySet();
         }
 
-        if (node.isEmpty()) {
+        // to support jackson < 2.10
+        if (node.size() == 0) {
             // Array was empty
             return buildErrorMessageSet(at);
         } else if (node.isArray()) {

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

@@ -333,8 +333,7 @@ public JsonValidator newValidator(ValidationContext validationContext, String sc
         try {
             Keyword kw = keywords.get(keyword);
             if (kw == null) {
-                if (!UNKNOWN_KEYWORDS.containsKey(keyword)) {
-                    UNKNOWN_KEYWORDS.put(keyword, keyword);
+                if (UNKNOWN_KEYWORDS.put(keyword, keyword) == null) {
                     logger.warn("Unknown keyword " + keyword + " - you should define your own Meta Schema. If the keyword is irrelevant for validation, just use a NonValidationKeyword");
                 }
                 return null;

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

@@ -61,7 +61,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 }
             }
         } else {
-            if(!schemaValue && node.isObject() && !node.isEmpty()) {
+            if(!schemaValue && node.isObject() && node.size() != 0) {
                 errors.add(buildValidationMessage(at + "." + node, "false"));
             }
         }

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

@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.*;
 
 public class CollectorContextTest {
@@ -96,7 +97,7 @@ public void testCollectorContextWithMultiplThreads() throws Exception {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void testCollectorWithFormat() throws JsonMappingException, JsonProcessingException {
+    public void testCollectorWithFormat() throws JsonMappingException, JsonProcessingException, IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         ValidationResult validationResult = jsonSchemaForCombine.validateAndCollect(objectMapper
                 .readTree("{\"property1\":\"sample1\",\"property2\":\"sample2\",\"property3\":\"sample3\" }"));
@@ -108,7 +109,7 @@ public void testCollectorWithFormat() throws JsonMappingException, JsonProcessin
 
     @SuppressWarnings("unchecked")
     @Test
-    public void testCollectorGetAll() throws JsonMappingException, JsonProcessingException {
+    public void testCollectorGetAll() throws JsonMappingException, JsonProcessingException, IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         ValidationResult validationResult = jsonSchemaForCombine.validateAndCollect(objectMapper
                 .readTree("{\"property1\":\"sample1\",\"property2\":\"sample2\",\"property3\":\"sample3\" }"));

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

@@ -5,6 +5,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -52,7 +53,7 @@ public class Issue285Test {
     // In this case the "lastName" should be a string.
     // The result is as expected and we get an validation error.
     @Test
-    public void nestedValidation() throws JsonProcessingException {
+    public void nestedValidation() throws IOException {
         JsonSchema jsonSchema = schemaFactory.getSchema(schemaStr);
         Set<ValidationMessage> validationMessages = jsonSchema.validate(mapper.readTree(person));
 
@@ -93,7 +94,7 @@ public void nestedValidation() throws JsonProcessingException {
     // The result is not as expected and we get no validation error.
     @Test
     @Ignore
-    public void nestedTypeValidation() throws JsonProcessingException, URISyntaxException {
+    public void nestedTypeValidation() throws IOException, URISyntaxException {
         URI uri = new URI("https://json-schema.org/draft/2019-09/schema");
         JsonSchema jsonSchema = schemaFactory.getSchema(uri);
         Set<ValidationMessage> validationMessages = jsonSchema.validate(mapper.readTree(invalidNestedSchema));
@@ -116,7 +117,7 @@ public void nestedTypeValidation() throws JsonProcessingException, URISyntaxExce
     // In this case the toplevel type declaration isn't valid and should raise an error.
     // The result is as expected and we get no validation error: '[$.type: does not have a value in the enumeration [array, boolean, integer, null, number, object, string], $.type: should be valid to any of the schemas array]'.
     @Test
-    public void typeValidation() throws JsonProcessingException, URISyntaxException {
+    public void typeValidation() throws IOException, URISyntaxException {
         URI uri = new URI("https://json-schema.org/draft/2019-09/schema");
         JsonSchema jsonSchema = schemaFactory.getSchema(uri);
         Set<ValidationMessage> validationMessages = jsonSchema.validate(mapper.readTree(invalidSchema));

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

@@ -1,11 +1,11 @@
 package com.networknt.schema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.Set;
 
 public class UnknownMetaSchemaTest {
@@ -17,7 +17,7 @@ public class UnknownMetaSchemaTest {
     private String json = "{\"data\":1}";
 
     @Test
-    public void testSchema1() throws JsonProcessingException {
+    public void testSchema1() throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(this.json);
 
@@ -31,7 +31,7 @@ public void testSchema1() throws JsonProcessingException {
     }
 
     @Test
-    public void testSchema2() throws JsonProcessingException {
+    public void testSchema2() throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(this.json);
 
@@ -44,7 +44,7 @@ public void testSchema2() throws JsonProcessingException {
         }
     }
     @Test
-    public void testSchema3() throws JsonProcessingException {
+    public void testSchema3() throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(this.json);