Merge branch 'master' of https://github.com/networknt/json-schema-validator

Author: Matthias Sattel

CHANGELOG.md

@@ -9,6 +9,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.0.29 - 2019-12-16
+
+### Added
+
+### Changed
+
+- Update description in pom.xml to match readme.md. Thanks @reftel 
+- fixes #232 update meta schema URI to https
+- fixes #229 move the remotes to resource from draftv4
+- fixes #228 support boolean schema in the dependencies validator
+- enable const validator test for v6
+- fixes #224 support boolean schema for the item validator
+- fixes #222 add document for URL mapping
+
+## 1.0.28 - 2019-11-25
+
+### Added
+
+### Changed
+
+- fixes #219 Fix for oneOf when not all properties are matched. Thanks @aznan2
+
 ## 1.0.27 - 2019-11-18
 
 ### Added

README.md

@@ -1 +1,167 @@
-## This is a fork of https://github.com/networknt/json-schema-validator to support Android 6 API >=23
+[Stack Overflow](https://stackoverflow.com/questions/tagged/light-4j) |
+[Google Group](https://groups.google.com/forum/#!forum/light-4j) |
+[Gitter Chat](https://gitter.im/networknt/light-rest-4j) |
+[Subreddit](https://www.reddit.com/r/lightapi/) |
+[Youtube](https://www.youtube.com/channel/UCHCRMWJVXw8iB7zKxF55Byw) |
+[Documentation](https://doc.networknt.com/library/json-schema-validator/) |
+[Javadocs](https://www.javadoc.io/doc/com.networknt/json-schema-validator) |
+[Contribution Guide](https://doc.networknt.com/contribute/) |
+
+[![Build Status](https://travis-ci.org/networknt/json-schema-validator.svg?branch=master)](https://travis-ci.org/networknt/json-schema-validator) [![codecov.io](https://codecov.io/github/networknt/json-schema-validator/coverage.svg?branch=master)](https://codecov.io/github/networknt/json-schema-validator?branch=master)
+
+
+This is a Java implementation of the [JSON Schema Core Draft v4, v6, v7 and v2019-09](http://json-schema.org/latest/json-schema-core.html) specification for JSON schema validation. In addition, it also works for OpenAPI 3.0 request/response validation with some [configuration flags](doc/config.md). The default JSON parser is the [Jackson](https://github.com/FasterXML/jackson) that is the most popular one. As it is a key component in our [light-4j](https://github.com/networknt/light-4j) microservices framework to validate request/response against OpenAPI specification for [light-rest-4j](http://www.networknt.com/style/light-rest-4j/) and RPC schema for [light-hybrid-4j](http://www.networknt.com/style/light-hybrid-4j/) at runtime, performance is the most important aspect in the design. 
+
+## Why this library
+
+#### Performance
+
+It is the fastest Java JSON Schema Validator as far as I know. Here is the testing result compare with the other two open-source implementations. It is about 32 times faster than the Fge and five times faster than the Everit.
+
+fge: 7130ms
+
+everit-org: 1168ms
+
+networknt: 223ms
+
+You can run the performance tests for three libraries from [https://github.com/networknt/json-schema-validator-perftest](https://github.com/networknt/json-schema-validator-perftest)
+
+#### Parser
+
+It uses Jackson that is the most popular JSON parser in Java. If you are using Jackson parser already in your project, it is natural to choose this library over others for schema validation. 
+
+#### YAML Support
+
+The library works with JSON and YAML on both schema definitions and input data. 
+
+#### OpenAPI Support
+
+The OpenAPI 3.0 specification is using JSON schema to validate the request/response, but there are some differences. With a configuration file, you can enable the library to work with OpenAPI 3.0 validation. 
+
+#### Dependency
+
+Following the design principle of the Light Platform, this library has minimum dependencies to ensure there are no dependency conflicts when using it. 
+
+Here are the dependencies. 
+
+```
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${version.slf4j}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${version.common-lang3}</version>
+        </dependency>
+```
+
+#### Community
+
+This library is very active with a lot of contributors. New features and bug fixes are handled quickly by the team members. Because it is an essential dependency of the [light-4j](https://github.com/networknt/light-4j) framework in the same GitHub organization, it will be evolved and maintained along with the framework. 
+
+## Prerequisite
+
+The library supports Java 8 and up. If you want to build from the source code, you need to install JDK 8 locally. To support multiple version of JDK, you can use [SDKMAN](https://www.networknt.com/tool/sdk/)
+
+## Dependency
+
+This package is available on Maven central. 
+
+Maven: 
+
+```xml
+<dependency>
+    <groupId>com.networknt</groupId>
+    <artifactId>json-schema-validator</artifactId>
+    <version>1.0.29</version>
+</dependency>
+```
+
+Gradle:
+
+```
+dependencies {
+    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.29");
+}
+```
+
+For the latest version, please check the [release](https://github.com/networknt/json-schema-validator/releases) page. 
+
+## [Quick Start](doc/quickstart.md)
+
+## [Validators](doc/validators.md)
+
+## [Configuration](doc/config.md)
+
+## [Specification Version](doc/specversion.md)
+
+## [YAML Validation](doc/yaml.md)
+
+## [Schema Mapping](doc/schema-map.md)
+
+## [Customized URIFetcher](doc/cust-fetcher.md)
+
+## [Customized MetaSchema](doc/cust-meta.md)
+
+
+## Known issues
+
+I have just updated the test suites from the [official website](https://github.com/json-schema-org/JSON-Schema-Test-Suite) as the old ones were copied from another Java validator. Now there are several issues that need to be addressed. All of them are edge cases, in my opinion, but need to be investigated. As my old test suites were inherited from another Java JSON Schema Validator, I guess other Java Validator would have the same issues as these issues are in the Java language itself.
+
+[#7](https://github.com/networknt/json-schema-validator/issues/7)
+
+[#5](https://github.com/networknt/json-schema-validator/issues/5)
+
+## Contributors
+
+Thanks to the following people who have contributed to this project. If you are using this library, please consider to be a sponsor for one of the contributors. 
+
+[@stevehu](https://github.com/sponsors/stevehu)
+
+[@jiachen1120](https://github.com/jiachen1120)
+
+[@BalloonWen](https://github.com/BalloonWen)
+
+[@eskabetxe](https://github.com/eskabetxe)
+
+[@ddobrin](https://github.com/ddobrin)
+
+[@ehrmann](https://github.com/ehrmann)
+
+[@rhwood](https://github.com/rhwood)
+
+[@nitin1891](https://github.com/nitin1891)
+
+[@jawaff](https://github.com/jawaff)
+
+[@kosty](https://github.com/kosty)
+
+[@chenyan71](https://github.com/chenyan71)
+
+[@chrisken](https://github.com/chrisken)
+
+[@NicholasAzar](https://github.com/NicholasAzar)
+
+[@basinilya](https://github.com/basinilya)
+
+For all contributors, please visit https://github.com/networknt/json-schema-validator/graphs/contributors
+
+If you are a contributor, please join the [GitHub Sponsors](https://github.com/sponsors) and swithch the link to your sponsors dashboard via a PR.
+
+## Sponsors
+
+
+### Individual Sponsors
+
+
+### Corporation Sponsors
+
+
+

doc/cust_fetcher.md

@@ -0,0 +1 @@
+The default URIFetcher implementation uses JDK connection/socket without handling network exceptions. It works in most of the cases; however, if you want to have a customized implementation, you can do so. One user has his implementation with urirest to handle the timeout. A detailed discussion can be found in this [issue](https://github.com/networknt/json-schema-validator/issues/240)

doc/cust_meta.md

@@ -0,0 +1,6 @@
+How to use your customized meta schema?
+
+The library supports customized meta schema with this builder method. We have provided default instances for v4, v6, v7, and v2019-09 but users can always create their own JsonMetaSchema instance with customized meta schema.
+
+https://github.com/networknt/json-schema-validator/blob/master/src/main/java/com/networknt/schema/JsonMetaSchema.java#L188
+

doc/schema-map.md

@@ -0,0 +1,19 @@
+While working with JSON schema validation, we have to use external references sometimes. However, there are two issues to have references to schemas on the Internet. 
+
+* Some applications are running inside a corporate network without Internet access. 
+* Some of the Internet resources are not reliable
+
+One solution is to change all the external reference to internal in JSON schemas, but this is error-prone and hard to maintain in a long run. 
+
+A smart solution is to map the external references to internal ones in a configuration file. This allows us to use the resources as they are without any modification. In the JSON schema specification, it is not allowed to use local filesystem resource directly. With the mapping, we can use the local resources without worrying about breaking the specification as the references are still in URL format in schemas. In addition, the mapped URL can be a different external URL, or embbeded within a JAR file with a lot more flexibility. 
+
+Note that when using a mapping, the local copy is always used, and the external reference is not queried.
+
+### Usage
+
+Basically, you can specify a mapping in the builder. For more details, please take a look at the test cases and the [PR](https://github.com/networknt/json-schema-validator/pull/125). 
+
+
+### Real Example
+
+https://github.com/JMRI/JMRI/blob/master/java/src/jmri/server/json/schema-map.json

pom.xml

@@ -19,9 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.27-CGM</version>
+    <version>1.0.29</version>
     <packaging>bundle</packaging>
-    <description>A json schema validator that supports draft v4</description>
+    <description>A json schema validator that supports draft v4, v6, v7 and v2019-09</description>
     <url>https://github.com/networknt/json-schema-validator</url>
     <name>JsonSchemaValidator</name>
     <developers>

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

@@ -43,7 +43,7 @@ public DependenciesValidator(String schemaPath, JsonNode schemaNode, JsonSchema
                 for (int i = 0; i < pvalue.size(); i++) {
                     depsProps.add(pvalue.get(i).asText());
                 }
-            } else if (pvalue.isObject()) {
+            } else if (pvalue.isObject() || pvalue.isBoolean()) {
                 schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema));
             }
         }

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

@@ -37,7 +37,7 @@ public class ItemsValidator extends BaseJsonValidator implements JsonValidator {
 
     public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ITEMS, validationContext);
-        if (schemaNode.isObject()) {
+        if (schemaNode.isObject() || schemaNode.isBoolean()) {
             schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);
         } else {
             tupleSchema = new ArrayList<JsonSchema>();

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

@@ -151,7 +151,7 @@ public static JsonMetaSchema getInstance() {
     }
 
     private static class V201909 {
-        private static String URI = "http://json-schema.org/draft/2019-09/schema#";
+        private static String URI = "https://json-schema.org/draft/2019-09/schema";
         private static final String ID = "$id";
 
         public static final List<Format> BUILTIN_FORMATS = new ArrayList<Format>(JsonMetaSchema.COMMON_BUILTIN_FORMATS);
@@ -172,7 +172,8 @@ public static JsonMetaSchema getInstance() {
                             new NonValidationKeyword("title"),
                             new NonValidationKeyword("description"),
                             new NonValidationKeyword("default"),
-                            new NonValidationKeyword("definitions")
+                            new NonValidationKeyword("definitions"),
+                            new NonValidationKeyword("$defs")  // newly added in 2018-09 release.
                     ))
                     .build();
         }

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

@@ -48,7 +48,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 // 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) {
+                if (accurateDividend.divideAndRemainder(accurateDivisor)[1].abs().compareTo(BigDecimal.ZERO) > 0) {
                     return Collections.singleton(buildValidationMessage(at, "" + divisor));
                 }
             }