Merge pull request #4 from networknt/master

Merging Changes from networknt repo.

Author: prashanthjos

pom.xml

@@ -63,11 +63,11 @@
         <java.testversion>1.8</java.testversion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.jackson>2.10.4</version.jackson>
-        <version.slf4j>1.7.25</version.slf4j>
-        <version.common-lang3>3.5</version.common-lang3>
+        <version.slf4j>1.7.30</version.slf4j>
+        <version.common-lang3>3.7</version.common-lang3>
         <version.joni>2.1.31</version.joni>
         <version.logback>1.2.3</version.logback>
-        <version.junit>4.12</version.junit>
+        <version.junit>4.13.1</version.junit>
         <version.mockito>2.7.21</version.mockito>
         <version.hamcrest>1.3</version.hamcrest>
         <version.undertow>2.1.3.Final</version.undertow>
@@ -91,6 +91,7 @@
         <dependency>
             <groupId>org.jruby.joni</groupId>
             <artifactId>joni</artifactId>
+            <optional>true</optional>
             <version>${version.joni}</version>
         </dependency>
         <dependency>
@@ -163,6 +164,39 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.RC1</version>
+                <executions>
+                    <execution>
+                        <id>add-module-info</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfoSource>
+                                    module com.networknt.schema {
+                                        requires transitive com.fasterxml.jackson.databind;
+                                        requires org.apache.commons.lang3;
+                                        requires org.jruby.jcodings;
+                                        requires org.jruby.joni;
+                                        requires org.slf4j;
+
+                                        exports com.networknt.schema;
+                                        exports com.networknt.schema.format;
+                                        exports com.networknt.schema.uri;
+                                        exports com.networknt.schema.urn;
+                                    }
+                                </moduleInfoSource>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -193,13 +227,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
                         <goals>
                             <goal>jar</goal>
                         </goals>
+                        <configuration>
+                            <source>8</source>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -243,7 +280,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <version>0.8.6</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -311,7 +348,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.7.9</version>
+                        <version>0.8.6</version>
                         <executions>
                             <!-- The Executions for merging -->
                             <execution>

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

@@ -141,7 +141,8 @@ public static JsonMetaSchema getInstance() {
                             new NonValidationKeyword("title"),
                             new NonValidationKeyword("description"),
                             new NonValidationKeyword("default"),
-                            new NonValidationKeyword("definitions")
+                            new NonValidationKeyword("definitions"),
+                            new NonValidationKeyword("$comment")
                     ))
                     .build();
         }
@@ -171,6 +172,7 @@ public static JsonMetaSchema getInstance() {
                             new NonValidationKeyword("description"),
                             new NonValidationKeyword("default"),
                             new NonValidationKeyword("definitions"),
+                            new NonValidationKeyword("$comment"),
                             new NonValidationKeyword("$defs")  // newly added in 2018-09 release.
                     ))
                     .build();

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

@@ -0,0 +1,34 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.InputStream;
+import java.util.Set;
+
+public class Issue327Test {
+    protected JsonSchema getJsonSchemaFromStreamContentV7(InputStream schemaContent) {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+        return factory.getSchema(schemaContent);
+    }
+
+    protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(content);
+        return node;
+    }
+
+    @Test
+    public void shouldWorkV7() throws Exception {
+        String schemaPath = "/schema/issue327-v7.json";
+        String dataPath = "/data/issue327.json";
+        InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
+        JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        Set<ValidationMessage> errors = schema.validate(node);
+        Assert.assertEquals(0, errors.size());
+    }
+}

src/test/resources/data/issue327.json

@@ -0,0 +1,5 @@
+{
+  "firstName": "John",
+  "lastName": "Doe",
+  "age": 21
+}

src/test/resources/schema/issue327-v7.json

@@ -0,0 +1,21 @@
+{
+  "$id": "https://example.com/person.schema.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Person",
+  "type": "object",
+  "properties": {
+    "firstName": {
+      "type": "string",
+      "description": "The person's first name."
+    },
+    "lastName": {
+      "type": "string",
+      "description": "The person's last name."
+    },
+    "age": {
+      "description": "Age in years which must be equal to or greater than zero.",
+      "type": "integer",
+      "minimum": 0
+    }
+  }
+}