From b8a0c3991bdbe105d8fcc7458fc7b87bceff817d Mon Sep 17 00:00:00 2001 From: Francis Galiegue Date: Wed, 29 Oct 2014 12:13:10 +0100 Subject: [PATCH 01/71] Update -core dependency --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fbc13551a..f9b5bd228 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.fge"; -version = "2.2.5-SNAPSHOT"; +version = "2.2.6-SNAPSHOT"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility @@ -64,7 +64,7 @@ repositories { */ dependencies { compile(group: "com.github.fge", name: "json-schema-core", - version: "1.2.4"); + version: "1.2.5"); compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); compile(group: "joda-time", name: "joda-time", version: "2.3"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", From 698385765781856f86e63adec96920e71915922d Mon Sep 17 00:00:00 2001 From: Francis Galiegue Date: Wed, 29 Oct 2014 14:20:21 +0100 Subject: [PATCH 02/71] Fill release notes Signed-off-by: Francis Galiegue --- RELEASE-NOTES.md | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 33328c35c..35a219faa 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1 +1,37 @@ -### RESET +### 2.2.6 + +* Fix issue #112: fix circular validation detection; use a "validation stack" to + detect and spot those situations. +* Depend on -core 1.2.5. +* Update dependencies for libphonenumber, jsr305. + +### 2.2.5 + +* Fix issue #102: detect, and fail on, circular validation. +* Simplify ValidationProcessor. +* Remove one-jar generation; the -lib jar now includes Main-Class. + +### 2.2.4 + +* Add a "lib" target to the build. +* Issue #99: append syntax errors when throwing an InvalidSchemaException. +* Issue #100: attempt to load resources from the context classloader if loading + from JsonLoader.class fails. + +### 2.2.3 + +* Re-release... 2.2.2 was compiled with JDK 8 :/ + +### 2.2.2 + +* Depend on -core 1.2.1 to work around Rhino bug with other packages sealing the + context. + +### 2.2.1 + +* Main now uses current working directory as default URI namespace. + +### 2.2.0 + +* New major release. + From 5a437893f5e7d65836d048f66d74213f3d3f6310 Mon Sep 17 00:00:00 2001 From: Francis Galiegue Date: Wed, 29 Oct 2014 14:29:30 +0100 Subject: [PATCH 03/71] 2.2.6 Signed-off-by: Francis Galiegue --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9b5bd228..6aebc88d6 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.fge"; -version = "2.2.6-SNAPSHOT"; +version = "2.2.6"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility From eed998bad029c0d6025e0ac3f750e2a1a564a9c3 Mon Sep 17 00:00:00 2001 From: Francis Galiegue Date: Wed, 29 Oct 2014 15:15:41 +0100 Subject: [PATCH 04/71] Announce 2.2.6 Signed-off-by: Francis Galiegue --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2e5e6ae6..f59b24370 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ run by yourself. ## Versions -* current stable version: **2.2.5** +* current stable version: **2.2.6** ([ChangeLog](https://github.com/fge/json-schema-validator/wiki/ChangeLog_22x), [Javadoc](http://fge.github.io/json-schema-validator/2.2.x/index.html), [code samples](http://fge.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). From fd781ef26318ce4b7bde294307dd32d6c2e8da03 Mon Sep 17 00:00:00 2001 From: Francis Galiegue Date: Wed, 11 Mar 2015 12:50:30 +0100 Subject: [PATCH 05/71] Update README with the research for a new maintainer Signed-off-by: Francis Galiegue --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index f59b24370..6ce978e2c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ +# This project is looking for a new maintainer + +I don't have the time, nor incentive anymore, to maintain this project. + +I am fully aware that there are now quite a few people/entities which use this project, as such I am +looking fow a new maintainer, whether that be an individual or an entity, willing to take over. + +Please [contact me personally](mailto:fgaliegue@gmail.com) if you are interested. Ideally, you +should be equally committed to this project **and** JSON Schema as a whole. + ## Read me first The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version From 2a7a51229f08940116bdc3e22803ec0c7f6fd73f Mon Sep 17 00:00:00 2001 From: Dave Clayton Date: Thu, 7 Jul 2016 23:25:28 +0100 Subject: [PATCH 06/71] Add configuration for testing travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..f5c99a7f6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java \ No newline at end of file From d4c07af2bb77079c560358a29b099c1dc2579759 Mon Sep 17 00:00:00 2001 From: Dave Clayton Date: Thu, 7 Jul 2016 23:30:39 +0100 Subject: [PATCH 07/71] Update to reflect new project maintainer --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 6ce978e2c..f59b24370 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,3 @@ -# This project is looking for a new maintainer - -I don't have the time, nor incentive anymore, to maintain this project. - -I am fully aware that there are now quite a few people/entities which use this project, as such I am -looking fow a new maintainer, whether that be an individual or an entity, willing to take over. - -Please [contact me personally](mailto:fgaliegue@gmail.com) if you are interested. Ideally, you -should be equally committed to this project **and** JSON Schema as a whole. - ## Read me first The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version From 73e658d12ae660304206f8e951c9e01e1a144f11 Mon Sep 17 00:00:00 2001 From: Dave Clayton Date: Thu, 7 Jul 2016 23:45:03 +0100 Subject: [PATCH 08/71] Update documentation to link to Travis builds --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index f59b24370..98fb6f9e0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +## Travis builds now enabled + +Builds are now verified by Travis (see [issue #20](https://github.com/daveclayton/json-patch/issues/20) from the json-patch project for details) + +https://travis-ci.org/daveclayton/json-schema-validator + ## Read me first The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version From 62704bc173870e2aa1e4dafe0e81c3f807c7bd5d Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Wed, 10 Aug 2016 21:34:25 +0200 Subject: [PATCH 09/71] fixes gh-80, broken links --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 98fb6f9e0..ce673cd5e 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ https://travis-ci.org/daveclayton/json-schema-validator The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version (2.0.x) was licensed under LGPL 3.0 (or later) only. -**Version 2.2 is out**. See [here](https://github.com/fge/json-schema-validator/wiki/Whatsnew_22) +**Version 2.2 is out**. See [here](https://github.com/daveclayton/json-schema-validator/wiki/Whatsnew_22) for the list of changes compared to 2.0. And of course, it still has [all the -features](https://github.com/fge/json-schema-validator/wiki/Features) of older versions. +features](https://github.com/daveclayton/json-schema-validator/wiki/Features) of older versions. ## What this is @@ -34,19 +34,19 @@ timely manner. ## Testing online You can [test this library online](http://json-schema-validator.herokuapp.com); this web site is in -a [project of its own](https://github.com/fge/json-schema-validator-demo), which you can fork and +a [project of its own](https://github.com/daveclayton/json-schema-validator-demo), which you can fork and run by yourself. ## Versions * current stable version: **2.2.6** - ([ChangeLog](https://github.com/fge/json-schema-validator/wiki/ChangeLog_22x), - [Javadoc](http://fge.github.io/json-schema-validator/2.2.x/index.html), [code - samples](http://fge.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/daveclayton/json-schema-validator/wiki/ChangeLog_22x), + [Javadoc](http://daveclayton.github.io/json-schema-validator/2.2.x/index.html), [code + samples](http://daveclayton.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). * old stable version: **2.0.4** - ([ChangeLog](https://github.com/fge/json-schema-validator/wiki/ChangeLog_20x), - [Javadoc](http://fge.github.io/json-schema-validator/2.0.x/index.html), [code - samples](http://fge.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/daveclayton/json-schema-validator/wiki/ChangeLog_20x), + [Javadoc](http://daveclayton.github.io/json-schema-validator/2.0.x/index.html), [code + samples](http://daveclayton.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). ## Available downloads @@ -100,8 +100,8 @@ This implementation is based on the following drafts: ## More... For a detailed discussion of the implementation, see -[here](https://github.com/fge/json-schema-validator/wiki/Status). +[here](https://github.com/daveclayton/json-schema-validator/wiki/Status). -Please see the [wiki](https://github.com/fge/json-schema-validator/wiki/) for more +Please see the [wiki](https://github.com/daveclayton/json-schema-validator/wiki/) for more details. From a679f30d545906a8ff152bf0f2e25160a701b3f5 Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Mon, 26 Dec 2016 18:41:23 +0100 Subject: [PATCH 10/71] add Travis badge --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ce673cd5e..9978c15bd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status][Travis badge]][Travis] + ## Travis builds now enabled Builds are now verified by Travis (see [issue #20](https://github.com/daveclayton/json-patch/issues/20) from the json-patch project for details) @@ -105,3 +107,5 @@ For a detailed discussion of the implementation, see Please see the [wiki](https://github.com/daveclayton/json-schema-validator/wiki/) for more details. +[Travis Badge]: https://api.travis-ci.org/daveclayton/json-schema-validator.svg?branch=master +[Travis]: https://travis-ci.org/daveclayton/json-schema-validator From c2379dcfdf743d3ccba8bf54f9168ee2c296951f Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Mon, 26 Dec 2016 19:31:15 +0100 Subject: [PATCH 11/71] update (compile time) dependencies * com.google.code.findbugs:jsr305 :: 3.0.0 -> 3.0.1 * com.googlecode.libphonenumber:libphonenumber :: 6.2 -> 8.0.0 * joda-time:joda-time :: 2.3 -> 2.9.7 * net.sf.jopt-simple:jopt-simple :: 4.6 -> 5.0.3 --- build.gradle | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 6aebc88d6..6f4c2797d 100644 --- a/build.gradle +++ b/build.gradle @@ -63,15 +63,12 @@ repositories { * List of dependencies */ dependencies { - compile(group: "com.github.fge", name: "json-schema-core", - version: "1.2.5"); + compile(group: "com.github.fge", name: "json-schema-core", version: "1.2.5"); compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); - compile(group: "joda-time", name: "joda-time", version: "2.3"); - compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", - version: "6.2"); - compile(group: "com.google.code.findbugs", name: "jsr305", - version: "3.0.0"); - compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "4.6"); + compile(group: "joda-time", name: "joda-time", version: "2.9.7"); + compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); + compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.1"); + compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); testCompile(group: "org.testng", name: "testng", version: "6.8.7") { exclude(group: "junit", module: "junit"); exclude(group: "org.beanshell", module: "bsh"); From f8fb1d63a4033bf03bbaefebad71d5f9794e3f4b Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Mon, 26 Dec 2016 19:35:07 +0100 Subject: [PATCH 12/71] update test dependencies * org.mockito:mockito-core :: 1.9.5 -> 2.4.2 * org.testng:testng :: 6.8.7 -> 6.10 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6f4c2797d..cb84aa119 100644 --- a/build.gradle +++ b/build.gradle @@ -69,12 +69,12 @@ dependencies { compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.1"); compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); - testCompile(group: "org.testng", name: "testng", version: "6.8.7") { + testCompile(group: "org.testng", name: "testng", version: "6.10") { exclude(group: "junit", module: "junit"); exclude(group: "org.beanshell", module: "bsh"); exclude(group: "org.yaml", module: "snakeyaml"); }; - testCompile(group: "org.mockito", name: "mockito-core", version: "1.9.5"); + testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2"); testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); } From ab7b86f612ae5939308c9473cc4c31c4d1d3a733 Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Mon, 26 Dec 2016 18:51:52 +0100 Subject: [PATCH 13/71] add badges for LGPLv3 and ASL 2.0 --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9978c15bd..4d252c34d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![License LGPLv3][LGPLv3 badge]][LGPLv3] +[![License ASL 2.0][ASL 2.0 badge]][ASL 2.0] [![Build Status][Travis badge]][Travis] ## Travis builds now enabled @@ -8,8 +10,8 @@ https://travis-ci.org/daveclayton/json-schema-validator ## Read me first -The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version -(2.0.x) was licensed under LGPL 3.0 (or later) only. +The **current** version of this project is licensed under both [LGPLv3] (or later) and [ASL 2.0]. The old version +(2.0.x) was licensed under [LGPL 3.0][LGPLv3] (or later) only. **Version 2.2 is out**. See [here](https://github.com/daveclayton/json-schema-validator/wiki/Whatsnew_22) for the list of changes compared to 2.0. And of course, it still has [all the @@ -107,5 +109,9 @@ For a detailed discussion of the implementation, see Please see the [wiki](https://github.com/daveclayton/json-schema-validator/wiki/) for more details. +[LGPLv3 badge]: https://img.shields.io/:license-LGPLv3-blue.svg +[LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.html +[ASL 2.0 badge]: https://img.shields.io/:license-Apache%202.0-blue.svg +[ASL 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html [Travis Badge]: https://api.travis-ci.org/daveclayton/json-schema-validator.svg?branch=master [Travis]: https://travis-ci.org/daveclayton/json-schema-validator From 672defcaf02facc376bf77edf13edc0e3a1da513 Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Mon, 26 Dec 2016 19:05:52 +0100 Subject: [PATCH 14/71] add badge for latest version on Maven Central --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4d252c34d..e7f7a7c93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![License LGPLv3][LGPLv3 badge]][LGPLv3] [![License ASL 2.0][ASL 2.0 badge]][ASL 2.0] [![Build Status][Travis badge]][Travis] +![Maven Central](https://img.shields.io/maven-central/v/com.github.fge/json-schema-validator.svg) ## Travis builds now enabled From b25b083583bbc002e3d6314947222d849df233cc Mon Sep 17 00:00:00 2001 From: zhangzhe Date: Tue, 21 Feb 2017 12:16:59 +0800 Subject: [PATCH 15/71] Modified annotation. --- src/main/java/com/github/fge/jsonschema/main/JsonSchema.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java index 2ec548ae0..f13e50d6a 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java @@ -113,7 +113,7 @@ public ProcessingReport validate(final JsonNode instance, * Validate an instance and return a processing report * *

This calls {@link #validate(JsonNode, boolean)} with {@code false} as - * a third argument.

+ * a second argument.

* * @param instance the instance to validate * @return a processing report From 41f22fbbf94639230305346db93526f3bbb04c76 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Fri, 28 Aug 2015 13:42:22 -0400 Subject: [PATCH 16/71] Changed JsonSchema to an interface Fixes https://github.com/fge/json-schema-validator/issues/159 --- .../fge/jsonschema/main/JsonSchema.java | 98 ++---------- .../jsonschema/main/JsonSchemaFactory.java | 2 +- .../fge/jsonschema/main/JsonSchemaImpl.java | 150 ++++++++++++++++++ .../fge/jsonschema/main/JsonValidator.java | 4 +- .../validation/InstanceValidator.java | 1 - .../examples/doc-files/Example9.java | 1 + 6 files changed, 166 insertions(+), 90 deletions(-) create mode 100644 src/main/java/com/github/fge/jsonschema/main/JsonSchemaImpl.java diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java index 2ec548ae0..639a24713 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchema.java @@ -26,69 +26,15 @@ import com.github.fge.jsonschema.core.report.ListProcessingReport; import com.github.fge.jsonschema.core.report.MessageProvider; import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.core.report.ReportProvider; -import com.github.fge.jsonschema.core.tree.SchemaTree; -import com.github.fge.jsonschema.core.tree.SimpleJsonTree; -import com.github.fge.jsonschema.processors.data.FullData; -import com.github.fge.jsonschema.processors.validation.ValidationProcessor; - -import javax.annotation.concurrent.Immutable; /** * Single-schema instance validator * - *

This is the class you will use the most often. It is, in essence, a {@link + *

This is the interface you will use the most often. It is, in essence, a {@link * JsonValidator} initialized with a single JSON Schema. Note however that this * class still retains the ability to resolve JSON References.

- * - *

It has no public constructors: you should use the appropriate methods in - * {@link JsonSchemaFactory} to obtain an instance of this class.

*/ -@Immutable -public final class JsonSchema -{ - private final ValidationProcessor processor; - private final SchemaTree schema; - private final ReportProvider reportProvider; - - /** - * Package private constructor - * - * @param processor the validation processor - * @param schema the schema to bind to this instance - * @param reportProvider the report provider - */ - JsonSchema(final ValidationProcessor processor, final SchemaTree schema, - final ReportProvider reportProvider) - { - this.processor = processor; - this.schema = schema; - this.reportProvider = reportProvider; - } - - private ProcessingReport doValidate(final JsonNode node, - final boolean deepCheck) - throws ProcessingException - { - final FullData data = new FullData(schema, new SimpleJsonTree(node), - deepCheck); - final ProcessingReport report = reportProvider.newReport(); - final ProcessingResult result - = ProcessingResult.of(processor, report, data); - return result.getReport(); - } - - private ProcessingReport doValidateUnchecked(final JsonNode node, - final boolean deepCheck) - { - final FullData data = new FullData(schema, new SimpleJsonTree(node), - deepCheck); - final ProcessingReport report = reportProvider.newReport(); - final ProcessingResult result - = ProcessingResult.uncheckedResult(processor, report, data); - return result.getReport(); - } - +public interface JsonSchema { /** * Validate an instance and return a processing report * @@ -102,12 +48,8 @@ private ProcessingReport doValidateUnchecked(final JsonNode node, * * @since 2.1.8 */ - public ProcessingReport validate(final JsonNode instance, - final boolean deepCheck) - throws ProcessingException - { - return doValidate(instance, deepCheck); - } + ProcessingReport validate(JsonNode instance, boolean deepCheck) + throws ProcessingException; /** * Validate an instance and return a processing report @@ -119,11 +61,8 @@ public ProcessingReport validate(final JsonNode instance, * @return a processing report * @throws ProcessingException a processing error occurred during validation */ - public ProcessingReport validate(final JsonNode instance) - throws ProcessingException - { - return validate(instance, false); - } + ProcessingReport validate(JsonNode instance) + throws ProcessingException; /** * Validate an instance and return a processing report (unchecked version) @@ -148,12 +87,8 @@ public ProcessingReport validate(final JsonNode instance) * * @since 2.1.8 */ - public ProcessingReport validateUnchecked(final JsonNode instance, - final boolean deepCheck) - { - return doValidateUnchecked(instance, deepCheck); - } - + ProcessingReport validateUnchecked(JsonNode instance, + boolean deepCheck); /** * Validate an instance and return a processing report (unchecked version) * @@ -164,10 +99,7 @@ public ProcessingReport validateUnchecked(final JsonNode instance, * @return a report (a {@link ListProcessingReport} if an exception was * thrown during processing) */ - public ProcessingReport validateUnchecked(final JsonNode instance) - { - return doValidateUnchecked(instance, false); - } + ProcessingReport validateUnchecked(JsonNode instance); /** * Check whether an instance is valid against this schema @@ -176,11 +108,8 @@ public ProcessingReport validateUnchecked(final JsonNode instance) * @return true if the instance is valid * @throws ProcessingException an error occurred during processing */ - public boolean validInstance(final JsonNode instance) - throws ProcessingException - { - return doValidate(instance, false).isSuccess(); - } + boolean validInstance(JsonNode instance) + throws ProcessingException; /** * Check whether an instance is valid against this schema (unchecked @@ -192,8 +121,5 @@ public boolean validInstance(final JsonNode instance) * @param instance the instance to validate * @return true if the instance is valid */ - public boolean validInstanceUnchecked(final JsonNode instance) - { - return doValidateUnchecked(instance, false).isSuccess(); - } + boolean validInstanceUnchecked(JsonNode instance); } diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java index bfaca5fe0..4977e4968 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java @@ -60,7 +60,7 @@ *
  • a {@link SyntaxValidator}, to validate schemas;
    • *
  • a {@link JsonValidator}, to validate an instance against a schema; *
    • - *
  • a {@link JsonSchema}, to validate instances against a fixed schema. + *
  • a {@link JsonSchemaImpl}, to validate instances against a fixed schema. *
    • * * diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaImpl.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaImpl.java new file mode 100644 index 000000000..900e24b61 --- /dev/null +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaImpl.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) + * + * This software is dual-licensed under: + * + * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any + * later version; + * - the Apache Software License (ASL) version 2.0. + * + * The text of this file and of both licenses is available at the root of this + * project or, if you have the jar distribution, in directory META-INF/, under + * the names LGPL-3.0.txt and ASL-2.0.txt respectively. + * + * Direct link to the sources: + * + * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt + * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt + */ + +package com.github.fge.jsonschema.main; + +import com.fasterxml.jackson.databind.JsonNode; +import com.github.fge.jsonschema.core.exceptions.ProcessingException; +import com.github.fge.jsonschema.core.processing.ProcessingResult; +import com.github.fge.jsonschema.core.processing.Processor; +import com.github.fge.jsonschema.core.report.ListProcessingReport; +import com.github.fge.jsonschema.core.report.MessageProvider; +import com.github.fge.jsonschema.core.report.ProcessingReport; +import com.github.fge.jsonschema.core.report.ReportProvider; +import com.github.fge.jsonschema.core.tree.SchemaTree; +import com.github.fge.jsonschema.core.tree.SimpleJsonTree; +import com.github.fge.jsonschema.processors.data.FullData; +import com.github.fge.jsonschema.processors.validation.ValidationProcessor; + +import javax.annotation.concurrent.Immutable; + +/** + * Single-schema instance validator + * + *

    This is the class you will use the most often. It is, in essence, a {@link + * JsonValidator} initialized with a single JSON Schema. Note however that this + * class still retains the ability to resolve JSON References.

    + * + *

    It has no public constructors: you should use the appropriate methods in + * {@link JsonSchemaFactory} to obtain an instance of this class.

    + */ +@Immutable +final class JsonSchemaImpl implements JsonSchema +{ + private final ValidationProcessor processor; + private final SchemaTree schema; + private final ReportProvider reportProvider; + + /** + * Package private constructor + * + * @param processor the validation processor + * @param schema the schema to bind to this instance + * @param reportProvider the report provider + */ + JsonSchemaImpl(final ValidationProcessor processor, final SchemaTree schema, + final ReportProvider reportProvider) + { + this.processor = processor; + this.schema = schema; + this.reportProvider = reportProvider; + } + + private ProcessingReport doValidate(final JsonNode node, + final boolean deepCheck) + throws ProcessingException + { + final FullData data = new FullData(schema, new SimpleJsonTree(node), + deepCheck); + final ProcessingReport report = reportProvider.newReport(); + final ProcessingResult result + = ProcessingResult.of(processor, report, data); + return result.getReport(); + } + + private ProcessingReport doValidateUnchecked(final JsonNode node, + final boolean deepCheck) + { + final FullData data = new FullData(schema, new SimpleJsonTree(node), + deepCheck); + final ProcessingReport report = reportProvider.newReport(); + final ProcessingResult result + = ProcessingResult.uncheckedResult(processor, report, data); + return result.getReport(); + } + + /** + * {@inheritDoc} + */ + @Override + public ProcessingReport validate(final JsonNode instance, + final boolean deepCheck) + throws ProcessingException + { + return doValidate(instance, deepCheck); + } + + /** + * {@inheritDoc} + */ + @Override + public ProcessingReport validate(final JsonNode instance) + throws ProcessingException + { + return validate(instance, false); + } + + /** + * {@inheritDoc} + */ + @Override + public ProcessingReport validateUnchecked(final JsonNode instance, + final boolean deepCheck) + { + return doValidateUnchecked(instance, deepCheck); + } + + /** + * {@inheritDoc} + */ + @Override + public ProcessingReport validateUnchecked(final JsonNode instance) + { + return doValidateUnchecked(instance, false); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean validInstance(final JsonNode instance) + throws ProcessingException + { + return doValidate(instance, false).isSuccess(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean validInstanceUnchecked(final JsonNode instance) + { + return doValidateUnchecked(instance, false).isSuccess(); + } +} diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonValidator.java b/src/main/java/com/github/fge/jsonschema/main/JsonValidator.java index 72b8a31ba..0fa7cc28c 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonValidator.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonValidator.java @@ -188,7 +188,7 @@ JsonSchema buildJsonSchema(final JsonNode schema, final JsonPointer pointer) if (tree.getNode().isMissingNode()) throw new JsonReferenceException(new ProcessingMessage() .setMessage(BUNDLE.getMessage("danglingRef"))); - return new JsonSchema(processor, tree, reportProvider); + return new JsonSchemaImpl(processor, tree, reportProvider); } /** @@ -212,7 +212,7 @@ JsonSchema buildJsonSchema(final String uri) if (tree.getNode().isMissingNode()) throw new JsonReferenceException(new ProcessingMessage() .setMessage(BUNDLE.getMessage("danglingRef"))); - return new JsonSchema(processor, tree, reportProvider); + return new JsonSchemaImpl(processor, tree, reportProvider); } /** diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/InstanceValidator.java b/src/main/java/com/github/fge/jsonschema/processors/validation/InstanceValidator.java index 9267950bb..4b79aa145 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/validation/InstanceValidator.java +++ b/src/main/java/com/github/fge/jsonschema/processors/validation/InstanceValidator.java @@ -31,7 +31,6 @@ import com.github.fge.jsonschema.core.tree.JsonTree; import com.github.fge.jsonschema.core.tree.SchemaTree; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; -import com.github.fge.jsonschema.main.JsonSchema; import com.github.fge.jsonschema.main.JsonValidator; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.jsonschema.processors.data.SchemaContext; diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java index df3714f3d..ce02e0d65 100644 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java +++ b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java @@ -40,6 +40,7 @@ import com.github.fge.jsonschema.library.Library; import com.github.fge.jsonschema.library.LibraryBuilder; import com.github.fge.jsonschema.main.JsonSchema; +import com.github.fge.jsonschema.main.JsonSchemaImpl; import com.github.fge.jsonschema.main.JsonSchemaFactory; import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; import com.github.fge.jsonschema.processors.data.FullData; From 42ab7698dbf23110698c49527c7c7e38d07cb1fd Mon Sep 17 00:00:00 2001 From: Thomas Holmes Date: Thu, 16 Jul 2015 16:55:37 -0700 Subject: [PATCH 17/71] Switch KeywordValidators to use a factory model --- .../validator/KeywordValidatorFactory.java | 20 +++++++ .../ReflectionKeywordValidatorFactory.java | 52 +++++++++++++++++++ .../fge/jsonschema/library/Keyword.java | 10 ++-- .../jsonschema/library/KeywordBuilder.java | 39 +++++++------- .../fge/jsonschema/library/Library.java | 12 ++--- .../jsonschema/library/LibraryBuilder.java | 10 ++-- .../validator/CommonValidatorDictionary.java | 41 +++++++-------- .../validator/DraftV3ValidatorDictionary.java | 31 +++++------ .../validator/DraftV4ValidatorDictionary.java | 39 ++++++-------- .../processors/build/ValidatorBuilder.java | 43 +++++---------- .../keyword/special/ExtendsKeywordTest.java | 34 ++++++------ .../keyword/special/NotKeywordTest.java | 35 +++++++------ .../keyword/special/PatternKeywordTest.java | 39 +++++++------- .../AbstractKeywordValidatorTest.java | 40 +++++++------- .../callback/CallbackValidatorTest.java | 40 ++++++++------ .../build/ValidatorBuilderTest.java | 36 +++++++------ 16 files changed, 286 insertions(+), 235 deletions(-) create mode 100755 src/main/java/com/github/fge/jsonschema/keyword/validator/KeywordValidatorFactory.java create mode 100755 src/main/java/com/github/fge/jsonschema/keyword/validator/ReflectionKeywordValidatorFactory.java diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/KeywordValidatorFactory.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/KeywordValidatorFactory.java new file mode 100755 index 000000000..db84c642e --- /dev/null +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/KeywordValidatorFactory.java @@ -0,0 +1,20 @@ +package com.github.fge.jsonschema.keyword.validator; + +import com.fasterxml.jackson.databind.JsonNode; +import com.github.fge.jsonschema.core.exceptions.ProcessingException; + +/** + * Interface for a keyword validator factory + */ +public interface KeywordValidatorFactory +{ + /** + * Create a validator for the instance + * + * @param node the instance to validate + * @return a validator for the given instance + * @throws ProcessingException an error occurs creating the validator + */ + KeywordValidator getKeywordValidator(JsonNode node) + throws ProcessingException; +} diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/ReflectionKeywordValidatorFactory.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/ReflectionKeywordValidatorFactory.java new file mode 100755 index 000000000..54e394c1c --- /dev/null +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/ReflectionKeywordValidatorFactory.java @@ -0,0 +1,52 @@ +package com.github.fge.jsonschema.keyword.validator; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + +import com.fasterxml.jackson.databind.JsonNode; +import com.github.fge.jsonschema.core.exceptions.ProcessingException; +import com.github.fge.jsonschema.messages.JsonSchemaConfigurationBundle; +import com.github.fge.msgsimple.bundle.MessageBundle; +import com.github.fge.msgsimple.load.MessageBundles; + +/** + * A validator factory that uses reflection to create an instance of the + * specified KeywordValidator class + */ +public class ReflectionKeywordValidatorFactory + implements KeywordValidatorFactory +{ + private static final String ERRMSG = "failed to build keyword validator"; + private static final MessageBundle BUNDLE + = MessageBundles.getBundle(JsonSchemaConfigurationBundle.class); + + private final Constructor constructor; + + public ReflectionKeywordValidatorFactory(String name, + Class clazz) + { + try { + constructor = clazz.getConstructor(JsonNode.class); + } catch (NoSuchMethodException ignored) { + throw new IllegalArgumentException(BUNDLE.printf( + "noAppropriateConstructor", name, clazz.getCanonicalName() + )); + } + } + + @Override + public KeywordValidator getKeywordValidator(JsonNode node) + throws ProcessingException + { + try { + return constructor.newInstance(node); + } catch (InstantiationException e) { + throw new ProcessingException(ERRMSG, e); + } catch (IllegalAccessException e) { + throw new ProcessingException(ERRMSG, e); + } catch (InvocationTargetException e) { + throw new ProcessingException(ERRMSG, e); + } + } + +} diff --git a/src/main/java/com/github/fge/jsonschema/library/Keyword.java b/src/main/java/com/github/fge/jsonschema/library/Keyword.java index b9a6d8ea1..adace7d33 100644 --- a/src/main/java/com/github/fge/jsonschema/library/Keyword.java +++ b/src/main/java/com/github/fge/jsonschema/library/Keyword.java @@ -22,9 +22,7 @@ import com.github.fge.Frozen; import com.github.fge.jsonschema.core.keyword.syntax.checkers.SyntaxChecker; import com.github.fge.jsonschema.keyword.digest.Digester; -import com.github.fge.jsonschema.keyword.validator.KeywordValidator; - -import java.lang.reflect.Constructor; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; /** @@ -51,9 +49,9 @@ public final class Keyword final Digester digester; /** - * {@link KeywordValidator} constructor + * Validator factory */ - final Constructor constructor; + final KeywordValidatorFactory validatorFactory; /** * Instantiate a new keyword builder @@ -79,7 +77,7 @@ public static KeywordBuilder newBuilder(final String name) name = builder.name; syntaxChecker = builder.syntaxChecker; digester = builder.digester; - constructor = builder.constructor; + validatorFactory = builder.validatorFactory; } /** diff --git a/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java b/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java index fd1f9b330..553b1f8a0 100644 --- a/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java +++ b/src/main/java/com/github/fge/jsonschema/library/KeywordBuilder.java @@ -19,7 +19,6 @@ package com.github.fge.jsonschema.library; -import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.Thawed; import com.github.fge.jackson.NodeType; import com.github.fge.jsonschema.core.keyword.syntax.checkers.SyntaxChecker; @@ -27,12 +26,12 @@ import com.github.fge.jsonschema.keyword.digest.helpers.IdentityDigester; import com.github.fge.jsonschema.keyword.digest.helpers.SimpleDigester; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; +import com.github.fge.jsonschema.keyword.validator.ReflectionKeywordValidatorFactory; import com.github.fge.jsonschema.messages.JsonSchemaConfigurationBundle; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import java.lang.reflect.Constructor; - /** * A keyword builder -- the thawed version of a {@link Keyword} * @@ -48,7 +47,7 @@ public final class KeywordBuilder final String name; SyntaxChecker syntaxChecker; Digester digester; - Constructor constructor; + KeywordValidatorFactory validatorFactory; /** * Create a new, empty keyword builder @@ -74,7 +73,7 @@ public final class KeywordBuilder name = keyword.name; syntaxChecker = keyword.syntaxChecker; digester = keyword.digester; - constructor = keyword.constructor; + validatorFactory = keyword.validatorFactory; } /** @@ -149,7 +148,20 @@ public KeywordBuilder withSimpleDigester(final NodeType first, public KeywordBuilder withValidatorClass( final Class c) { - constructor = getConstructor(name, c); + validatorFactory = new ReflectionKeywordValidatorFactory(name, c); + return this; + } + + /** + * Set the validator factory for this keyword + * + * @param factory the factory + * @return this + */ + public KeywordBuilder withValidatorFactory( + KeywordValidatorFactory factory) + { + validatorFactory = factory; return this; } @@ -169,24 +181,11 @@ public Keyword freeze() * We can have a keyword without a validator; however, if there is one, * there must be a digester. */ - BUNDLE.checkArgumentPrintf(constructor == null || digester != null, + BUNDLE.checkArgumentPrintf(validatorFactory == null || digester != null, "malformedKeyword", name); return new Keyword(this); } - - private static Constructor getConstructor( - final String name, final Class c) - { - try { - return c.getConstructor(JsonNode.class); - } catch (NoSuchMethodException ignored) { - throw new IllegalArgumentException(BUNDLE.printf( - "noAppropriateConstructor", name, c.getCanonicalName() - )); - } - } - private static NodeType checkType(final NodeType type) { return BUNDLE.checkNotNull(type, "nullType"); diff --git a/src/main/java/com/github/fge/jsonschema/library/Library.java b/src/main/java/com/github/fge/jsonschema/library/Library.java index 74aa566ce..24087f1a6 100644 --- a/src/main/java/com/github/fge/jsonschema/library/Library.java +++ b/src/main/java/com/github/fge/jsonschema/library/Library.java @@ -26,9 +26,7 @@ import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.format.FormatAttribute; import com.github.fge.jsonschema.keyword.digest.Digester; -import com.github.fge.jsonschema.keyword.validator.KeywordValidator; - -import java.lang.reflect.Constructor; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; /** * A schema keyword library @@ -54,9 +52,9 @@ public final class Library final Dictionary digesters; /** - * Dictionary of keyword validator constructors + * Dictionary of keyword validator factories */ - final Dictionary> validators; + final Dictionary validators; /** * Dictionary of format attributes @@ -97,7 +95,7 @@ public static LibraryBuilder newBuilder() */ Library(final Dictionary syntaxCheckers, final Dictionary digesters, - final Dictionary> validators, + final Dictionary validators, final Dictionary formatAttributes) { this.syntaxCheckers = syntaxCheckers; @@ -131,7 +129,7 @@ public Dictionary getDigesters() * * @return a dictionary */ - public Dictionary> getValidators() + public Dictionary getValidators() { return validators; } diff --git a/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java b/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java index b65f64264..93d2a170a 100644 --- a/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java +++ b/src/main/java/com/github/fge/jsonschema/library/LibraryBuilder.java @@ -25,13 +25,11 @@ import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.format.FormatAttribute; import com.github.fge.jsonschema.keyword.digest.Digester; -import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.messages.JsonSchemaConfigurationBundle; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import java.lang.reflect.Constructor; - /** * Mutable version of a library * @@ -60,7 +58,7 @@ public final class LibraryBuilder /** * Dictionary builder of keyword validator constructors */ - final DictionaryBuilder> validators; + final DictionaryBuilder validators; /** * Dictionary builder of format attributes @@ -107,9 +105,9 @@ public LibraryBuilder addKeyword(final Keyword keyword) syntaxCheckers.addEntry(name, keyword.syntaxChecker); - if (keyword.constructor != null) { + if (keyword.validatorFactory != null) { digesters.addEntry(name, keyword.digester); - validators.addEntry(name, keyword.constructor); + validators.addEntry(name, keyword.validatorFactory); } return this; } diff --git a/src/main/java/com/github/fge/jsonschema/library/validator/CommonValidatorDictionary.java b/src/main/java/com/github/fge/jsonschema/library/validator/CommonValidatorDictionary.java index 20ade1257..b96141b72 100644 --- a/src/main/java/com/github/fge/jsonschema/library/validator/CommonValidatorDictionary.java +++ b/src/main/java/com/github/fge/jsonschema/library/validator/CommonValidatorDictionary.java @@ -19,10 +19,11 @@ package com.github.fge.jsonschema.library.validator; -import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; +import com.github.fge.jsonschema.keyword.validator.ReflectionKeywordValidatorFactory; import com.github.fge.jsonschema.keyword.validator.common.AdditionalItemsValidator; import com.github.fge.jsonschema.keyword.validator.common.AdditionalPropertiesValidator; import com.github.fge.jsonschema.keyword.validator.common.EnumValidator; @@ -35,27 +36,25 @@ import com.github.fge.jsonschema.keyword.validator.common.PatternValidator; import com.github.fge.jsonschema.keyword.validator.common.UniqueItemsValidator; -import java.lang.reflect.Constructor; - /** * Keyword validator constructors common to draft v4 and v3 */ public final class CommonValidatorDictionary { - private static final Dictionary> + private static final Dictionary DICTIONARY; private CommonValidatorDictionary() { } - public static Dictionary> get() + public static Dictionary get() { return DICTIONARY; } static { - final DictionaryBuilder> + final DictionaryBuilder builder = Dictionary.newBuilder(); String keyword; @@ -66,67 +65,63 @@ public static Dictionary> get() */ keyword = "additionalItems"; c = AdditionalItemsValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "minItems"; c = MinItemsValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "maxItems"; c = MaxItemsValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "uniqueItems"; c = UniqueItemsValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * Numbers and integers */ keyword = "minimum"; c = MinimumValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "maximum"; c = MaximumValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * Objects */ keyword = "additionalProperties"; c = AdditionalPropertiesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * Strings */ keyword = "minLength"; c = MinLengthValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "maxLength"; c = MaxLengthValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "pattern"; c = PatternValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "enum"; c = EnumValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); DICTIONARY = builder.freeze(); } - private static Constructor constructor( + private static KeywordValidatorFactory factory(String name, final Class c) { - try { - return c.getConstructor(JsonNode.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException("No appropriate constructor", e); - } + return new ReflectionKeywordValidatorFactory(name, c); } } diff --git a/src/main/java/com/github/fge/jsonschema/library/validator/DraftV3ValidatorDictionary.java b/src/main/java/com/github/fge/jsonschema/library/validator/DraftV3ValidatorDictionary.java index a6d648c11..ecf982b1f 100644 --- a/src/main/java/com/github/fge/jsonschema/library/validator/DraftV3ValidatorDictionary.java +++ b/src/main/java/com/github/fge/jsonschema/library/validator/DraftV3ValidatorDictionary.java @@ -19,10 +19,11 @@ package com.github.fge.jsonschema.library.validator; -import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; +import com.github.fge.jsonschema.keyword.validator.ReflectionKeywordValidatorFactory; import com.github.fge.jsonschema.keyword.validator.common.DependenciesValidator; import com.github.fge.jsonschema.keyword.validator.draftv3.DisallowKeywordValidator; import com.github.fge.jsonschema.keyword.validator.draftv3.DivisibleByValidator; @@ -30,27 +31,25 @@ import com.github.fge.jsonschema.keyword.validator.draftv3.ExtendsValidator; import com.github.fge.jsonschema.keyword.validator.draftv3.PropertiesValidator; -import java.lang.reflect.Constructor; - /** * Draft v3 specific keyword validator constructors */ public final class DraftV3ValidatorDictionary { - private static final Dictionary> + private static final Dictionary DICTIONARY; private DraftV3ValidatorDictionary() { } - public static Dictionary> get() + public static Dictionary get() { return DICTIONARY; } static { - final DictionaryBuilder> + final DictionaryBuilder builder = Dictionary.newBuilder(); String keyword; @@ -63,41 +62,37 @@ public static Dictionary> get() */ keyword = "divisibleBy"; c = DivisibleByValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * Object */ keyword = "properties"; c = PropertiesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "dependencies"; c = DependenciesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "type"; c = DraftV3TypeValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "disallow"; c = DisallowKeywordValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "extends"; c = ExtendsValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); DICTIONARY = builder.freeze(); } - private static Constructor constructor( + private static KeywordValidatorFactory factory(String name, final Class c) { - try { - return c.getConstructor(JsonNode.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException("No appropriate constructor found", e); - } + return new ReflectionKeywordValidatorFactory(name, c); } } diff --git a/src/main/java/com/github/fge/jsonschema/library/validator/DraftV4ValidatorDictionary.java b/src/main/java/com/github/fge/jsonschema/library/validator/DraftV4ValidatorDictionary.java index 6e517c7c9..a82a74b49 100644 --- a/src/main/java/com/github/fge/jsonschema/library/validator/DraftV4ValidatorDictionary.java +++ b/src/main/java/com/github/fge/jsonschema/library/validator/DraftV4ValidatorDictionary.java @@ -19,10 +19,11 @@ package com.github.fge.jsonschema.library.validator; -import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; +import com.github.fge.jsonschema.keyword.validator.ReflectionKeywordValidatorFactory; import com.github.fge.jsonschema.keyword.validator.common.DependenciesValidator; import com.github.fge.jsonschema.keyword.validator.draftv4.AllOfValidator; import com.github.fge.jsonschema.keyword.validator.draftv4.AnyOfValidator; @@ -34,27 +35,25 @@ import com.github.fge.jsonschema.keyword.validator.draftv4.OneOfValidator; import com.github.fge.jsonschema.keyword.validator.draftv4.RequiredKeywordValidator; -import java.lang.reflect.Constructor; - /** * Draft v4 specific keyword validator constructors */ public final class DraftV4ValidatorDictionary { - private static final Dictionary> + private static final Dictionary DICTIONARY; private DraftV4ValidatorDictionary() { } - public static Dictionary> get() + public static Dictionary get() { return DICTIONARY; } static { - final DictionaryBuilder> + final DictionaryBuilder builder = Dictionary.newBuilder(); String keyword; @@ -67,60 +66,56 @@ public static Dictionary> get() */ keyword = "multipleOf"; c = MultipleOfValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * Object */ keyword = "minProperties"; c = MinPropertiesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "maxProperties"; c = MaxPropertiesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "required"; c = RequiredKeywordValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "dependencies"; c = DependenciesValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); /* * All */ keyword = "anyOf"; c = AnyOfValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "allOf"; c = AllOfValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "oneOf"; c = OneOfValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "not"; c = NotValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); keyword = "type"; c = DraftV4TypeValidator.class; - builder.addEntry(keyword, constructor(c)); + builder.addEntry(keyword, factory(keyword, c)); DICTIONARY = builder.freeze(); } - private static Constructor constructor( + private static KeywordValidatorFactory factory(String name, final Class c) { - try { - return c.getConstructor(JsonNode.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException("No appropriate constructor found", e); - } + return new ReflectionKeywordValidatorFactory(name, c); } } diff --git a/src/main/java/com/github/fge/jsonschema/processors/build/ValidatorBuilder.java b/src/main/java/com/github/fge/jsonschema/processors/build/ValidatorBuilder.java index f8fba5171..27409c83b 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/build/ValidatorBuilder.java +++ b/src/main/java/com/github/fge/jsonschema/processors/build/ValidatorBuilder.java @@ -19,23 +19,22 @@ package com.github.fge.jsonschema.processors.build; +import java.util.Map; +import java.util.SortedMap; + import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.processing.Processor; import com.github.fge.jsonschema.core.report.ProcessingReport; import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.library.Library; import com.github.fge.jsonschema.processors.data.SchemaDigest; import com.github.fge.jsonschema.processors.data.ValidatorList; import com.github.fge.jsonschema.processors.validation.ValidationProcessor; import com.google.common.collect.Maps; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Map; -import java.util.SortedMap; - /** * Keyword builder processor * @@ -48,20 +47,18 @@ public final class ValidatorBuilder implements Processor { - private static final String ERRMSG = "failed to build keyword validator"; - - private final Map> - constructors; + private final Map + factories; public ValidatorBuilder(final Library library) { - constructors = library.getValidators().entries(); + factories = library.getValidators().entries(); } public ValidatorBuilder( - final Dictionary> dict) + final Dictionary dict) { - constructors = dict.entries(); + factories = dict.entries(); } /** @@ -82,35 +79,19 @@ public ValidatorList process(final ProcessingReport report, String keyword; JsonNode digest; KeywordValidator validator; - Constructor constructor; + KeywordValidatorFactory factory; for (final Map.Entry entry: input.getDigests().entrySet()) { keyword = entry.getKey(); digest = entry.getValue(); - constructor = constructors.get(keyword); - validator = buildKeyword(constructor, digest); + factory = factories.get(keyword); + validator = factory.getKeywordValidator(digest); map.put(keyword, validator); } return new ValidatorList(input.getContext(), map.values()); } - private static KeywordValidator buildKeyword( - final Constructor constructor, - final JsonNode node) - throws ProcessingException - { - try { - return constructor.newInstance(node); - } catch (InstantiationException e) { - throw new ProcessingException(ERRMSG, e); - } catch (IllegalAccessException e) { - throw new ProcessingException(ERRMSG, e); - } catch (InvocationTargetException e) { - throw new ProcessingException(ERRMSG, e); - } - } - @Override public String toString() { diff --git a/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java b/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java index 36bcee0c9..32fab2b55 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java @@ -19,6 +19,19 @@ package com.github.fge.jsonschema.keyword.special; +import static com.github.fge.jsonschema.TestUtils.anyMessage; +import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.assertMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.fail; + +import org.mockito.ArgumentCaptor; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.JacksonUtils; @@ -33,22 +46,12 @@ import com.github.fge.jsonschema.core.tree.SimpleJsonTree; import com.github.fge.jsonschema.core.tree.key.SchemaKey; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.library.validator.DraftV3ValidatorDictionary; import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import org.mockito.ArgumentCaptor; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import static com.github.fge.jsonschema.TestUtils.*; -import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; public final class ExtendsKeywordTest { @@ -65,13 +68,12 @@ public final class ExtendsKeywordTest private ProcessingMessage msg; public ExtendsKeywordTest() - throws IllegalAccessException, InvocationTargetException, - InstantiationException + throws ProcessingException { - final Constructor constructor + final KeywordValidatorFactory factory = DraftV3ValidatorDictionary.get().entries().get("extends"); - validator = constructor == null ? null - : constructor.newInstance(FACTORY.nullNode()); + validator = factory == null ? null + : factory.getKeywordValidator(FACTORY.nullNode()); } @BeforeMethod diff --git a/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java b/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java index 3270529a3..243f1ddf8 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java @@ -19,6 +19,20 @@ package com.github.fge.jsonschema.keyword.special; +import static com.github.fge.jsonschema.TestUtils.anyMessage; +import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.assertMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.fail; + +import org.mockito.ArgumentCaptor; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.JacksonUtils; @@ -34,22 +48,12 @@ import com.github.fge.jsonschema.core.tree.SimpleJsonTree; import com.github.fge.jsonschema.core.tree.key.SchemaKey; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.library.validator.DraftV4ValidatorDictionary; import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import org.mockito.ArgumentCaptor; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import static com.github.fge.jsonschema.TestUtils.*; -import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; public final class NotKeywordTest { @@ -65,13 +69,12 @@ public final class NotKeywordTest private ProcessingReport report; public NotKeywordTest() - throws IllegalAccessException, InvocationTargetException, - InstantiationException + throws ProcessingException { - final Constructor constructor + final KeywordValidatorFactory factory = DraftV4ValidatorDictionary.get().entries().get("not"); - validator = constructor == null ? null - : constructor.newInstance(FACTORY.nullNode()); + validator = factory == null ? null + : factory.getKeywordValidator(FACTORY.nullNode()); } @BeforeMethod diff --git a/src/test/java/com/github/fge/jsonschema/keyword/special/PatternKeywordTest.java b/src/test/java/com/github/fge/jsonschema/keyword/special/PatternKeywordTest.java index 6ff655ae0..873041061 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/special/PatternKeywordTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/special/PatternKeywordTest.java @@ -19,6 +19,22 @@ package com.github.fge.jsonschema.keyword.special; +import static com.github.fge.jsonschema.TestUtils.anyMessage; +import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.assertMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertNotNull; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Iterator; +import java.util.List; + +import org.mockito.ArgumentCaptor; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.JsonLoader; @@ -33,26 +49,13 @@ import com.github.fge.jsonschema.core.tree.SimpleJsonTree; import com.github.fge.jsonschema.core.tree.key.SchemaKey; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.library.validator.CommonValidatorDictionary; import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; import com.google.common.collect.Lists; -import org.mockito.ArgumentCaptor; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Iterator; -import java.util.List; - -import static com.github.fge.jsonschema.TestUtils.*; -import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; public final class PatternKeywordTest { @@ -65,20 +68,20 @@ public final class PatternKeywordTest private static final MessageBundle BUNDLE = MessageBundles.getBundle(JsonSchemaValidationBundle.class); - private final Constructor constructor; + private final KeywordValidatorFactory factory; private final JsonNode testData; public PatternKeywordTest() throws IOException { - constructor = CommonValidatorDictionary.get().entries().get("pattern"); + factory = CommonValidatorDictionary.get().entries().get("pattern"); testData = JsonLoader.fromResource("/keyword/special/pattern.json"); } @Test public void keywordExists() { - assertNotNull(constructor, "no support for pattern??"); + assertNotNull(factory, "no support for pattern??"); } @DataProvider @@ -120,7 +123,7 @@ public void instancesAreValidatedCorrectly(final JsonNode schema, // It is a null node which is ignored by the constructor, so we can // do that - final KeywordValidator validator = constructor.newInstance(schema); + final KeywordValidator validator = factory.getKeywordValidator(schema); validator.validate(processor, report, BUNDLE, data); if (valid) { diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/AbstractKeywordValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/AbstractKeywordValidatorTest.java index aa69bcec9..9916d8a8d 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/AbstractKeywordValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/AbstractKeywordValidatorTest.java @@ -19,6 +19,22 @@ package com.github.fge.jsonschema.keyword.validator; +import static com.github.fge.jsonschema.TestUtils.anyMessage; +import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.assertMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertNotNull; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Iterator; +import java.util.List; + +import org.mockito.ArgumentCaptor; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.JsonLoader; @@ -38,20 +54,6 @@ import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; import com.google.common.collect.Lists; -import org.mockito.ArgumentCaptor; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Iterator; -import java.util.List; - -import static com.github.fge.jsonschema.TestUtils.*; -import static com.github.fge.jsonschema.matchers.ProcessingMessageAssert.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; @Test public abstract class AbstractKeywordValidatorTest @@ -60,16 +62,16 @@ public abstract class AbstractKeywordValidatorTest = MessageBundles.getBundle(JsonSchemaValidationBundle.class); private final String keyword; - private final Constructor constructor; + private final KeywordValidatorFactory factory; private final JsonNode testNode; protected AbstractKeywordValidatorTest( - final Dictionary> dict, + final Dictionary dict, final String prefix, final String keyword) throws IOException { this.keyword = keyword; - constructor = dict.entries().get(keyword); + factory = dict.entries().get(keyword); final String resourceName = String.format("/keyword/validators/%s/%s.json", prefix, keyword); testNode = JsonLoader.fromResource(resourceName); @@ -78,7 +80,7 @@ protected AbstractKeywordValidatorTest( @Test public final void keywordExists() { - assertNotNull(constructor, "no support for " + keyword + "??"); + assertNotNull(factory, "no support for " + keyword + "??"); } @DataProvider @@ -120,7 +122,7 @@ public final void instancesAreValidatedCorrectly(final JsonNode digest, @SuppressWarnings("unchecked") final Processor processor = mock(Processor.class); - final KeywordValidator validator = constructor.newInstance(digest); + final KeywordValidator validator = factory.getKeywordValidator(digest); validator.validate(processor, report, BUNDLE, data); if (valid) { diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java index 07ba21ec8..d5d936e94 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java @@ -19,6 +19,21 @@ package com.github.fge.jsonschema.keyword.validator.callback; +import static com.github.fge.jsonschema.TestUtils.anyReport; +import static com.github.fge.jsonschema.TestUtils.onlyOnce; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.fail; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -36,19 +51,11 @@ import com.github.fge.jsonschema.core.tree.key.SchemaKey; import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import static com.github.fge.jsonschema.TestUtils.*; -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; @Test public abstract class CallbackValidatorTest @@ -62,7 +69,7 @@ public abstract class CallbackValidatorTest protected static final ObjectNode sub2 = FACTORY.objectNode(); protected final String keyword; - private final Constructor constructor; + private final KeywordValidatorFactory factory; protected final JsonPointer ptr1; protected final JsonPointer ptr2; @@ -72,21 +79,20 @@ public abstract class CallbackValidatorTest private KeywordValidator validator; protected CallbackValidatorTest( - final Dictionary> dict, + final Dictionary dict, final String keyword, final JsonPointer ptr1, final JsonPointer ptr2) { this.keyword = keyword; - constructor = dict.entries().get(keyword); + factory = dict.entries().get(keyword); this.ptr1 = ptr1; this.ptr2 = ptr2; } @BeforeMethod protected final void initEnvironment() - throws IllegalAccessException, InvocationTargetException, - InstantiationException + throws ProcessingException { - if (constructor == null) + if (factory == null) return; final SchemaTree tree = new CanonicalSchemaTree( @@ -95,13 +101,13 @@ protected final void initEnvironment() data = new FullData(tree, instance); report = mock(ProcessingReport.class); when(report.getLogLevel()).thenReturn(LogLevel.DEBUG); - validator = constructor.newInstance(generateDigest()); + validator = factory.getKeywordValidator(generateDigest()); } @Test public final void keywordExists() { - assertNotNull(constructor, "no support for " + keyword + "??"); + assertNotNull(factory, "no support for " + keyword + "??"); } @Test(dependsOnMethods = "keywordExists") diff --git a/src/test/java/com/github/fge/jsonschema/processors/build/ValidatorBuilderTest.java b/src/test/java/com/github/fge/jsonschema/processors/build/ValidatorBuilderTest.java index 4887af34a..8f038c38c 100644 --- a/src/test/java/com/github/fge/jsonschema/processors/build/ValidatorBuilderTest.java +++ b/src/test/java/com/github/fge/jsonschema/processors/build/ValidatorBuilderTest.java @@ -19,6 +19,16 @@ package com.github.fge.jsonschema.processors.build; +import static org.mockito.Mockito.mock; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertSame; +import static org.testng.Assert.fail; + +import java.util.List; +import java.util.Map; + +import org.testng.annotations.Test; + import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JacksonUtils; import com.github.fge.jsonschema.core.exceptions.ProcessingException; @@ -27,20 +37,14 @@ import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.keyword.validator.KeywordValidator; +import com.github.fge.jsonschema.keyword.validator.KeywordValidatorFactory; +import com.github.fge.jsonschema.keyword.validator.ReflectionKeywordValidatorFactory; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.jsonschema.processors.data.SchemaDigest; import com.github.fge.jsonschema.processors.data.ValidatorList; import com.github.fge.msgsimple.bundle.MessageBundle; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.testng.annotations.Test; - -import java.lang.reflect.Constructor; -import java.util.List; -import java.util.Map; - -import static org.mockito.Mockito.*; -import static org.testng.Assert.*; public final class ValidatorBuilderTest { @@ -53,17 +57,17 @@ public final class ValidatorBuilderTest public ValidatorBuilderTest() throws NoSuchMethodException { - final DictionaryBuilder> + final DictionaryBuilder builder = Dictionary.newBuilder(); - Constructor constructor; + KeywordValidatorFactory factory; - constructor = Keyword1.class .getConstructor(JsonNode.class); - builder.addEntry(K1, constructor); - constructor = Keyword2.class.getConstructor(JsonNode.class); - builder.addEntry(K2, constructor); - constructor = Challenged.class.getConstructor(JsonNode.class); - builder.addEntry(CHALLENGED, constructor); + factory = new ReflectionKeywordValidatorFactory(K1, Keyword1.class); + builder.addEntry(K1, factory); + factory = new ReflectionKeywordValidatorFactory(K2, Keyword2.class); + builder.addEntry(K2, factory); + factory = new ReflectionKeywordValidatorFactory(CHALLENGED, Challenged.class); + builder.addEntry(CHALLENGED, factory); validatorBuilder = new ValidatorBuilder(builder.freeze()); } From ac2e2238a3552485bd01a8cf3957eb92eed7d058 Mon Sep 17 00:00:00 2001 From: Vikas Bodke Date: Tue, 10 Feb 2015 23:06:49 +0530 Subject: [PATCH 18/71] Fixes issue #143 opened by @rberger The secFracs field will support upto 12 chars --- .../format/common/DateTimeAttribute.java | 8 ++-- .../resources/format/common/date-time.json | 44 ++++++++++++++++++- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java index d2055314b..20a4a9821 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java @@ -42,13 +42,13 @@ public final class DateTimeAttribute extends AbstractFormatAttribute { private static final List FORMATS = ImmutableList.of( - "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.SSSZ" + "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ); private static final DateTimeFormatter FORMATTER; static { - final DateTimeParser msParser = new DateTimeFormatterBuilder() - .appendLiteral('.').appendDecimal(millisOfSecond(), 1, 3) + final DateTimeParser secFracsParser = new DateTimeFormatterBuilder() + .appendLiteral('.').appendFractionOfSecond(1,12) .toParser(); DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); @@ -64,7 +64,7 @@ public final class DateTimeAttribute .appendFixedDecimal(minuteOfHour(), 2) .appendLiteral(':') .appendFixedDecimal(secondOfMinute(), 2) - .appendOptional(msParser) + .appendOptional(secFracsParser) .appendTimeZoneOffset("Z", false, 2, 2); FORMATTER = builder.toFormatter(); diff --git a/src/test/resources/format/common/date-time.json b/src/test/resources/format/common/date-time.json index 1f2d96f1d..f79dcc701 100644 --- a/src/test/resources/format/common/date-time.json +++ b/src/test/resources/format/common/date-time.json @@ -25,7 +25,7 @@ "message": "err.format.invalidDate", "msgData": { "value": "2012-02-30T00:00:00+0000", - "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.SSSZ" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] }, "msgParams": [ "value", "expected" ] }, @@ -35,8 +35,48 @@ "message": "err.format.invalidDate", "msgData": { "value": "201202030", - "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.SSSZ" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] }, "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-08-07T20:42:32.1234Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.1234567Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345678Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345678Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.1234567890Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345678901Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789012Z", + "valid": true } ] From 6b4c650f022f02f354a5e8e3099380f174f805d3 Mon Sep 17 00:00:00 2001 From: mmolina Date: Sat, 21 Nov 2015 00:32:30 +0100 Subject: [PATCH 19/71] Configurable cache size for processing validations Also: Changing default cache size to 512 --- .../jsonschema/cfg/ValidationConfiguration.java | 11 +++++++++++ .../cfg/ValidationConfigurationBuilder.java | 14 ++++++++++++++ .../fge/jsonschema/main/JsonSchemaFactory.java | 2 +- .../processors/validation/ValidationChain.java | 4 ++-- .../jsonschema/validator/configuration.properties | 1 + .../cfg/ValidationConfigurationTest.java | 12 ++++++++++++ 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfiguration.java b/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfiguration.java index b67fdc840..54a1b9360 100644 --- a/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfiguration.java +++ b/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfiguration.java @@ -70,6 +70,11 @@ public final class ValidationConfiguration * Whether to use {@code format} in the resulting factory */ final boolean useFormat; + + /** + * Cache size for processing validations + */ + final int cacheSize; /** * The set of syntax messages @@ -113,6 +118,7 @@ public static ValidationConfiguration byDefault() libraries = ImmutableMap.copyOf(builder.libraries); defaultLibrary = builder.defaultLibrary; useFormat = builder.useFormat; + cacheSize = builder.cacheSize; syntaxMessages = builder.syntaxMessages; validationMessages = builder.validationMessages; } @@ -146,6 +152,11 @@ public boolean getUseFormat() { return useFormat; } + + public int getCacheSize() + { + return cacheSize; + } public MessageBundle getSyntaxMessages() { diff --git a/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfigurationBuilder.java b/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfigurationBuilder.java index 61cdec21c..949a18b3b 100644 --- a/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfigurationBuilder.java +++ b/src/main/java/com/github/fge/jsonschema/cfg/ValidationConfigurationBuilder.java @@ -80,6 +80,11 @@ public final class ValidationConfigurationBuilder * Whether to use {@code format} ({@code true} by default) */ boolean useFormat = true; + + /** + * Cache maximum size of 512 records by default + */ + int cacheSize = 512; /** * The set of syntax messages @@ -119,6 +124,7 @@ public final class ValidationConfigurationBuilder libraries = Maps.newHashMap(cfg.libraries); defaultLibrary = cfg.defaultLibrary; useFormat = cfg.useFormat; + cacheSize = cfg.cacheSize; syntaxMessages = cfg.syntaxMessages; validationMessages = cfg.validationMessages; } @@ -217,6 +223,14 @@ public ValidationConfigurationBuilder setValidationMessages( return this; } + public ValidationConfigurationBuilder setCacheSize( + final int cacheSize) + { + BUNDLE.checkArgument(cacheSize >= -1, "invalidCacheSize"); + this.cacheSize = cacheSize; + return this; + } + /** * Return a frozen version of this configuration * diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java index bfaca5fe0..c9adbcc23 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java @@ -275,6 +275,6 @@ private Processor buildProcessor() final Processor processor = map.getProcessor(); return new CachingProcessor(processor, - SchemaContextEquivalence.getInstance()); + SchemaContextEquivalence.getInstance(), validationCfg.getCacheSize()); } } diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationChain.java b/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationChain.java index bc4e4ad9e..061574aec 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationChain.java +++ b/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationChain.java @@ -71,7 +71,7 @@ public ValidationChain(final RefResolver refResolver, = ProcessorChain.startWith(refResolver).chainWith(syntaxProcessor); resolver = new CachingProcessor, ValueHolder>( - chain1.getProcessor(), SchemaHolderEquivalence.INSTANCE + chain1.getProcessor(), SchemaHolderEquivalence.INSTANCE, cfg.getCacheSize() ); final SchemaDigester digester = new SchemaDigester(library); @@ -86,7 +86,7 @@ public ValidationChain(final RefResolver refResolver, } builder = new CachingProcessor( - chain2.getProcessor(), SchemaContextEquivalence.getInstance() + chain2.getProcessor(), SchemaContextEquivalence.getInstance(), cfg.getCacheSize() ); } diff --git a/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties b/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties index ae76069c4..55996e6ff 100644 --- a/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties +++ b/src/main/resources/com/github/fge/jsonschema/validator/configuration.properties @@ -37,3 +37,4 @@ nullFormat = format attribute name cannot be null nullAttribute = attempt to register null implementation of format attribute "%s" nullKeyword = attempt to add null keyword to library nullType = null type argument to digester constructor +invalidCacheSize = cache size must be greater than -1. -1 value sets a cache with unlimited records, zero-value disables the cache diff --git a/src/test/java/com/github/fge/jsonschema/cfg/ValidationConfigurationTest.java b/src/test/java/com/github/fge/jsonschema/cfg/ValidationConfigurationTest.java index 79684b6ce..c508bca9f 100644 --- a/src/test/java/com/github/fge/jsonschema/cfg/ValidationConfigurationTest.java +++ b/src/test/java/com/github/fge/jsonschema/cfg/ValidationConfigurationTest.java @@ -103,6 +103,18 @@ public void cannotPutNullValidationMessageBundle() } } + @Test + public void cannotPutInvalidCacheSize() + { + try { + cfg.setCacheSize(-2); + fail("No exception thrown!!"); + } catch (IllegalArgumentException e) { + assertEquals(e.getMessage(), + BUNDLE.getMessage("invalidCacheSize")); + } + } + @Test public void defaultLibraryIsDraftV4() { From fe5ae3ace0b37547ea11bdb8d3fd76177c70c562 Mon Sep 17 00:00:00 2001 From: huggsboson Date: Tue, 2 May 2017 11:46:30 -0700 Subject: [PATCH 20/71] Update README.md --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ce673cd5e..cce802c43 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ ## Travis builds now enabled -Builds are now verified by Travis (see [issue #20](https://github.com/daveclayton/json-patch/issues/20) from the json-patch project for details) +Builds are now verified by Travis (see [issue #20](https://github.com/huggsboson/json-patch/issues/20) from the json-patch project for details) -https://travis-ci.org/daveclayton/json-schema-validator +https://travis-ci.org/huggsboson/json-schema-validator ## Read me first The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version (2.0.x) was licensed under LGPL 3.0 (or later) only. -**Version 2.2 is out**. See [here](https://github.com/daveclayton/json-schema-validator/wiki/Whatsnew_22) +**Version 2.2 is out**. See [here](https://github.com/huggsboson/json-schema-validator/wiki/Whatsnew_22) for the list of changes compared to 2.0. And of course, it still has [all the features](https://github.com/daveclayton/json-schema-validator/wiki/Features) of older versions. @@ -34,19 +34,19 @@ timely manner. ## Testing online You can [test this library online](http://json-schema-validator.herokuapp.com); this web site is in -a [project of its own](https://github.com/daveclayton/json-schema-validator-demo), which you can fork and +a [project of its own](https://github.com/huggsboson/json-schema-validator-demo), which you can fork and run by yourself. ## Versions * current stable version: **2.2.6** - ([ChangeLog](https://github.com/daveclayton/json-schema-validator/wiki/ChangeLog_22x), - [Javadoc](http://daveclayton.github.io/json-schema-validator/2.2.x/index.html), [code - samples](http://daveclayton.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/huggsboson/json-schema-validator/wiki/ChangeLog_22x), + [Javadoc](http://huggsboson.github.io/json-schema-validator/2.2.x/index.html), [code + samples](http://huggsboson.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). * old stable version: **2.0.4** - ([ChangeLog](https://github.com/daveclayton/json-schema-validator/wiki/ChangeLog_20x), - [Javadoc](http://daveclayton.github.io/json-schema-validator/2.0.x/index.html), [code - samples](http://daveclayton.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/huggsboson/json-schema-validator/wiki/ChangeLog_20x), + [Javadoc](http://huggsboson.github.io/json-schema-validator/2.0.x/index.html), [code + samples](http://huggsboson.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). ## Available downloads @@ -100,8 +100,8 @@ This implementation is based on the following drafts: ## More... For a detailed discussion of the implementation, see -[here](https://github.com/daveclayton/json-schema-validator/wiki/Status). +[here](https://github.com/huggsboson/json-schema-validator/wiki/Status). -Please see the [wiki](https://github.com/daveclayton/json-schema-validator/wiki/) for more +Please see the [wiki](https://github.com/huggsboson/json-schema-validator/wiki/) for more details. From ee09b5b7637ba286d9ec77597cf99f6b50f06068 Mon Sep 17 00:00:00 2001 From: huggsboson Date: Tue, 2 May 2017 13:13:48 -0700 Subject: [PATCH 21/71] Update README.md --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index cce802c43..0d0d7256f 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ ## Travis builds now enabled -Builds are now verified by Travis (see [issue #20](https://github.com/huggsboson/json-patch/issues/20) from the json-patch project for details) +Builds are now verified by Travis (see [issue #20](https://github.com/java-json-tools/json-patch/issues/20) from the json-patch project for details) -https://travis-ci.org/huggsboson/json-schema-validator +https://travis-ci.org/java-json-tools/json-schema-validator ## Read me first The **current** version of this project is licensed under both LGPLv3 (or later) and ASL 2.0. The old version (2.0.x) was licensed under LGPL 3.0 (or later) only. -**Version 2.2 is out**. See [here](https://github.com/huggsboson/json-schema-validator/wiki/Whatsnew_22) +**Version 2.2 is out**. See [here](https://github.com/java-json-tools/json-schema-validator/wiki/Whatsnew_22) for the list of changes compared to 2.0. And of course, it still has [all the features](https://github.com/daveclayton/json-schema-validator/wiki/Features) of older versions. @@ -34,19 +34,19 @@ timely manner. ## Testing online You can [test this library online](http://json-schema-validator.herokuapp.com); this web site is in -a [project of its own](https://github.com/huggsboson/json-schema-validator-demo), which you can fork and +a [project of its own](https://github.com/java-json-tools/json-schema-validator-demo), which you can fork and run by yourself. ## Versions * current stable version: **2.2.6** - ([ChangeLog](https://github.com/huggsboson/json-schema-validator/wiki/ChangeLog_22x), - [Javadoc](http://huggsboson.github.io/json-schema-validator/2.2.x/index.html), [code - samples](http://huggsboson.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x), + [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code + samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). * old stable version: **2.0.4** - ([ChangeLog](https://github.com/huggsboson/json-schema-validator/wiki/ChangeLog_20x), - [Javadoc](http://huggsboson.github.io/json-schema-validator/2.0.x/index.html), [code - samples](http://huggsboson.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). + ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_20x), + [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.0.x/index.html), [code + samples](http://java-json-tools.github.io/json-schema-validator/2.0.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). ## Available downloads @@ -100,8 +100,8 @@ This implementation is based on the following drafts: ## More... For a detailed discussion of the implementation, see -[here](https://github.com/huggsboson/json-schema-validator/wiki/Status). +[here](https://github.com/java-json-tools/json-schema-validator/wiki/Status). -Please see the [wiki](https://github.com/huggsboson/json-schema-validator/wiki/) for more +Please see the [wiki](https://github.com/java-json-tools/json-schema-validator/wiki/) for more details. From 33abfcac16ee2a39b738a5bf2c4910838b597255 Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Fri, 2 Jun 2017 17:05:35 -0700 Subject: [PATCH 22/71] Gradle and build updates --- build.gradle | 98 ++++++++++-------------- dorelease.sh | 16 ++++ gradle/wrapper/gradle-wrapper.properties | 23 +----- 3 files changed, 58 insertions(+), 79 deletions(-) diff --git a/build.gradle b/build.gradle index 6aebc88d6..24e3be32f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,25 +17,6 @@ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt */ -/* - * This has to be here... It will not be taken into account in common.gradle! - * - * Looks like a serious bug... See also: - * - * http://forums.gradle.org/gradle/topics/buildscript_in_subprojects_ignored - */ -/* - * This has to be here... It will not be taken into account in common.gradle! - * - * Looks like a serious bug... See also: - * - * http://forums.gradle.org/gradle/topics/buildscript_in_subprojects_ignored - * - * We also use Spring's propdeps plugin to have a _real_ provided scope. See: - * - * https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin - */ - apply(plugin: "java"); apply(plugin: "maven"); apply(plugin: "signing"); @@ -43,15 +24,11 @@ apply(plugin: "osgi"); apply(plugin: "idea"); apply(plugin: "eclipse"); -group = "com.github.fge"; -version = "2.2.6"; +group = "com.github.java-json-tools"; +version = "2.2.7"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility -project.ext { - description = "A Java implementation of the JSON Schema specification"; -}; - /* * Repositories to use */ @@ -63,8 +40,7 @@ repositories { * List of dependencies */ dependencies { - compile(group: "com.github.fge", name: "json-schema-core", - version: "1.2.5"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.8"); compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); compile(group: "joda-time", name: "joda-time", version: "2.3"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", @@ -90,7 +66,7 @@ javadoc.options.links("http://fge.github.io/btf/"); javadoc.options.links("http://fge.github.io/msg-simple/"); javadoc.options.links("http://fge.github.io/jackson-coreutils/"); javadoc.options.links("http://fge.github.io/uri-template/"); -javadoc.options.links("http://fge.github.io/json-schema-core/1.2.x/"); +javadoc.options.links("http://java-json-tools.github.io/json-schema-core/1.2.x/"); /* @@ -128,12 +104,14 @@ javadoc.options { * Equally annoyingly, the docFilesSubDirs option above does not seem to have * any effect :/ */ -task copyDocFiles(dependsOn: javadoc) << { - copy { - from("src/main/javadoc") { - include "**/doc-files/**"; - }; - into javadoc.destinationDir; +task copyDocFiles(dependsOn: javadoc) { + doLast { + copy { + from("src/main/javadoc") { + include "**/doc-files/**"; + }; + into javadoc.destinationDir; + } } } @@ -167,12 +145,14 @@ artifacts { } task wrapper(type: Wrapper) { - gradleVersion = "1.11"; + gradleVersion = "3.5"; distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"; } -task pom << { - pom {}.writeTo("${projectDir}/pom.xml"); +task pom { + doLast { + pom {}.writeTo("${projectDir}/pom.xml"); + } } /* @@ -180,25 +160,27 @@ task pom << { */ project.ext { - gitrwscm = sprintf("git@github.com:fge/%s", name); - gitroscm = sprintf("https://github.com/fge/%s.git", name); - projectURL = sprintf("https://github.com/fge/%s", name); + description = "A Java implementation of the JSON Schema specification"; + scmUrl = sprintf("git@github.com:box-metadata/%s", name); + projectURL = sprintf("https://github.com/box-metadata/%s", name); sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"; sonatypeSnapshots = "https://oss.sonatype.org/content/repositories/snapshots/"; }; -task checkSigningRequirements << { - def requiredProperties = [ "sonatypeUsername", "sonatypePassword" ]; - def noDice = false; - requiredProperties.each { - if (project.properties[it] == null) { - noDice = true; - System.err.printf("property \"%s\" is not defined!", it); +task checkSigningRequirements { + doLast { + def requiredProperties = [ "sonatypeUsername", "sonatypePassword" ]; + def noDice = false; + requiredProperties.each { + if (project.properties[it] == null) { + noDice = true; + System.err.printf("property \"%s\" is not defined!", it); + } } + if (noDice) + throw new IllegalStateException("missing required properties for " + + "upload"); } - if (noDice) - throw new IllegalStateException("missing required properties for " + - "upload"); } uploadArchives { @@ -234,15 +216,15 @@ uploadArchives { uploadArchives.repositories.mavenDeployer ]*.pom*.whenConfigured { pom -> pom.project { - name "${name}"; + name "${project.name}"; packaging "jar"; - description "${description}"; + description "${project.ext.description}"; url "${projectURL}"; scm { - url "${gitrwscm}"; - connection "${gitrwscm}"; - developerConnection "${gitroscm}"; + url "${scmUrl}"; + connection "scm:git:${scmUrl}"; + developerConnection "scm:git:${scmUrl}"; } licenses { @@ -260,9 +242,9 @@ uploadArchives { developers { developer { - id "fge"; - name "Francis Galiegue"; - email "fgaliegue@gmail.com"; + id "huggsboson"; + name "John Huffaker"; + email "jhuffaker+java-json-tools@gmail.com"; } } } diff --git a/dorelease.sh b/dorelease.sh index decafaa51..223917e47 100755 --- a/dorelease.sh +++ b/dorelease.sh @@ -1,4 +1,20 @@ #!/bin/bash +# Release instructions +# 1. Follow the gpg setup instructions: http://central.sonatype.org/pages/working-with-pgp-signatures.html +# a. gpg2 --export-secret-keys > ~/.gnupg/secring.gpg +# 2. In ~/.gradle add: +# sonatypeUsername=your sonatype user name +# sonatypePassword=password in vault for oss sonatype +# +# signing.keyId=generated key +# signing.password=password for gpg key +# signing.secretKeyRingFile=/Users/username/.gnupg/secring.gpg +# +# 3. ./dorelease.sh +# 4. Go to UI at: https://oss.sonatype.org +# 5. Login as sonatypeUsername +# 6. Follow the instructions here: http://central.sonatype.org/pages/releasing-the-deployment.html + ./gradlew --recompile-scripts clean test uploadArchives diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70597454a..de9128cf2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,25 +1,6 @@ -# -# Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) -# -# This software is dual-licensed under: -# -# - the Lesser General Public License (LGPL) version 3.0 or, at your option, any -# later version; -# - the Apache Software License (ASL) version 2.0. -# -# The text of this file and of both licenses is available at the root of this -# project or, if you have the jar distribution, in directory META-INF/, under -# the names LGPL-3.0.txt and ASL-2.0.txt respectively. -# -# Direct link to the sources: -# -# - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt -# - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt -# - -#Mon Apr 14 09:45:58 CEST 2014 +#Fri Jun 02 16:48:25 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-all.zip From 7782e512b25717b4f7ec5259fdf89a4462758269 Mon Sep 17 00:00:00 2001 From: huggsboson Date: Fri, 2 Jun 2017 17:19:28 -0700 Subject: [PATCH 23/71] Update README.md --- README.md | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f6f05fddb..2422c79bd 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,7 @@ [![License LGPLv3][LGPLv3 badge]][LGPLv3] [![License ASL 2.0][ASL 2.0 badge]][ASL 2.0] [![Build Status][Travis badge]][Travis] -![Maven Central](https://img.shields.io/maven-central/v/com.github.fge/json-schema-validator.svg) - -## Travis builds now enabled - -Builds are now verified by Travis (see [issue #20](https://github.com/java-json-tools/json-patch/issues/20) from the json-patch project for details) - -https://travis-ci.org/java-json-tools/json-schema-validator +![Maven Central](https://img.shields.io/maven-central/v/com.github.java-json-tools/json-schema-validator.svg) ## Read me first @@ -16,7 +10,7 @@ The **current** version of this project is licensed under both [LGPLv3] (or late **Version 2.2 is out**. See [here](https://github.com/java-json-tools/json-schema-validator/wiki/Whatsnew_22) for the list of changes compared to 2.0. And of course, it still has [all the -features](https://github.com/daveclayton/json-schema-validator/wiki/Features) of older versions. +features](https://github.com/java-json-tools/json-schema-validator/wiki/Features) of older versions. ## What this is @@ -63,7 +57,7 @@ Gradle: ```groovy dependencies { - compile(group: "com.github.fge", name: "json-schema-validator", version: "yourVersionHere"); + compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.8"); } ``` @@ -71,13 +65,14 @@ Maven: ```xml - com.github.fge + com.github.java-json-tools json-schema-validator - your-version-here + 2.2.8 ``` ### "Full" jar; command line +OUTDATED: Let me know if you need this in the issues section. This jar contains the library plus all its dependencies. Download the **lib** jar (a little more than 6 MiB) from [Bintray](https://bintray.com/fge/maven/json-schema-validator/view). @@ -114,5 +109,5 @@ details. [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.html [ASL 2.0 badge]: https://img.shields.io/:license-Apache%202.0-blue.svg [ASL 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html -[Travis Badge]: https://api.travis-ci.org/daveclayton/json-schema-validator.svg?branch=master -[Travis]: https://travis-ci.org/daveclayton/json-schema-validator +[Travis Badge]: https://api.travis-ci.org/java-json-tools/json-schema-validator.svg?branch=master +[Travis]: https://travis-ci.org/java-json-tools/json-schema-validator From c2ad15d0bdcdd620e01999269e919f2a2dca215b Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Fri, 2 Jun 2017 17:23:16 -0700 Subject: [PATCH 24/71] Release 2.2.8 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1f7b331fa..7093e6645 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.java-json-tools"; -version = "2.2.7"; +version = "2.2.8"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility From 01d2d6488480008e899506f261f5fe467f276257 Mon Sep 17 00:00:00 2001 From: Tuan Dinh Date: Sun, 11 Jun 2017 22:51:49 +1000 Subject: [PATCH 25/71] Use a stricter date-time attribute formatter(rfc3339) --- .../common/RFC3339DateTimeAttribute.java | 68 ++++++++++++++++ .../CommonFormatAttributesDictionary.java | 4 +- .../resources/format/common/date-time.json | 77 +++++++++++++++++-- 3 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java new file mode 100644 index 000000000..7e659b436 --- /dev/null +++ b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java @@ -0,0 +1,68 @@ +package com.github.fge.jsonschema.format.common; + +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoField; +import java.util.List; + +import com.github.fge.jackson.NodeType; +import com.github.fge.jsonschema.core.exceptions.ProcessingException; +import com.github.fge.jsonschema.core.report.ProcessingReport; +import com.github.fge.jsonschema.format.AbstractFormatAttribute; +import com.github.fge.jsonschema.format.FormatAttribute; +import com.github.fge.jsonschema.processors.data.FullData; +import com.github.fge.msgsimple.bundle.MessageBundle; +import com.google.common.collect.ImmutableList; + +/** + * A {@link DateTimeFormatter} for date and time format defined in RFC3339. + * @see RFC 3339 - Section 5.6 + */ +public class RFC3339DateTimeAttribute extends AbstractFormatAttribute { + + private static final List RFC3339_FORMATS = ImmutableList.of( + "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" + ); + + private static final DateTimeFormatter RFC3339_FORMATTER; + + static { + final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder() + .appendPattern("yyyy-MM-dd") + .appendLiteral('T') + .appendPattern("HH:mm:ss") + .optionalStart() + .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true).parseDefaulting(ChronoField.NANO_OF_SECOND, 0) + .optionalEnd() + .appendOffset("+HH:mm", "Z"); + RFC3339_FORMATTER = builder.toFormatter(); + } + + private static final FormatAttribute INSTANCE = new RFC3339DateTimeAttribute(); + + public static FormatAttribute getInstance() + { + return INSTANCE; + } + + private RFC3339DateTimeAttribute() + { + super("date-time", NodeType.STRING); + } + + @Override + public void validate(final ProcessingReport report, + final MessageBundle bundle, final FullData data) + throws ProcessingException + { + final String value = data.getInstance().getNode().textValue(); + + try { + RFC3339_FORMATTER.parse(value); + } catch (DateTimeParseException ignored) { + report.error(newMsg(data, bundle, "err.format.invalidDate") + .putArgument("value", value).putArgument("expected", RFC3339_FORMATS)); + } + } +} diff --git a/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java b/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java index 919758bf9..97e9d884b 100644 --- a/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java +++ b/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java @@ -22,9 +22,9 @@ import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.format.FormatAttribute; -import com.github.fge.jsonschema.format.common.DateTimeAttribute; import com.github.fge.jsonschema.format.common.EmailAttribute; import com.github.fge.jsonschema.format.common.IPv6Attribute; +import com.github.fge.jsonschema.format.common.RFC3339DateTimeAttribute; import com.github.fge.jsonschema.format.common.RegexAttribute; import com.github.fge.jsonschema.format.common.URIAttribute; @@ -49,7 +49,7 @@ private CommonFormatAttributesDictionary() FormatAttribute attribute; name = "date-time"; - attribute = DateTimeAttribute.getInstance(); + attribute = RFC3339DateTimeAttribute.getInstance(); builder.addEntry(name, attribute); name = "email"; diff --git a/src/test/resources/format/common/date-time.json b/src/test/resources/format/common/date-time.json index f79dcc701..7b755a5ab 100644 --- a/src/test/resources/format/common/date-time.json +++ b/src/test/resources/format/common/date-time.json @@ -1,6 +1,6 @@ [ { - "data": "2012-12-02T13:05:00+0100", + "data": "2012-12-02T13:05:00+01:00", "valid": true }, { @@ -19,13 +19,60 @@ "data": "2012-08-07T20:42:32.13Z", "valid": true }, + { + "data": "2012-08-07T20:42:32+10:00", + "valid": true + }, + { + "data": "2012-08-07T20:42:32-05:30", + "valid": true + }, + { + "data": "2012-12-02T13:05:00+0100", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+0100", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00+0100", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+0100", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00Z[Europe/Paris]", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00Z[Europe/Paris]", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, { + "data": "2012-12-02T13:05:00+0100", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+0100", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, { "data": "2012-02-30T00:00:00+0000", "valid": false, "message": "err.format.invalidDate", "msgData": { "value": "2012-02-30T00:00:00+0000", - "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, @@ -35,7 +82,7 @@ "message": "err.format.invalidDate", "msgData": { "value": "201202030", - "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, @@ -69,14 +116,32 @@ }, { "data": "2012-08-07T20:42:32.1234567890Z", - "valid": true + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-08-07T20:42:32.1234567890Z", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] }, { "data": "2012-08-07T20:42:32.12345678901Z", - "valid": true + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-08-07T20:42:32.12345678901Z", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] }, { "data": "2012-08-07T20:42:32.123456789012Z", - "valid": true + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-08-07T20:42:32.123456789012Z", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] } ] From d273e06cc4e604ceb833dc6fae9c8123fb155c1d Mon Sep 17 00:00:00 2001 From: Tuan Dinh Date: Wed, 14 Jun 2017 23:26:43 +1000 Subject: [PATCH 26/71] Used joda-time lib for RFC3339DateTimeAttribute. Added more unit tests --- .../common/RFC3339DateTimeAttribute.java | 80 ++++++++++++----- .../resources/format/common/date-time.json | 89 ++++++++++--------- 2 files changed, 108 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java index 7e659b436..18e73f035 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java @@ -1,11 +1,11 @@ package com.github.fge.jsonschema.format.common; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeFormatterBuilder; -import java.time.format.DateTimeParseException; -import java.time.temporal.ChronoField; import java.util.List; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.DateTimeFormatterBuilder; +import org.joda.time.format.DateTimeParser; + import com.github.fge.jackson.NodeType; import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.report.ProcessingReport; @@ -22,21 +22,22 @@ public class RFC3339DateTimeAttribute extends AbstractFormatAttribute { private static final List RFC3339_FORMATS = ImmutableList.of( - "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" + "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ); - private static final DateTimeFormatter RFC3339_FORMATTER; + private static final DateTimeFormatter FORMATTER; static { - final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder() - .appendPattern("yyyy-MM-dd") - .appendLiteral('T') - .appendPattern("HH:mm:ss") - .optionalStart() - .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true).parseDefaulting(ChronoField.NANO_OF_SECOND, 0) - .optionalEnd() - .appendOffset("+HH:mm", "Z"); - RFC3339_FORMATTER = builder.toFormatter(); + final DateTimeParser secFracsParser = new DateTimeFormatterBuilder() + .appendLiteral('.').appendFractionOfSecond(1,12) + .toParser(); + + DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder() + .appendPattern("yyyy-MM-dd'T'HH:mm:ss") + .appendOptional(secFracsParser) + .appendTimeZoneOffset("Z", true, 2, 2); + + FORMATTER = builder.toFormatter(); } private static final FormatAttribute INSTANCE = new RFC3339DateTimeAttribute(); @@ -58,11 +59,50 @@ public void validate(final ProcessingReport report, { final String value = data.getInstance().getNode().textValue(); - try { - RFC3339_FORMATTER.parse(value); - } catch (DateTimeParseException ignored) { - report.error(newMsg(data, bundle, "err.format.invalidDate") - .putArgument("value", value).putArgument("expected", RFC3339_FORMATS)); + try + { + FORMATTER.parseDateTime(value); + + final String secFracsAndOffset = value.substring("yyyy-MM-ddTHH:mm:ss".length()); + final String offset; + if (!secFracsAndOffset.startsWith(".")) { + offset = secFracsAndOffset; + } else{ + if (secFracsAndOffset.contains("Z")) { + offset = secFracsAndOffset.substring(secFracsAndOffset.indexOf("Z")); + } else if (secFracsAndOffset.contains("+")) { + offset = secFracsAndOffset.substring(secFracsAndOffset.indexOf("+")); + } else { + offset = secFracsAndOffset.substring(secFracsAndOffset.indexOf("-")); + } + } + if (!isOffSetStrictRFC3339(offset)) { + throw new IllegalArgumentException(); + } + + } catch (IllegalArgumentException ignored) { + report.error(newMsg(data, bundle, "err.format.invalidDate") + .putArgument("value", value).putArgument("expected", RFC3339_FORMATS)); } + } + + /** + * Return true if date-time offset stricly follows RFC3339: + * time-hour = 2DIGIT ; 00-23 + * time-minute = 2DIGIT ; 00-59 + * time-numoffset = ("+" / "-") time-hour ":" time-minute + * time-offset = "Z" / time-numoffset, + * and false otherwise + * @param offset + * @return + */ + private boolean isOffSetStrictRFC3339(final String offset) + { + if (offset.endsWith("Z")) return true; + if (offset.length() == 6 && offset.contains(":")) { + return true; + } + return false; + } } diff --git a/src/test/resources/format/common/date-time.json b/src/test/resources/format/common/date-time.json index 7b755a5ab..1ee20602d 100644 --- a/src/test/resources/format/common/date-time.json +++ b/src/test/resources/format/common/date-time.json @@ -26,14 +26,14 @@ { "data": "2012-08-07T20:42:32-05:30", "valid": true - }, + }, { - "data": "2012-12-02T13:05:00+0100", + "data": "201202030", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "2012-12-02T13:05:00+0100", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "value": "201202030", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, @@ -43,7 +43,17 @@ "message": "err.format.invalidDate", "msgData": { "value": "2012-12-02T13:05:00+0100", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00+01:30:30", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+01:30:30", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, @@ -53,36 +63,47 @@ "message": "err.format.invalidDate", "msgData": { "value": "2012-12-02T13:05:00Z[Europe/Paris]", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] - }, { - "data": "2012-12-02T13:05:00+0100", + }, + { + "data": "2012-12-02T13:05:00+10:00Z", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "2012-12-02T13:05:00+0100", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "value": "2012-12-02T13:05:00+10:00Z", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, { - "data": "2012-02-30T00:00:00+0000", + "data": "2012-12-02T13:05:00America/New_York", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "2012-02-30T00:00:00+0000", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "value": "2012-12-02T13:05:00America/New_York", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, { - "data": "201202030", + "data": "2012-12-02T13:05:00[America/New_York]", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "201202030", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] + "value": "2012-12-02T13:05:00[America/New_York]", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00.123456", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00.123456", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] }, "msgParams": [ "value", "expected" ] }, @@ -91,19 +112,19 @@ "valid": true }, { - "data": "2012-08-07T20:42:32.12345Z", + "data": "2012-08-07T20:42:32.1234+05:00", "valid": true }, { - "data": "2012-08-07T20:42:32.123456Z", + "data": "2012-08-07T20:42:32.12345Z", "valid": true }, { - "data": "2012-08-07T20:42:32.1234567Z", + "data": "2012-08-07T20:42:32.123456Z", "valid": true }, { - "data": "2012-08-07T20:42:32.12345678Z", + "data": "2012-08-07T20:42:32.1234567Z", "valid": true }, { @@ -116,32 +137,18 @@ }, { "data": "2012-08-07T20:42:32.1234567890Z", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-08-07T20:42:32.1234567890Z", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] + "valid": true }, { "data": "2012-08-07T20:42:32.12345678901Z", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-08-07T20:42:32.12345678901Z", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] + "valid": true }, { "data": "2012-08-07T20:42:32.123456789012Z", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-08-07T20:42:32.123456789012Z", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789012+05:00", + "valid": true } ] From 70ae8c09650faccd685441bd6e984ddf380ea3d5 Mon Sep 17 00:00:00 2001 From: Joshua Ali Date: Tue, 24 Apr 2018 11:52:03 +1000 Subject: [PATCH 27/71] Support email address formats from RFC 6531 --- build.gradle | 2 +- src/test/resources/format/common/email.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 7093e6645..42c67baf5 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { */ dependencies { compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.8"); - compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); + compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.1"); diff --git a/src/test/resources/format/common/email.json b/src/test/resources/format/common/email.json index 452e548aa..669b42c08 100644 --- a/src/test/resources/format/common/email.json +++ b/src/test/resources/format/common/email.json @@ -14,12 +14,7 @@ }, { "data": "éioaj@my.name", - "valid": false, - "message": "err.format.invalidEmail", - "msgData": { - "value": "éioaj@my.name" - }, - "msgParams": [ "value" ] + "valid": true }, { "data": "a@", From 3c0b7bbb4dcd2459d1020c41329c3d45e528c75f Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Fri, 11 May 2018 21:38:26 -0700 Subject: [PATCH 28/71] Set version to 2.2.10-SNAPSHOT --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7093e6645..46fbe230e 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.java-json-tools"; -version = "2.2.8"; +version = "2.2.10-SNAPSHOT"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility @@ -40,7 +40,7 @@ repositories { * List of dependencies */ dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.8"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.9"); compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); From 0992fe13bc1b788480bdd4fa1a4f652299970b49 Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Tue, 15 May 2018 14:25:52 -0700 Subject: [PATCH 29/71] Roll back to old date time validator (#262) Allow people to still use the new formatter via the mechanism described in example 8. fixes #261 --- .../common/RFC3339DateTimeAttribute.java | 9 + .../CommonFormatAttributesDictionary.java | 4 +- .../format/rfc3339/DateTimeTest.java | 45 +++++ .../resources/format/common/date-time.json | 94 ++--------- .../resources/format/rfc3339/date-time.json | 154 ++++++++++++++++++ 5 files changed, 221 insertions(+), 85 deletions(-) create mode 100644 src/test/java/com/github/fge/jsonschema/format/rfc3339/DateTimeTest.java create mode 100644 src/test/resources/format/rfc3339/date-time.json diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java index 18e73f035..b8a0fbe4c 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java @@ -2,6 +2,8 @@ import java.util.List; +import com.github.fge.jsonschema.cfg.ValidationConfiguration; +import com.github.fge.jsonschema.library.DraftV4Library; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatterBuilder; import org.joda.time.format.DateTimeParser; @@ -18,6 +20,13 @@ /** * A {@link DateTimeFormatter} for date and time format defined in RFC3339. * @see RFC 3339 - Section 5.6 + * + * This is backwards incompat with the original DateTimeAttribute. It will become the default in the future + * to use it currently you need to: + * Library library = DraftV4Library.get().thaw() + * .addFormatAttribute("date-time", RFC3339DateTimeAttribute.getInstance()) + * .freeze(); + * Then follow the rest of the steps in example 8 to hook it into your flow. */ public class RFC3339DateTimeAttribute extends AbstractFormatAttribute { diff --git a/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java b/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java index 97e9d884b..919758bf9 100644 --- a/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java +++ b/src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java @@ -22,9 +22,9 @@ import com.github.fge.jsonschema.core.util.Dictionary; import com.github.fge.jsonschema.core.util.DictionaryBuilder; import com.github.fge.jsonschema.format.FormatAttribute; +import com.github.fge.jsonschema.format.common.DateTimeAttribute; import com.github.fge.jsonschema.format.common.EmailAttribute; import com.github.fge.jsonschema.format.common.IPv6Attribute; -import com.github.fge.jsonschema.format.common.RFC3339DateTimeAttribute; import com.github.fge.jsonschema.format.common.RegexAttribute; import com.github.fge.jsonschema.format.common.URIAttribute; @@ -49,7 +49,7 @@ private CommonFormatAttributesDictionary() FormatAttribute attribute; name = "date-time"; - attribute = RFC3339DateTimeAttribute.getInstance(); + attribute = DateTimeAttribute.getInstance(); builder.addEntry(name, attribute); name = "email"; diff --git a/src/test/java/com/github/fge/jsonschema/format/rfc3339/DateTimeTest.java b/src/test/java/com/github/fge/jsonschema/format/rfc3339/DateTimeTest.java new file mode 100644 index 000000000..d871bc6b4 --- /dev/null +++ b/src/test/java/com/github/fge/jsonschema/format/rfc3339/DateTimeTest.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) + * + * This software is dual-licensed under: + * + * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any + * later version; + * - the Apache Software License (ASL) version 2.0. + * + * The text of this file and of both licenses is available at the root of this + * project or, if you have the jar distribution, in directory META-INF/, under + * the names LGPL-3.0.txt and ASL-2.0.txt respectively. + * + * Direct link to the sources: + * + * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt + * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt + */ + +package com.github.fge.jsonschema.format.rfc3339; + +import com.github.fge.jsonschema.core.util.Dictionary; +import com.github.fge.jsonschema.core.util.DictionaryBuilder; +import com.github.fge.jsonschema.format.AbstractFormatAttributeTest; +import com.github.fge.jsonschema.format.FormatAttribute; +import com.github.fge.jsonschema.format.common.RFC3339DateTimeAttribute; + +import java.io.IOException; +import java.text.Format; + +public final class DateTimeTest + extends AbstractFormatAttributeTest +{ + private static final Dictionary dict = + Dictionary + .newBuilder() + .addEntry("date-time", RFC3339DateTimeAttribute.getInstance()) + .freeze(); + + public DateTimeTest() + throws IOException + { + super(dict, "rfc3339", "date-time"); + } +} diff --git a/src/test/resources/format/common/date-time.json b/src/test/resources/format/common/date-time.json index 1ee20602d..f79dcc701 100644 --- a/src/test/resources/format/common/date-time.json +++ b/src/test/resources/format/common/date-time.json @@ -1,6 +1,6 @@ [ { - "data": "2012-12-02T13:05:00+01:00", + "data": "2012-12-02T13:05:00+0100", "valid": true }, { @@ -20,90 +20,22 @@ "valid": true }, { - "data": "2012-08-07T20:42:32+10:00", - "valid": true - }, - { - "data": "2012-08-07T20:42:32-05:30", - "valid": true - }, - { - "data": "201202030", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "201202030", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00+0100", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-12-02T13:05:00+0100", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00+01:30:30", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-12-02T13:05:00+01:30:30", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00Z[Europe/Paris]", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-12-02T13:05:00Z[Europe/Paris]", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00+10:00Z", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-12-02T13:05:00+10:00Z", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00America/New_York", + "data": "2012-02-30T00:00:00+0000", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "2012-12-02T13:05:00America/New_York", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + "value": "2012-02-30T00:00:00+0000", + "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] }, "msgParams": [ "value", "expected" ] }, { - "data": "2012-12-02T13:05:00[America/New_York]", - "valid": false, - "message": "err.format.invalidDate", - "msgData": { - "value": "2012-12-02T13:05:00[America/New_York]", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] - }, - "msgParams": [ "value", "expected" ] - }, - { - "data": "2012-12-02T13:05:00.123456", + "data": "201202030", "valid": false, "message": "err.format.invalidDate", "msgData": { - "value": "2012-12-02T13:05:00.123456", - "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + "value": "201202030", + "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ] }, "msgParams": [ "value", "expected" ] }, @@ -111,10 +43,6 @@ "data": "2012-08-07T20:42:32.1234Z", "valid": true }, - { - "data": "2012-08-07T20:42:32.1234+05:00", - "valid": true - }, { "data": "2012-08-07T20:42:32.12345Z", "valid": true @@ -131,6 +59,10 @@ "data": "2012-08-07T20:42:32.12345678Z", "valid": true }, + { + "data": "2012-08-07T20:42:32.12345678Z", + "valid": true + }, { "data": "2012-08-07T20:42:32.123456789Z", "valid": true @@ -146,9 +78,5 @@ { "data": "2012-08-07T20:42:32.123456789012Z", "valid": true - }, - { - "data": "2012-08-07T20:42:32.123456789012+05:00", - "valid": true } ] diff --git a/src/test/resources/format/rfc3339/date-time.json b/src/test/resources/format/rfc3339/date-time.json new file mode 100644 index 000000000..1ee20602d --- /dev/null +++ b/src/test/resources/format/rfc3339/date-time.json @@ -0,0 +1,154 @@ +[ + { + "data": "2012-12-02T13:05:00+01:00", + "valid": true + }, + { + "data": "2001-02-12T00:00:00Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.13Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32+10:00", + "valid": true + }, + { + "data": "2012-08-07T20:42:32-05:30", + "valid": true + }, + { + "data": "201202030", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "201202030", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00+0100", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+0100", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00+01:30:30", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+01:30:30", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00Z[Europe/Paris]", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00Z[Europe/Paris]", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00+10:00Z", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00+10:00Z", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00America/New_York", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00America/New_York", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00[America/New_York]", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00[America/New_York]", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-12-02T13:05:00.123456", + "valid": false, + "message": "err.format.invalidDate", + "msgData": { + "value": "2012-12-02T13:05:00.123456", + "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ] + }, + "msgParams": [ "value", "expected" ] + }, + { + "data": "2012-08-07T20:42:32.1234Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.1234+05:00", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.1234567Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345678Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.1234567890Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.12345678901Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789012Z", + "valid": true + }, + { + "data": "2012-08-07T20:42:32.123456789012+05:00", + "valid": true + } +] From 1b4c46fc0fbb46f3e67c5f78a7b04760eb92c9f3 Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Tue, 15 May 2018 20:51:25 -0700 Subject: [PATCH 30/71] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2422c79bd..83fd13c79 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ run by yourself. ## Versions -* current stable version: **2.2.6** +* current stable version: **2.2.10** ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x), [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). @@ -57,7 +57,7 @@ Gradle: ```groovy dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.8"); + compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.10"); } ``` @@ -67,7 +67,7 @@ Maven: com.github.java-json-tools json-schema-validator - 2.2.8 + 2.2.10 ``` From 4bf148aa2463270483cb19d4d3d6360fc9ccaa1c Mon Sep 17 00:00:00 2001 From: John Huffaker Date: Tue, 22 May 2018 17:05:02 -0700 Subject: [PATCH 31/71] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83fd13c79..fa5c60ed9 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ timely manner. ## Testing online You can [test this library online](http://json-schema-validator.herokuapp.com); this web site is in -a [project of its own](https://github.com/java-json-tools/json-schema-validator-demo), which you can fork and +a [project of its own](https://github.com/fge/json-schema-validator-demo), which you can fork and run by yourself. ## Versions From 35aae670774fe201c2fa73c8d040f62251c1fc46 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Mon, 22 Apr 2019 16:26:24 +0200 Subject: [PATCH 32/71] Update to Gradle 5.6.1. --- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.jar | Bin 51106 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 98 ++++++++++++++--------- gradlew.bat | 30 ++++--- 5 files changed, 85 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 46fbe230e..757585494 100644 --- a/build.gradle +++ b/build.gradle @@ -142,8 +142,8 @@ artifacts { archives libJar; } -task wrapper(type: Wrapper) { - gradleVersion = "3.5"; +wrapper { + gradleVersion = "5.6.1"; distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"; } @@ -172,7 +172,7 @@ task checkSigningRequirements { requiredProperties.each { if (project.properties[it] == null) { noDice = true; - System.err.printf("property \"%s\" is not defined!", it); + System.err.printf("property \"%s\" is not defined!\n", it); } } if (noDice) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf12790879c06b07176de29647f77aa4129..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644 GIT binary patch literal 55616 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

    CflOl1i4(-2^1KXo)&I5QlgjRKFQgM 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 z zP_KwBCnXDLTSTI9$@zwgB(mp+)3lmOadZUKrV}r{V0`rAEHnwtTEst z{4z0MSwpdQle8@5Cr`lrN1_3bylt;)N9&*~)gHbkdj(`lYv4CIH6^j#3e+ZN*%r4p zZg$33*(p2*DA2_e+L+R85%=iUhDr-Ak=`KHpT6$$)x0z)t*Wza(?xB!Uz?RtEWN@j zf{`@lyD5Z42Y)%{=&Gwb2}W~lWv>b>)MjtCk*UE$ZcCZ&<7y#k9%H8r=Ii#}wD+9> z5&9`Cth7|LQFxV41b(DYezS@klgX;JxGI$xqv)ubwbFxi3}wTj^1*&ORQ>_^3YtUe zM!K5(sy9qL^?RqS@`KaD+8`s1CUVtJAqqdr@QW5PKGAg7v}bjvyUQrxv_p2MJ8e!2 zh_m#N@=Y2uW;mEd%>!>Bgr;dq@CLYneRnDu$Aed*H~6=rDE^7nyoTr=V&w&irh}Ql z4v{;o(x~nPx*ECV+QP&ciGt8*HMbDgk^}lT>Mmb%R3tlI3Q4b{-JMEp(6J)Y@9mrF z(Wf2Dh&=`H0>yiF9zJj}(=ye&amdHeww4(t`eEi0G`v-3712txxwF(459yYM74O^< zT1VQn3LZ-B%|%4~oMmV)pZLU?(Xr?D68Vg-ih6_0j<`1mHS@K@ks$NTCpJAMT=QcR z{XB@n+n^nOl`Wz-`e*dQx_xPmpNa$hH+PI5#e4mVYTq@~(PXOcF#(FG%4Ld26dNp- zL%G#_&KHwUE8o1T)`Zn1BfBs#5VKhvH=0`IFUf=raf;WE#rgsleAsulIiBw-v)cWJ z>pANb$6ne-^PTKbh>P63e!xC6faID_UfUh9N9xrR4=5itQxpOcfl4*-i_) z_bowR)7#XH=bMxVIQ=TNlQUBm>nJZen)M9TMlSsvRUf$MQO+BDNZY`A`?6smIS2&K zt0@h&9Y52chtkO!u6fLIaQN53Hy90}I!}Z2xSFdBxB+!=-)gIz@Xhba4uQV=Yloa* z3=*mcYpoKFyw=+EMxRr9pU-vT-+s^Nl=)n$MogGa-KKA~%}!IVW_Thy>q+Fy4LDES z^VEVd=IQiDX;K(Bm19Z|pUe=jL~k@;PTOY*zSR@EgO9x*0czd(#7XPWS;WD;Bhgj^ z#iW^FLvX8146_iq8?4h@j2bP>2Wv2}(I=93K^#W16`xO#z!Nmaj_t(#v$=6AtbCw{ zH)k-xlFF6WV9F$G{0^fgbEx88x4x}?ewA}_lXG)3lGDSy)uVc|lQFweIf+wSxaeX*WRPsMr2-`c z6$DvDb&RIc+{ZY^0r}Ld5*hdqZkbxTrE775-x4#H#T~w6I-@1c-^a((_K0T|X);1v z-FF4HVh`GV*jaU;#UpTR_xyep%AfVIh3{ko=@B}zGFmcKOqw~erE8;316`_>)_jBi zGPm-|o3UXle#Aqv0-yxvWRh<5@hdJBgHrEem^3VHpX)))^5q$XR0T-jU@i|j7x*$~ z5o9ouEmXE-BlOY-6^)J(<`9g0nN`l;5fpM1$-vTr5zS%D;DN#_Iee3|6<>}4+z+jl%JPEgyQ8G*%XGEL08BhdLkVKl5_0HP!}%zd+RHFA$~r&p`BFzrXz( zj{a9}{=fKaaG(EzqJ0`K6Q|Ax<8n5j2NaQ!>NtV~0yYpBnI z`Q8`;9z~*~@V2UnVos;_L7hAbg3v3N(O0@R^$~^BSG{NT(H&vGlMNirG4AQQ6E9$!mm#z6wU|49Xemsf z(%R#1V1H|1lFuKn>?%ov+2jtP(%d2s@%AxIX{Uo2NgBKFa*$wny#hZ1>zRwWa){iC zn*2z!U_Ljh1e8To%8H!Z@Kn)`$Y*r!>>P%=b1w7R)kMgfTI|yc(g#$v3HM9-HoI1v zdARCT15Kf6yvtSEpkoS=c}RWq08Bk?PLmA%Iz2H71#pB(wu@hEr;>A93iGp}Kw;K` z2knL#8IqTiGzHhy140FtH8~uTgx!XEo57F96gzU^QxO!vx5IW=VVaX$Ox*+LJeygy zKK{zJ0!brte1+b2>|md?b9rfGL)_3k1Mm=3{fho1=>>-ai`B{L z_ocFO$s}a8H8q>_y^NQPYrLbVC7q!?z3bv+HA|@Za!X1Bq*0A)q~s9XEjBg|e`@n{ zk!Rq@n(T#|vl^wTAd)EIQH6 zVAzzfiu0)jOCxPz_WPSE&C3|goIfia+FgrBSD7W!tUlnos&~AwyJPSmvp@Wef>uCl0}3`iJaLepUPKZ$153@d0?h zQt0r|Ii`#oc6pLwvOZ9h7j!ub_s`oEwXWeu%qFifR<74~R3;_r>ot>ZQ;#Ua)8JD9!Z|QWU6Wd{(tpDVU$5e6(WzAl39)vMf90jjz)Fu8Z}&4ktSqJlhbSr zN!%wfAsS1>BD*Z5=)1J6fIKw<6^QHW#bmirKpC7WG5=Fwp(9^%VzE5mY#G{k5T?;3 zyp);&A-Zk`cTP#X>?K#}Dy=9IhtoM5v5{GhOnn>)D7!p$7-UF(+)2ZJ3N=HFHB9B@ zx(35ZQ$Qn4kv5A$n3H`#39Bcnid-dHM3yO{uqR|>5-mh=t`e$XH5)NnYCNh!k;()4 zjV4;XFsy07Tm4!N{G^kYanfr9eQcA&YagxhVk26;BGRNWHjPXuTD>|9wpAVx%f!0a zC^L3=lIS~enGAE6sB>>;=*b;Ct7d98(lOrjlM7@-qCO|5Xdu?O$J*poxtb|S9#ibg zweZm1crG_)wuq*DlHHi8SsP=+n{kQT42GMbyVay?+=E=T2|ZLy zCUe~bC?Xy2VCo{ZwMIUzk_sFyDD`x+?pmN&#kvyshQkM${C$ScA8GGe?F={X7dP=< zy$ABLBhd_(MS5g;txLYjq}*vRg+Tbia{%`RctHdIHK2g!#_i(PrVXy)mCQ5G_=j5 zTk1oU*U7R$OY7WLY2q6^X%ygC&RLB3S*(RH<&ijZo|#XYi>kU1Yc*sbD6Dz&-0QrZ zPQ6AkDPF1`7cNW#P%vIgF3akxq%E6P+mdwMe9xMT3rB5qaupg>dBZPkJe;m|H;?%4 z4^49_dkhZG%b=^9ILWYsJj_2TH-<<9sV!bQ#ln;kz*;-IvXY=aPZgd=goXHg$F|sZ+kHg8JZLEx4%B>YKD6D@#<3eZPS`V>XA3 zZ!cdbcyOcDe>{SiY5iGzb*Aq!Oyr*sq0WrOVfD>y+USxfojl-=M`eb%InudDZ!jzy z-Kh)M8Hepp1e`KSm}Daq>{%(W;+bSSrS`4?G=`1$DwusP zt@zNV>mFtE7V`s%B)>>zWgxO9(~fVk5?wSCA;({AimK3OnO2cF%`aP=Y19I()OHWW;nV89~82VT)!lobw9n7nqHtrHh!L~X9N_etyK)DWpzqge$Y zxe;bF4y~L)r*gACxq!2NO=3Au8c9=bOaZqJ@!;mPXtZ`%Fi<{Uc?L3bum{{Tt)%z8 zdR+))n4n%Hbj&HzTBtWyPga>u5xO#?3IM zp*chnhg0yu1$JC_c*JK44J?x}LC;K#{a zG~TZ>*kD`n0G!H9SThD9o9>^pq|+Utg}{7-L|FBy;;iW=%CFB2hSWH^OpB}G+ZFvVa~l|KcrrlklNSW~l$ zM7Du*YFGkP=%!o8%39ZoPm`-CHPT~dcJ_XY@2$~i_#YUX>q!y;p~B(#0j;a9>t|m# zkLyVSKfQOjUTp2`Ag+sjQ+{^djR$bV{%-{E;PTJA{; zvDtk#L_ki2CJ;sw3K|f_dkDC+2w-+NU{w(k`vL*rP}$iO0a3MT>s)WLN6Y){+>m-r8?083w~5 ztZEVwUfPGGIkODtcaUu^WSRbo-jNA@%?zJ()LMRoq^MGjQTgkkV|$x1Pw9Y~2tnGcaceyobo>R4F0?FBRY@Ffmrr zD?))W0cfTX*Ei@683@ZvVFi;;zoTSlj(AE?NZZLI^Ks7}Ir?B?VaDIubdwSDDACyT z+*rs=lr5#5hbz87X__z}Yc4ts)S^_BDO_pZR2_?!TJ~VY*#>7TKyA)Y7?3(M^-ghq zt4c+nFLg(vFLVC0RIVQ6i3Yb3Sf>f#>Xd<0VwZQo&HzJ~t-mPlXWd^{Y)49H4p+M= z4`06FGAZlhs@{X0UfzX6v)ii-Z)x?&FuC5*`DQ09)PRR}y<3TJUGee-tb*H=k!;}t zqF(HO0KU%k0OT(VA=Ap<(e%pRVKvI$QFh)hssIn~;{hucLwonMu7$k|nip_a#azg0>rO_mT;5g3dCG^CoDm_L9M(ARK)(*%qovJah8j1B zZf84{aAJc<&yJGq(1zGfFBTw5DoScbR6%GTxRa@o)$wUuCl9_MH8Jt7CXcHI)8Q>C z@}AyhO7m#F#V5x(9^g-&mh_s>mdeZlTGOkCMr`yvL^o0+RV*UU#g7hKy*N%sz7d%g zQJ^HDNIxM43JWOWnA3zRK4DIy7QKqe!eOqoSLt$h~j)Vja1@{;Qbd7ZDC{k*!; z*SS5;Gi*=n->f0!K9uyApO8r@Xp6R3+J>K`p8+m&8YG3fgJ^`5&{yeYEu4JDng(JOD?BQs1ge7XU zgeA>;V{{i%8N*DRL35{%Zw7r<(2}weIC)m8Fdd4x1;Xyjfpi{@M~RY9Fq+75j`inMft)SsCP)ZM;CMfuCnE@vFP;>mS>|oy@V^#2&{67E9n&_ffmA&B`5RfVe5D>?I&sh9RR~w0posogHh{cz* zz{1ew|Fy3tDQZdMe0ldwnQksRFSd4>pVLbEgszXPo@OW_7Rf_WQSiO!b7#Pgjb{8&XciIf&)@)S5@|(?HPT=B07j>)I zPEnJjV%_i5Nh;gJGpJ$o@YZ(bS?3{cefQ8pKFXj<2nnbVIaBHr5L%hgBH~5SO!HQD zj#B9Nzr?HcsfriOyNg8h9$_kbR_dGMxpU2Lit>|qu`v)w_e;6(q>7sC=%BvGwOcgK z%sc?ujBkg!KL11IjjE;(IpY@C+C$37h+w-D&i=JENKggzar8ThU zW*{P=*@AJs_P_V)g-^bCP2BX~{;{F4pE6_juMlHBD1@BztG&?^4hV?wzh4OdYEc!W zYN3VmB|86-JI=DzzlyY2IBdJ_RC za+iSXjgSa)FdsMB8Gao5j*D(5KinT4O%xB^8jrM-1Va4E!Nr}TqP1|ZKAKH?773t& z_eBL2y}@92m+niql7-Npzd(0m`+u@;;^dvzSiH1Hr`*Ef)$C+oiyiD~Ic`@d-jxU2 zS-Hy&xUqPv4Lq}W>kXV!`R4A2xC;X^sC*0ehM{wNB{Y)l$)JnRq16QS-pbFz_9Bf^ z0{0Jt##fUn$j7$oYdgJ{9<0R$olT!6m>UvKA6~=Ej*I1}w zQ^9(Ud*s);jkzX^rQkBFAr_?I6%%F7COnx`=x1<}wUAqBMZ6Z(6E_d+m#oIe#x-d# z3iNebwkO|+9h)jGD&Ieylz9ujSd^R69Ydzn6=<~}4`kYRb*en#ZCX|c1cP9}mWtDvG&dj73EFgF;M2F_TtkXQDCvZjLvi zAH5*EsCSm?&nZyrxS%|#K6EO+NE*Y>!!V883K$H1y;?&~Vl@n_lu70W_BeA}x=>Or z@Q6Gx9tWF8amvu3I+1!{uRzNJU9=QQ!8r;_N=RC3uPZI*IxF{-T)h%Q6SHnnaPJ?b zo7Y&QGP9-3(H0nKo8p))S~h+*IRRA1=7=J2bVb{iPpn>17F?1!oG|9+=kjFrYRwA^vF_f z{BwJJ7lG=J`Hs%VXs<>lG3Xs{un(~E$7-*h{Y0;xgD^lAF&D`mOT;*Ipcz%A?>?2ftXQJ?Ttx$ z@c=K*`O~D4`nAyR9zc7`;rEuC>%3r72qmNk8-ibeK^K$@$(3F3t;l_`qFj~b^t~8j zm8Y6Qt(R6PEnZ1STkvM^%0zg|*hQm@ZocxN zXgf)?gLgc2f|t9Fz;Q2C;;+7SNLbiSF&MSJjP8IE4p-r=uqTEUU6C6GdinR0YK$-M zmraJ@`IlBdo3n=j%0DvTus6fLI&f~`9YxjD=W5pR41LBYQt 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index de9128cf2..7f76b8798 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 02 16:48:25 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-5.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-all.zip diff --git a/gradlew b/gradlew index 91a7e269e..83f2acfdc 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +75,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +105,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -110,10 +125,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +170,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730b..24467a141 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,14 +24,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +62,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +75,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line From e2df74134cf72c6b809181225558c7ed61d1864d Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Fri, 30 Aug 2019 11:06:51 +0200 Subject: [PATCH 33/71] Replaced dead javadoc links with www.javadoc.io links. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 757585494..7fc43b513 100644 --- a/build.gradle +++ b/build.gradle @@ -56,10 +56,10 @@ dependencies { } javadoc.options.links("http://docs.oracle.com/javase/6/docs/api/"); -javadoc.options.links("http://jsr-305.googlecode.com/svn/trunk/javadoc/"); +javadoc.options.links("http://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); javadoc.options.links("http://fasterxml.github.com/jackson-databind/javadoc/2.2.0/"); javadoc.options.links("http://fasterxml.github.com/jackson-core/javadoc/2.2.0/"); -javadoc.options.links("http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/"); +javadoc.options.links("http://www.javadoc.io/doc/com.google.guava/guava/16.0.1/"); javadoc.options.links("http://fge.github.io/btf/"); javadoc.options.links("http://fge.github.io/msg-simple/"); javadoc.options.links("http://fge.github.io/jackson-coreutils/"); From e90ae13ae858d44f746b8e97f969683dbe78052a Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Fri, 30 Aug 2019 11:22:44 +0200 Subject: [PATCH 34/71] Don't use extDirs in javadoc. https://www.oracle.com/technetwork/java/javase/9-relnote-issues-3704069.html describes that in JDK 9, support for extdirs was removed. It causes an error with javac 11 that doesn't show up with standard Java on Mac OS X. --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7fc43b513..dbf8ee0a8 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,6 @@ task sourcesJar(type: Jar, dependsOn: classes) { javadoc.options { overview = "src/main/javadoc/overview.html"; - extDirs = [ file("src/main/javadoc") ]; docFilesSubDirs = true; } From 2b7de8d2f781d268bf71cbda5fd24a6743ef19e7 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Fri, 30 Aug 2019 12:29:15 +0200 Subject: [PATCH 35/71] Fix package errors in javadoc @link references. --- src/main/javadoc/overview.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html index 54ff12bc5..045352fa1 100644 --- a/src/main/javadoc/overview.html +++ b/src/main/javadoc/overview.html @@ -97,7 +97,7 @@

    $ref resolution

    Note that any failure in $ref validation is considered a fatal error.

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processors.ref.RefResolver}. It is located in package +com.github.fge.jsonschema.core.load.RefResolver}. It is located in package json-schema-core.

    Schema syntax checking

    @@ -113,7 +113,7 @@

    Schema syntax checking

    not follow JSON References.

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processors.syntax.SyntaxProcessor}. It is located in +com.github.fge.jsonschema.core.keyword.syntax.SyntaxProcessor}. It is located in the json-schema-core package.

    Digesting

    @@ -154,7 +154,7 @@

    Digesting

    allows to prune a lot of duplicates out of keyword caching.

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processing.digest.SchemaDigester}.

    +com.github.fge.jsonschema.processors.digest.SchemaDigester}.

    Keyword building

    From da8d43cf6a144bd1cfce194095f9d12ff8b70e9c Mon Sep 17 00:00:00 2001 From: Ville Koskela Date: Fri, 30 Aug 2019 08:43:55 -0700 Subject: [PATCH 36/71] Update jsr305 dependency --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dbf8ee0a8..97a7ac435 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { compile(group: "javax.mail", name: "mailapi", version: "1.4.3"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); - compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.1"); + compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); testCompile(group: "org.testng", name: "testng", version: "6.10") { exclude(group: "junit", module: "junit"); From e6d9207704b20f4d32a92f148525457b75bc8a46 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Fri, 30 Aug 2019 17:47:02 +0200 Subject: [PATCH 37/71] Lazily instantiate defaults for JsonSchemaFactoryBuilder. (#293) Fixes #290. --- .../jsonschema/main/JsonSchemaFactoryBuilder.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactoryBuilder.java b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactoryBuilder.java index b4869a4e5..247da45a1 100644 --- a/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactoryBuilder.java +++ b/src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactoryBuilder.java @@ -74,12 +74,7 @@ public final class JsonSchemaFactoryBuilder * @param factory the factory * @see JsonSchemaFactory#thaw() */ - JsonSchemaFactoryBuilder(final JsonSchemaFactory factory) - { - reportProvider = factory.reportProvider; - loadingCfg = factory.loadingCfg; - validationCfg = factory.validationCfg; - } + JsonSchemaFactoryBuilder(final JsonSchemaFactory factory) {} /** * Set a new report provider for this factory @@ -135,6 +130,12 @@ public JsonSchemaFactoryBuilder setValidationConfiguration( @Override public JsonSchemaFactory freeze() { + if (reportProvider == null) + reportProvider = new ListReportProvider(LogLevel.INFO, LogLevel.FATAL); + if (loadingCfg == null) + loadingCfg = LoadingConfiguration.byDefault(); + if (validationCfg == null) + validationCfg = ValidationConfiguration.byDefault(); return new JsonSchemaFactory(this); } } From 2f2109759436de1922ddce6b8b145c3c51e3d49b Mon Sep 17 00:00:00 2001 From: Bruno Casemiro Kurzawe Date: Fri, 15 Jun 2018 09:14:19 -0300 Subject: [PATCH 38/71] Fixed issue regarding date 2017-10-15 --- .gitignore | 1 + .../format/helpers/AbstractDateFormatAttribute.java | 2 +- src/test/resources/format/draftv3/date.json | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7c16d713f..ec357e3f3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ target build .gradle out +/.nb-gradle/ \ No newline at end of file diff --git a/src/main/java/com/github/fge/jsonschema/format/helpers/AbstractDateFormatAttribute.java b/src/main/java/com/github/fge/jsonschema/format/helpers/AbstractDateFormatAttribute.java index ed253f6ea..687452c1c 100644 --- a/src/main/java/com/github/fge/jsonschema/format/helpers/AbstractDateFormatAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/helpers/AbstractDateFormatAttribute.java @@ -61,7 +61,7 @@ public final void validate(final ProcessingReport report, final String value = data.getInstance().getNode().textValue(); try { - formatter.parseDateTime(value); + formatter.parseLocalDate(value); } catch (IllegalArgumentException ignored) { report.error(newMsg(data, bundle, "err.format.invalidDate") .putArgument("value", value).putArgument("expected", format)); diff --git a/src/test/resources/format/draftv3/date.json b/src/test/resources/format/draftv3/date.json index 675faa537..1100d6309 100644 --- a/src/test/resources/format/draftv3/date.json +++ b/src/test/resources/format/draftv3/date.json @@ -1,4 +1,8 @@ [ + { + "data": "2017-10-15", + "valid": true + }, { "data": "2012-12-02", "valid": true From 522f80f832ae8b59474cc603f4c16ad0e65fc9f1 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Sat, 31 Aug 2019 21:49:33 +0200 Subject: [PATCH 39/71] Remove conflict marker --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 705543152..1ba53a76d 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,6 @@ repositories { * List of dependencies */ dependencies { -======= compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.9"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); From ec3c19f93c10f9b7319d05c3b1935d8281321829 Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 4 Sep 2019 17:30:13 +0200 Subject: [PATCH 40/71] 2.2.11 --- RELEASE-NOTES.md | 25 +++++++++++++++++++++++++ build.gradle | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 35a219faa..fbf93931e 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,28 @@ +### 2.2.11 + +* Depend on -core 1.2.10. +* Update dependencies on jsr305. +* Fix javadoc generation. +* Fix issue #293: Lazily instantiate defaults for `JsonSchemaFactoryBuilder`. + +### 2.2.10 + +* Revert strict date-time validation from 2.2.9; now such validation is opt-in. + +### 2.2.9 + +* Use stricter date-time attribute formatter. +* Added a cache size for # of records in ValidationConfiguration. + +### 2.2.8 + +* TODO + +### 2.2.7 + +* First time publishing under com.github.java-json-tools. +* TODO + ### 2.2.6 * Fix issue #112: fix circular validation detection; use a "validation stack" to diff --git a/build.gradle b/build.gradle index 1ba53a76d..d66f1f987 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.java-json-tools"; -version = "2.2.10-SNAPSHOT"; +version = "2.2.11"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility @@ -40,7 +40,7 @@ repositories { * List of dependencies */ dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.9"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.10"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); From b7f35ecc9c1cfb6ff099731cd8ca8cddf50d1d8b Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 4 Sep 2019 22:42:29 +0200 Subject: [PATCH 41/71] Announce 2.2.11 --- README.md | 6 +++--- build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fa5c60ed9..306d8a298 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ run by yourself. ## Versions -* current stable version: **2.2.10** +* current stable version: **2.2.11** ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x), [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). @@ -57,7 +57,7 @@ Gradle: ```groovy dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.10"); + compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.11"); } ``` @@ -67,7 +67,7 @@ Maven: com.github.java-json-tools json-schema-validator - 2.2.10 + 2.2.11 ``` diff --git a/build.gradle b/build.gradle index d66f1f987..e8d638399 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); group = "com.github.java-json-tools"; -version = "2.2.11"; +version = "2.2.12-SNAPSHOT"; sourceCompatibility = "1.6"; targetCompatibility = "1.6"; // defaults to sourceCompatibility From 83c3eabfa30563e58a3e0b955a46343b718b2429 Mon Sep 17 00:00:00 2001 From: capstan Date: Thu, 5 Sep 2019 10:27:27 +0200 Subject: [PATCH 42/71] Update release instructions. Cloned from https://github.com/java-json-tools/jackson-coreutils/commit/01e2f47a9f8b580052b2bfe36cb28f582cf3f40a --- dorelease.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dorelease.sh b/dorelease.sh index 223917e47..f5cfc3289 100755 --- a/dorelease.sh +++ b/dorelease.sh @@ -3,11 +3,12 @@ # Release instructions # 1. Follow the gpg setup instructions: http://central.sonatype.org/pages/working-with-pgp-signatures.html # a. gpg2 --export-secret-keys > ~/.gnupg/secring.gpg +# b. gpg2 --list-keys --keyid-format short # 2. In ~/.gradle add: # sonatypeUsername=your sonatype user name # sonatypePassword=password in vault for oss sonatype # -# signing.keyId=generated key +# signing.keyId=generated key in short format # signing.password=password for gpg key # signing.secretKeyRingFile=/Users/username/.gnupg/secring.gpg # @@ -16,5 +17,5 @@ # 5. Login as sonatypeUsername # 6. Follow the instructions here: http://central.sonatype.org/pages/releasing-the-deployment.html -./gradlew --recompile-scripts clean test uploadArchives +./gradlew clean test uploadArchives From 1d37fd86d48439a59d310a89c69006640cef21e9 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Thu, 5 Sep 2019 13:10:58 +0200 Subject: [PATCH 43/71] Sync with ChangeLog_22x from the wiki. Partial fix for #287 --- RELEASE-NOTES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index fbf93931e..77cd86dd9 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -16,12 +16,14 @@ ### 2.2.8 -* TODO +* update important dependencies like libphonenumber and others. See #210 and #209 ### 2.2.7 * First time publishing under com.github.java-json-tools. -* TODO +* The secFracs field will support up to 12 chars +* Switch KeywordValidators to use a factory model +* Changed JsonSchema to an interface ### 2.2.6 From ed7901ed52fdb944a0124f3ae72a72b00d8c6cd0 Mon Sep 17 00:00:00 2001 From: capstan Date: Thu, 5 Sep 2019 13:21:27 +0200 Subject: [PATCH 44/71] Remove derelict javadoc references. Modern javac removed the `-extdirs` flag, and commit e90ae13 removed the reference to this cached(?) sets of docs. --- .../fge/jsonschema/cfg/package-info.java | 28 -- .../examples/doc-files/Example1.java | 88 ----- .../examples/doc-files/Example10.java | 96 ----- .../examples/doc-files/Example2.java | 81 ---- .../examples/doc-files/Example3.java | 68 ---- .../examples/doc-files/Example4.java | 83 ---- .../examples/doc-files/Example5.java | 101 ----- .../examples/doc-files/Example6.java | 91 ----- .../examples/doc-files/Example7.java | 117 ------ .../examples/doc-files/Example8.java | 151 -------- .../examples/doc-files/Example9.java | 356 ------------------ .../examples/doc-files/custom-fmt-bad.json | 10 - .../examples/doc-files/custom-fmt-good.json | 6 - .../examples/doc-files/custom-fmt.json | 17 - .../doc-files/custom-keyword-bad.json | 1 - .../doc-files/custom-keyword-good.json | 1 - .../examples/doc-files/custom-keyword.json | 7 - .../examples/doc-files/fstab-bad.json | 15 - .../examples/doc-files/fstab-bad2.json | 19 - .../examples/doc-files/fstab-draftv3.json | 53 --- .../examples/doc-files/fstab-good.json | 20 - .../examples/doc-files/fstab-inline.json | 48 --- .../examples/doc-files/fstab-sub.json | 48 --- .../jsonschema/examples/doc-files/fstab.json | 48 --- .../examples/doc-files/split/fstab.json | 18 - .../examples/doc-files/split/mntent.json | 29 -- .../fge/jsonschema/examples/package-info.java | 28 -- .../jsonschema/exceptions/package-info.java | 22 -- .../exceptions/unchecked/package-info.java | 22 -- .../format/common/package-info.java | 23 -- .../format/draftv3/package-info.java | 23 -- .../format/draftv4/package-info.java | 23 -- .../format/helpers/package-info.java | 27 -- .../fge/jsonschema/format/package-info.java | 55 --- .../keyword/digest/common/package-info.java | 23 -- .../keyword/digest/draftv3/package-info.java | 23 -- .../keyword/digest/draftv4/package-info.java | 23 -- .../keyword/digest/helpers/package-info.java | 23 -- .../keyword/digest/package-info.java | 36 -- .../fge/jsonschema/keyword/package-info.java | 44 --- .../validator/common/package-info.java | 23 -- .../validator/draftv3/package-info.java | 23 -- .../validator/draftv4/package-info.java | 23 -- .../validator/helpers/package-info.java | 23 -- .../keyword/validator/package-info.java | 29 -- .../library/digest/package-info.java | 23 -- .../library/format/package-info.java | 23 -- .../fge/jsonschema/library/package-info.java | 33 -- .../library/validator/package-info.java | 23 -- .../fge/jsonschema/main/package-info.java | 30 -- .../fge/jsonschema/messages/package-info.java | 22 -- .../processors/build/package-info.java | 24 -- .../processors/data/package-info.java | 22 -- .../processors/digest/package-info.java | 24 -- .../processors/format/package-info.java | 24 -- .../jsonschema/processors/package-info.java | 41 -- .../processors/ref/package-info.java | 22 -- .../processors/validation/package-info.java | 34 -- src/main/javadoc/overview.html | 193 ---------- 59 files changed, 2654 deletions(-) delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/cfg/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example1.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example10.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example2.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example3.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example4.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example5.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example6.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example7.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example8.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-bad.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-good.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-bad.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-good.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad2.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-draftv3.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-good.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-inline.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-sub.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/fstab.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/mntent.json delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/examples/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/exceptions/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/exceptions/unchecked/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/format/common/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/format/draftv3/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/format/draftv4/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/format/helpers/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/format/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/digest/common/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv3/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv4/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/digest/helpers/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/digest/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/validator/common/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv3/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv4/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/validator/helpers/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/keyword/validator/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/library/digest/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/library/format/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/library/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/library/validator/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/main/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/messages/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/build/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/data/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/digest/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/format/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/ref/package-info.java delete mode 100644 src/main/javadoc/com/github/fge/jsonschema/processors/validation/package-info.java delete mode 100644 src/main/javadoc/overview.html diff --git a/src/main/javadoc/com/github/fge/jsonschema/cfg/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/cfg/package-info.java deleted file mode 100644 index b261e929c..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/cfg/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Validation processor configuration classes - * - *

    The validation process can be influenced in two ways: how JSON Schemas - * should be loaded and how validation should operate.

    - * - *

    Each of these ways is materialized by a pair of frozen/thawed instances. - *

    - */ -package com.github.fge.jsonschema.cfg; diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example1.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example1.java deleted file mode 100644 index 03921d559..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example1.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; - -/** - * First example: basic usage - * - *     - * - *

    This shows a basic usage example. The schema used for validation is - * here, which conforms to draft v4, which is - * the default version. You will notice that a JSON Pointer ({@code - * #/definitions/mntent}) is used to address a subschema defining a mount entry. - *

    - * - *

    This example uses {@link JsonSchemaFactory#byDefault()}, and uses - * {@link JsonSchemaFactory#getJsonSchema(JsonNode)} to create the {@link - * JsonSchema} instance.

    - * - *

    The first sample (here) validates - * successfully.

    - * - *

    The second sample (here) fails to - * validate. Please note that the failure occurs at the structural level - * (required entry {@code swap} is missing). Validation therefore stops here, - * and does not attempt to validate the {@code /} member of the instance, which - * is itself invalid.

    - * - *

    The third sample (here) fails to - * validate as well. This time, the problem is with the member values:

    - * - *
      - *
    • the {@code options} member of {@code /tmp} is a string, but an array - * is expected;
      • - *
    • the {@code /} member is missing the required {@code fstype} member. - *
      • - *
    - */ -public final class Example1 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode fstabSchema = Utils.loadResource("/fstab.json"); - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); - - final JsonSchema schema = factory.getJsonSchema(fstabSchema); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example10.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example10.java deleted file mode 100644 index e3d6f3dbf..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example10.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfigurationBuilder; -import com.github.fge.jsonschema.core.ref.JsonRef; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; - -/** - * Tenth example: registering schemas - * - *

    link to source code

    - * - *

    In this example, we register a custom schema with a given URI, and - * initiate the {@link JsonSchema} instance using that URI. This is done by - * customizing a {@link LoadingConfiguration} and registering schemas using - * {@link LoadingConfigurationBuilder#preloadSchema(String, JsonNode)}.

    - * - *

    The only necessary condition for the URI is for it to be an absolute JSON - * reference (see {@link JsonRef#isAbsolute()}), and you can register as many - * schemas as you want. Here, we register both schemas from {@link Example5}. - * You will notice that the scheme for these URIs is {@code xxx}: it does not - * matter in the slightest that it is not a supported scheme by default, the - * schema is registered all the same.

    - * - *

    This also shows that reference resolution still works in such a case, - * since the {@code mntent} schema is referred to via a relative URI from the - * {@code fstab} schema.

    - * - */ -public final class Example10 -{ - private static final String URI_BASE = "xxx://foo.bar/path/to/"; - - public static void main(final String... args) - throws IOException, ProcessingException - { - final LoadingConfigurationBuilder builder - = LoadingConfiguration.newBuilder(); - - JsonNode node; - String uri; - - node = Utils.loadResource("/split/fstab.json"); - uri = URI_BASE + "fstab.json"; - builder.preloadSchema(uri, node); - - node = Utils.loadResource("/split/mntent.json"); - uri = URI_BASE + "mntent.json"; - builder.preloadSchema(uri, node); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setLoadingConfiguration(builder.freeze()).freeze(); - - final JsonSchema schema - = factory.getJsonSchema(URI_BASE + "fstab.json"); - - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example2.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example2.java deleted file mode 100644 index 6a5ecf5ba..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example2.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.load.Dereferencing; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.fge.jsonschema.main.JsonSchemaFactoryBuilder; - -import java.io.IOException; - -/** - * Second example: inline schema addressing - * - *

    link to source code

    - * - *

    This example uses the same schema with one difference: the mntent - * subschema is now referenced via inline addressing using an {@code id}.

    - * - *

    The schema used for validation is - * here.

    - * - *

    In order to use inline schema addressing, we cannot use the default - * factory: we must go through a {@link JsonSchemaFactoryBuilder} and use a - * modified {@link LoadingConfiguration} to tell that we want to use inline - * dereferencing.

    - * - *

    Apart from these, the files used for validation and validation results - * are the same as {@link Example1}.

    - * - * @see Dereferencing - */ -public final class Example2 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode fstabSchema = Utils.loadResource("/fstab-inline.json"); - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final LoadingConfiguration cfg = LoadingConfiguration.newBuilder() - .dereferencing(Dereferencing.INLINE).freeze(); - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setLoadingConfiguration(cfg).freeze(); - - final JsonSchema schema = factory.getJsonSchema(fstabSchema); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example3.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example3.java deleted file mode 100644 index a703eb68a..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example3.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; - -/** - * Third example: draft v3 detection via {@code $schema} - * - *

    link to source code

    - * - *

    This shows a basic usage example. This is the same source code as for - * {@link Example1}, except this time the schema (here) conforms to draft v3 instead of - * draft v4 (the {@code $schema} value differs).

    - * - *

    One thing to note is a difference in the validation messages: while - * required properties are described using the {@code required} keyword, with - * draft v3, they were in charge of the {@code properties} keyword.

    - */ -public final class Example3 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode fstabSchema = Utils.loadResource("/fstab-draftv3.json"); - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); - - final JsonSchema schema = factory.getJsonSchema(fstabSchema); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example4.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example4.java deleted file mode 100644 index bd8e01e59..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example4.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; - -/** - * Fourth example: schema loading via URIs, and subschema addressing - * - *

    link to source code

    - * - *

    link to schema

    - * - *

    This demonstrates two capabilities of {@link JsonSchemaFactory}:

    - * - *
      - *
    • the ability to Utils.load schemas via URIs;
      • - *
    • the ability to address subschemas in a schema.
      • - *
    - * - *

    The implementation provides a {@code resource} scheme which allows to Utils.load - * JSON from files in the classpath. It is strictly equivalent to calling {@link - * Class#getResourceAsStream(String)}.

    - * - *

    The URI used is {@code - * resource:/org/eel/kitchen/jsonschema/examples/fstab-sub.json}. Because we - * want to validate against the {@code fstab} subschema, we use {@link - * JsonSchemaFactory#getJsonSchema(String)} to Utils.load the actual schema; the URI - * used as an argument also has a JSON Pointer as a fragment.

    - * - *

    Files validated, and the validation outputs, are the same as for {@link - * Example2}.

    - */ -public final class Example4 -{ - private static final String SCHEMA_URI - = "resource:/com/github/fge/jsonschema/examples/fstab-sub.json#/fstab"; - - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); - - final JsonSchema schema = factory.getJsonSchema(SCHEMA_URI); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example5.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example5.java deleted file mode 100644 index 1ba94ffc0..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example5.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.load.SchemaLoader; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfigurationBuilder; -import com.github.fge.jsonschema.core.load.uri.URITranslatorConfiguration; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.fge.jsonschema.main.JsonSchemaFactoryBuilder; - -import java.io.IOException; - -/** - * Fifth example: setting a URI namespace; relative URI resolution - * - *

    link to source code

    - * - *

    This example demonstrates another capability of {@link JsonSchemaFactory}: - * the ability to set a URI namespace. This requires to customize the factory, - * and therefore go through {@link JsonSchemaFactoryBuilder} again.

    - * - *

    In order to set a URI namespace, we must grab a {@link - * LoadingConfigurationBuilder}, set the namespace, freeze it, and pass it to - * the factory builder and then freeze the factory.

    - * - *

    The net effect is that all schema loading done by {@link SchemaLoader} - * will now resolve against this namespace, and this includes arguments to - * {@link JsonSchemaFactory#getJsonSchema(String)}.

    - * - *

    The schemas are split in two:

    - * - *
      - *
    • one describing fstab: here; - *
      • - *
    • another describing an entry: - * here.
      • - *
    - * - *

    The first refers to the second one via the relative URI {@code - * mntent.json}. This works precisely because a URI namespace has been set: all - * URIs are resolved against this namespace.

    - * - *

    Files validated, and the validation outputs, are the same as for {@link - * Example2}.

    - */ -public final class Example5 -{ - private static final String NAMESPACE - = "resource:/com/github/fge/jsonschema/examples/split/"; - - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final URITranslatorConfiguration translatorCfg - = URITranslatorConfiguration.newBuilder() - .setNamespace(NAMESPACE).freeze(); - final LoadingConfiguration cfg = LoadingConfiguration.newBuilder() - .setURITranslatorConfiguration(translatorCfg).freeze(); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setLoadingConfiguration(cfg).freeze(); - - final JsonSchema schema = factory.getJsonSchema("fstab.json"); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example6.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example6.java deleted file mode 100644 index 464b59caf..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example6.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfigurationBuilder; -import com.github.fge.jsonschema.core.load.uri.URITranslatorConfiguration; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; - -/** - * Sixth example: URI redirection - * - *

    link to source code

    - * - *

    In this example, the same schema file is used as in {@link Example1}. This - * time, though, it is assumed that the base URI used for addressing this schema - * is {@code http://my.site/schemas/fstab.json#}. But instead of trying to - * fetch it from the web directly, we want to use the local copy, which is - * located under URI {@code - * resource:/org/eel/kitchen/jsonschema/examples/fstab.json#}.

    - * - *

    The solution is here again to build a custom {@link LoadingConfiguration}, - * which allows to add schema redirections (using {@link - * LoadingConfigurationBuilder#addSchemaRedirect(String, String)}. This method - * can be called for as many schemas as you wish to redirect.

    - * - *

    The effect is that if you required a schema via URI {@code - * http://my.site/schemas/fstab.json#}, it will silently transform this URI into - * {@code resource:/org/eel/kitchen/jsonschema/examples/fstab.json#} - * internally.

    - * - *

    Note that URIs must be absolute JSON references (see {@link JsonRef}).

    - */ -public final class Example6 -{ - private static final String FROM = "http://my.site/schemas/fstab.json#"; - private static final String TO - = "resource:/com/github/fge/jsonschema/examples/fstab.json#"; - - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final URITranslatorConfiguration translatorCfg - = URITranslatorConfiguration.newBuilder() - .addSchemaRedirect(FROM, TO).freeze(); - final LoadingConfiguration cfg = LoadingConfiguration.newBuilder() - .setURITranslatorConfiguration(translatorCfg).freeze(); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setLoadingConfiguration(cfg).freeze(); - - final JsonSchema schema = factory.getJsonSchema(FROM); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example7.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example7.java deleted file mode 100644 index f281a870c..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example7.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration; -import com.github.fge.jsonschema.core.load.configuration.LoadingConfigurationBuilder; -import com.github.fge.jsonschema.core.load.download.URIDownloader; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - -/** - * Seventh example: custom URI scheme - * - *

    link to source code

    - * - *

    This demonstrates {@link JsonSchemaFactory}'s ability to register a - * custom URI scheme. In this example, the scheme is {@code foobar}, and it is - * simply an alias to fetch a resource from the current package.

    - * - *

    Two things are needed:

    - * - *
      - *
    • an implementation of {@link URIDownloader} for this scheme,
      • - *
    • registering this scheme using {@link - * LoadingConfigurationBuilder#addScheme(String, URIDownloader)}.
      • - *
    - * - *

    Once this is done, this scheme, when encountered anywhere in JSON - * References, will use this downloader, and you are also able to use it when - * loading schemas using {@link JsonSchemaFactory#getJsonSchema(String)}, which - * is what this example does.

    - * - *

    The schema and files used are the same as for {@link Example2}.

    - */ -public final class Example7 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode good = Utils.loadResource("/fstab-good.json"); - final JsonNode bad = Utils.loadResource("/fstab-bad.json"); - final JsonNode bad2 = Utils.loadResource("/fstab-bad2.json"); - - final LoadingConfiguration cfg = LoadingConfiguration.newBuilder() - .addScheme("foobar", CustomDownloader.getInstance()).freeze(); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setLoadingConfiguration(cfg).freeze(); - - final JsonSchema schema - = factory.getJsonSchema("foobar:/fstab.json#"); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - - report = schema.validate(bad2); - System.out.println(report); - } - - private static final class CustomDownloader - implements URIDownloader - { - private static final String PREFIX; - private static final URIDownloader INSTANCE = new CustomDownloader(); - - static { - final String pkgname = CustomDownloader.class.getPackage() - .getName(); - PREFIX = '/' + pkgname.replace(".", "/"); - } - - public static URIDownloader getInstance() - { - return INSTANCE; - } - - @Override - public InputStream fetch(final URI source) - throws IOException - { - final String path = PREFIX + source.getPath(); - final InputStream ret = getClass().getResourceAsStream(path); - - if (ret == null) - throw new IOException("resource " + path + " not found"); - return ret; - } - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example8.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example8.java deleted file mode 100644 index a6d6f0b9f..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example8.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jackson.NodeType; -import com.github.fge.jsonschema.cfg.ValidationConfiguration; -import com.github.fge.jsonschema.cfg.ValidationConfigurationBuilder; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.format.AbstractFormatAttribute; -import com.github.fge.jsonschema.format.FormatAttribute; -import com.github.fge.jsonschema.library.DraftV4Library; -import com.github.fge.jsonschema.library.Library; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; -import com.github.fge.jsonschema.processors.data.FullData; -import com.github.fge.msgsimple.bundle.MessageBundle; -import com.github.fge.msgsimple.load.MessageBundles; -import com.github.fge.msgsimple.source.MapMessageSource; -import com.github.fge.msgsimple.source.MessageSource; - -import java.io.IOException; -import java.util.UUID; - -/** - * Eighth example: augmenting schemas with custom format attributes - * - *

    link to source code

    - * - *

    link to schema

    - * - *

    This example adds a custom format attribute named {@code uuid}, which - * checks whether a string instance is a valid UUID.

    - * - *

    For this, you need to write an implementation of {@link FormatAttribute}, - * registering it in a {@link Library}, and feed that library to a {@link - * ValidationConfiguration} which you submit to the {@link JsonSchemaFactory}. - *

    - * - *

    Here, we choose to augment the draft v4 library, which we get hold of - * using {@link DraftV4Library#get()}; we thaw it, add the new attribute and - * freeze it again. We also choose to make this new library the default by - * using {@link - * ValidationConfigurationBuilder#setDefaultLibrary(String, Library)}.

    - * - *

    Note also that the schema has no {@code $schema} defined; as a result, the - * default library is used (it is not recommended to omit {@code $schema} - * in your schemas, however).

    - * - *

    Two sample files are given: the first (link) is valid, the other (link) isn't (the provided {@code id} - * for the second array element is invalid).

    - */ -public final class Example8 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode customSchema = Utils.loadResource("/custom-fmt.json"); - final JsonNode good = Utils.loadResource("/custom-fmt-good.json"); - final JsonNode bad = Utils.loadResource("/custom-fmt-bad.json"); - - /* - * Build a new library with our added format attribute - */ - final Library library = DraftV4Library.get().thaw() - .addFormatAttribute("uuid", UUIDFormatAttribute.getInstance()) - .freeze(); - - /* - * Build a new message bundle with our added error message - */ - final String key = "invalidUUID"; - final String value = "input is not a valid UUID"; - final MessageSource source = MapMessageSource.newBuilder() - .put(key, value).build(); - final MessageBundle bundle - = MessageBundles.getBundle(JsonSchemaValidationBundle.class) - .thaw().appendSource(source).freeze(); - - /* - * Build our dedicated validation configuration - */ - final ValidationConfiguration cfg = ValidationConfiguration.newBuilder() - .setDefaultLibrary("http://my.site/myschema#", library) - .setValidationMessages(bundle).freeze(); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setValidationConfiguration(cfg).freeze(); - - final JsonSchema schema = factory.getJsonSchema(customSchema); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - } - - private static final class UUIDFormatAttribute - extends AbstractFormatAttribute - { - private static final FormatAttribute INSTANCE - = new UUIDFormatAttribute(); - - private UUIDFormatAttribute() - { - super("uuid", NodeType.STRING); - } - - public static FormatAttribute getInstance() - { - return INSTANCE; - } - - @Override - public void validate(final ProcessingReport report, - final MessageBundle bundle, final FullData data) - throws ProcessingException - { - final String value = data.getInstance().getNode().textValue(); - try { - UUID.fromString(value); - } catch (IllegalArgumentException ignored) { - report.error(newMsg(data, bundle, "invalidUUID") - .put("input", value)); - } - } - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java deleted file mode 100644 index ce02e0d65..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/Example9.java +++ /dev/null @@ -1,356 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -package com.github.fge.jsonschema.examples; - -import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jackson.NodeType; -import com.github.fge.jackson.jsonpointer.JsonPointer; -import com.github.fge.jsonschema.cfg.ValidationConfiguration; -import com.github.fge.jsonschema.core.exceptions.ProcessingException; -import com.github.fge.jsonschema.core.keyword.syntax.checkers.AbstractSyntaxChecker; -import com.github.fge.jsonschema.core.keyword.syntax.checkers.SyntaxChecker; -import com.github.fge.jsonschema.core.processing.Processor; -import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.core.tree.SchemaTree; -import com.github.fge.jsonschema.keyword.digest.AbstractDigester; -import com.github.fge.jsonschema.keyword.digest.Digester; -import com.github.fge.jsonschema.keyword.digest.helpers.IdentityDigester; -import com.github.fge.jsonschema.keyword.digest.helpers.SimpleDigester; -import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator; -import com.github.fge.jsonschema.keyword.validator.KeywordValidator; -import com.github.fge.jsonschema.library.DraftV4Library; -import com.github.fge.jsonschema.library.Keyword; -import com.github.fge.jsonschema.library.KeywordBuilder; -import com.github.fge.jsonschema.library.Library; -import com.github.fge.jsonschema.library.LibraryBuilder; -import com.github.fge.jsonschema.main.JsonSchema; -import com.github.fge.jsonschema.main.JsonSchemaImpl; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.fge.jsonschema.messages.JsonSchemaValidationBundle; -import com.github.fge.jsonschema.processors.data.FullData; -import com.github.fge.msgsimple.bundle.MessageBundle; -import com.github.fge.msgsimple.load.MessageBundles; -import com.github.fge.msgsimple.source.MapMessageSource; -import com.github.fge.msgsimple.source.MessageSource; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import java.io.IOException; -import java.math.BigInteger; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; - -/** - * Ninth example: augmenting schemas with custom keywords - * - *

    link to source code

    - * - *

    link to schema

    - * - *

    This example adds a custom keyword with syntax checking, digesting and - * keyword validation. The chosen keyword is {@code divisors}: it applies to - * integer values and takes an array of (unique) integers as an argument.

    - * - *

    The validation is the same as for {@code multipleOf} except that it is - * restricted to integer values and the instance must be a multiple of all - * divisors. For instance, if the value of this keyword is {@code [2, 3]}, then - * 6 validates successfully but 14 does not (it is divisible by 2 but not 3). - *

    - * - *

    For this, you need to create your own keyword. This is done using {@link - * Keyword#newBuilder(String)}, where the argument is the name of your keyword, - * and then add the following elements:

    - * - *
      - *
    • a {@link SyntaxChecker} (using {@link - * KeywordBuilder#withSyntaxChecker(SyntaxChecker)};
      • - *
    • a {@link Digester} (using {@link - * KeywordBuilder#withDigester(Digester)};
      • - *
    • and finally, a {@link KeywordValidator} (using {@link - * KeywordBuilder#withValidatorClass(Class)}.
      • - *
    - * - *

    Then, as in {@link Example8}, you need to get hold of a {@link Library} - * (we choose again to extend the draft v4 library) and add the (frozen) - * keyword to it using {@link LibraryBuilder#addKeyword(Keyword)}.

    - * - *

    The keyword validator must have a single constructor taking a - * {@link JsonNode} as an argument (which will be the result of the {@link - * Digester}). Note that you may omit to write a digester and choose instead to - * use an {@link IdentityDigester} or a {@link SimpleDigester} (which you inject - * into a keyword using {@link - * KeywordBuilder#withIdentityDigester(NodeType, NodeType...)} and {@link - * KeywordBuilder#withSimpleDigester(NodeType, NodeType...)} respectively).

    - * - *

    Two sample files are given: the first (link) is valid, the other (link) isn't (the first and third - * elements fail to divide by one or more factors).

    - */ -public final class Example9 -{ - public static void main(final String... args) - throws IOException, ProcessingException - { - final JsonNode customSchema = Utils.loadResource("/custom-keyword.json"); - final JsonNode good = Utils.loadResource("/custom-keyword-good.json"); - final JsonNode bad = Utils.loadResource("/custom-keyword-bad.json"); - - /* - * Build the new keyword - */ - final Keyword keyword = Keyword.newBuilder("divisors") - .withSyntaxChecker(DivisorsSyntaxChecker.getInstance()) - .withDigester(DivisorsDigesters.getInstance()) - .withValidatorClass(DivisorsKeywordValidator.class).freeze(); - - /* - * Build a library, based on the v4 library, with this new keyword - */ - final Library library = DraftV4Library.get().thaw() - .addKeyword(keyword).freeze(); - - /* - * Complement the validation message bundle with a dedicated message - * for our keyword validator - */ - final String key = "missingDivisors"; - final String value = "integer value is not a multiple of all divisors"; - final MessageSource source = MapMessageSource.newBuilder() - .put(key, value).build(); - final MessageBundle bundle - = MessageBundles.getBundle(JsonSchemaValidationBundle.class) - .thaw().appendSource(source).freeze(); - - /* - * Build a custom validation configuration: add our custom library and - * message bundle - */ - final ValidationConfiguration cfg = ValidationConfiguration.newBuilder() - .setDefaultLibrary("http://my.site/myschema#", library) - .setValidationMessages(bundle).freeze(); - - final JsonSchemaFactory factory = JsonSchemaFactory.newBuilder() - .setValidationConfiguration(cfg).freeze(); - - final JsonSchema schema = factory.getJsonSchema(customSchema); - - ProcessingReport report; - - report = schema.validate(good); - System.out.println(report); - - report = schema.validate(bad); - System.out.println(report); - } - - /* - * Our custom syntax checker - */ - private static final class DivisorsSyntaxChecker - extends AbstractSyntaxChecker - { - private static final SyntaxChecker INSTANCE - = new DivisorsSyntaxChecker(); - - public static SyntaxChecker getInstance() - { - return INSTANCE; - } - - private DivisorsSyntaxChecker() - { - /* - * When constructing, the name for the keyword must be provided - * along with the allowed type for the value (here, an array). - */ - super("divisors", NodeType.ARRAY); - } - - @Override - protected void checkValue(final Collection pointers, - final MessageBundle bundle, final ProcessingReport report, - final SchemaTree tree) - throws ProcessingException - { - /* - * Using AbstractSyntaxChecker as a base, we know that when we reach - * this method, the value has already been validated as being of - * the allowed primitive types (only array here). - * - * But this is not enough for this particular validator: we must - * also ensure that all elements of this array are integers. Cycle - * through all elements of the array and check each element. If we - * encounter a non integer argument, add a message. - * - * We must also check that there is at lease one element, that the - * array contains no duplicates and that all elements are positive - * integers and strictly greater than 0. - * - * The getNode() method grabs the value of this keyword for us, so - * use that. Note that we also reuse some messages already defined - * in SyntaxMessages. - */ - final JsonNode node = getNode(tree); - - final int size = node.size(); - - if (size == 0) { - report.error(newMsg(tree, bundle, "emptyArray")); - return; - } - - NodeType type; - JsonNode element; - boolean uniqueItems = true; - - final Set set = Sets.newHashSet(); - - for (int index = 0; index < size; index++) { - element = node.get(index); - type = NodeType.getNodeType(element); - if (type != NodeType.INTEGER) - report.error(newMsg(tree, bundle, "incorrectElementType") - .put("expected", NodeType.INTEGER) - .put("found", type)); - else if (element.bigIntegerValue().compareTo(BigInteger.ONE) < 0) - report.error(newMsg(tree, bundle, "integerIsNegative") - .put("value", element)); - uniqueItems = set.add(element); - } - - if (!uniqueItems) - report.error(newMsg(tree, bundle, "elementsNotUnique")); - } - } - - /* - * Our custom digester - * - * We take the opportunity to build a digested form where, for instance, - * [ 3, 5 ] and [ 5, 3 ] give the same digest. - */ - private static final class DivisorsDigesters - extends AbstractDigester - { - private static final Digester INSTANCE = new DivisorsDigesters(); - - public static Digester getInstance() - { - return INSTANCE; - } - - private DivisorsDigesters() - { - super("divisors", NodeType.INTEGER); - } - - @Override - public JsonNode digest(final JsonNode schema) - { - final SortedSet set = Sets.newTreeSet(COMPARATOR); - for (final JsonNode element: schema.get(keyword)) - set.add(element); - - return FACTORY.arrayNode().addAll(set); - } - - /* - * Custom Comparator. We compare BigInteger values, since all integers - * are representable using this class. - */ - private static final Comparator COMPARATOR - = new Comparator() - { - @Override - public int compare(final JsonNode o1, final JsonNode o2) - { - return o1.bigIntegerValue().compareTo(o2.bigIntegerValue()); - } - }; - } - - - /** - * Custom keyword validator for {@link Example9} - * - * It must be {@code public} because it is built by reflection. - */ - public static final class DivisorsKeywordValidator - extends AbstractKeywordValidator - { - /* - * We want to validate arbitrarily large integer values, we therefore - * use BigInteger. - */ - private final List divisors; - - public DivisorsKeywordValidator(final JsonNode digest) - { - super("divisors"); - - final ImmutableList.Builder list - = ImmutableList.builder(); - - for (final JsonNode element: digest) - list.add(element.bigIntegerValue()); - - divisors = list.build(); - } - - @Override - public void validate(final Processor processor, - final ProcessingReport report, final MessageBundle bundle, - final FullData data) - throws ProcessingException - { - final BigInteger value - = data.getInstance().getNode().bigIntegerValue(); - /* - * We use a plain list to store failed divisors: remember that the - * digested form was built with divisors in order, we therefore - * only need insertion order, and a plain ArrayList guarantees that. - */ - final List failed = Lists.newArrayList(); - - for (final BigInteger divisor: divisors) - if (!value.mod(divisor).equals(BigInteger.ZERO)) - failed.add(divisor); - - if (failed.isEmpty()) - return; - - /* - * There are missed divisors: report. - */ - report.error(newMsg(data, bundle, "missingDivisors") - .put("divisors", divisors).put("failed", failed)); - } - - @Override - public String toString() - { - return "divisors: " + divisors; - } - } -} diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-bad.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-bad.json deleted file mode 100644 index 5359f2b19..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-bad.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "id": "5aacaa7e-15f5-4798-9857-7c34a0d8fda0", - "name": "foo" - }, - { - "id": "not-an-uuid", - "name": "bar" - } -] \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-good.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-good.json deleted file mode 100644 index ec4be97d5..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt-good.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "id": "5aacaa7e-15f5-4798-9857-7c34a0d8fda0", - "name": "foo" - } -] \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt.json deleted file mode 100644 index f872d1c2c..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-fmt.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "title": "custom format attribute demonstration", - "type": "array", - "items": { - "type": "object", - "required": [ "id", "name" ], - "properties": { - "id": { - "type": "string", - "format": "uuid" - }, - "name": { - "type": "string" - } - } - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-bad.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-bad.json deleted file mode 100644 index 07dc92425..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-bad.json +++ /dev/null @@ -1 +0,0 @@ -[ 3, 12, 17 ] \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-good.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-good.json deleted file mode 100644 index f5b341927..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword-good.json +++ /dev/null @@ -1 +0,0 @@ -[ 6, 12, 90 ] \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword.json deleted file mode 100644 index 85c4ff243..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/custom-keyword.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "array", - "items": { - "type": "integer", - "divisors": [ 2, 3 ] - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad.json deleted file mode 100644 index bd4e47097..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "/": { - "fstype": "btrfs", - "options": [ "ssd" ] - }, - "/tmp": { - "device": "tmpfs", - "fstype": "tmpfs", - "options": [ "size=64M" ] - }, - "/var/lib/mysql": { - "device": "/dev/data/mysql", - "fstype": "btrfs" - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad2.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad2.json deleted file mode 100644 index 743676d52..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-bad2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "/": { - "device": "/dev/sda1", - "options": [ "ssd" ] - }, - "swap": { - "device": "/dev/sda2", - "fstype": "swap" - }, - "/tmp": { - "device": "tmpfs", - "fstype": "tmpfs", - "options": "size=64M" - }, - "/var/lib/mysql": { - "device": "/dev/data/mysql", - "fstype": "btrfs" - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-draftv3.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-draftv3.json deleted file mode 100644 index 597df1b89..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-draftv3.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-03/schema#", - "title": "/etc/fstab", - "description": "JSON representation of /etc/fstab", - "type": "object", - "properties": { - "/": { - "required": true, - "$ref": "#/definitions/mntent" - }, - "swap": { - "required": true, - "$ref": "#/definitions/mntent" - } - }, - "patternProperties": { - "^/[^/]+(/[^/]+)*$": { - "$ref": "#/definitions/mntent" - } - }, - "additionalProperties": false, - "definitions": { - "mntent": { - "title": "mntent", - "description": "An fstab entry", - "type": "object", - "properties": { - "device": { - "type": "string", - "required": true - }, - "fstype": { - "type": "string", - "required": true - }, - "options": { - "type": "array", - "minItems": 1, - "items": { "type": "string" } - }, - "dump": { - "type": "integer", - "minimum": 0 - }, - "fsck": { - "type": "integer", - "minimum": 0 - } - }, - "additionalItems": false - } - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-good.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-good.json deleted file mode 100644 index 6367c4335..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-good.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "/": { - "device": "/dev/sda1", - "fstype": "btrfs", - "options": [ "ssd" ] - }, - "swap": { - "device": "/dev/sda2", - "fstype": "swap" - }, - "/tmp": { - "device": "tmpfs", - "fstype": "tmpfs", - "options": [ "size=64M" ] - }, - "/var/lib/mysql": { - "device": "/dev/data/mysql", - "fstype": "btrfs" - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-inline.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-inline.json deleted file mode 100644 index 743b677e3..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-inline.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "/etc/fstab", - "description": "JSON representation of /etc/fstab", - "type": "object", - "required": [ "/", "swap" ], - "properties": { - "swap": { - "$ref": "#mntent" - } - }, - "patternProperties": { - "^/[^/]+(/[^/]+)*$": { - "$ref": "#mntent" - } - }, - "additionalProperties": false, - "definitions": { - "mntent": { - "title": "mntent", - "description": "An fstab entry", - "type": "object", - "properties": { - "device": { - "type": "string" - }, - "fstype": { - "type": "string" - }, - "options": { - "type": "array", - "minItems": 1, - "items": { "type": "string" } - }, - "dump": { - "type": "integer", - "minimum": 0 - }, - "fsck": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ "device", "fstype" ], - "additionalItems": false - } - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-sub.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-sub.json deleted file mode 100644 index 3c4cc2568..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab-sub.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "/etc/fstab", - "description": "JSON representation of /etc/fstab", - "fstab": { - "type": "object", - "properties": { - "swap": { - "$ref": "#/mntent" - } - }, - "patternProperties": { - "^/([^/]+(/[^/]+)*)?$": { - "$ref": "#/mntent" - } - }, - "required": [ "/", "swap" ], - "additionalProperties": false - }, - "mntent": { - "title": "mntent", - "description": "An fstab entry", - "type": "object", - "properties": { - "device": { - "type": "string" - }, - "fstype": { - "type": "string" - }, - "options": { - "type": "array", - "minItems": 1, - "items": { "type": "string" } - }, - "dump": { - "type": "integer", - "minimum": 0 - }, - "fsck": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ "device", "fstype" ], - "additionalItems": false - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab.json deleted file mode 100644 index ff4f8d702..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/fstab.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "/etc/fstab", - "description": "JSON representation of /etc/fstab", - "type": "object", - "properties": { - "swap": { - "$ref": "#/definitions/mntent" - } - }, - "patternProperties": { - "^/([^/]+(/[^/]+)*)?$": { - "$ref": "#/definitions/mntent" - } - }, - "required": [ "/", "swap" ], - "additionalProperties": false, - "definitions": { - "mntent": { - "title": "mntent", - "description": "An fstab entry", - "type": "object", - "properties": { - "device": { - "type": "string" - }, - "fstype": { - "type": "string" - }, - "options": { - "type": "array", - "minItems": 1, - "items": { "type": "string" } - }, - "dump": { - "type": "integer", - "minimum": 0 - }, - "fsck": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ "device", "fstype" ], - "additionalItems": false - } - } -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/fstab.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/fstab.json deleted file mode 100644 index c99ec3d3d..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/fstab.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "/etc/fstab", - "description": "JSON representation of /etc/fstab", - "type": "object", - "properties": { - "swap": { - "$ref": "mntent.json" - } - }, - "patternProperties": { - "^/([^/]+(/[^/]+)*)?$": { - "$ref": "mntent.json" - } - }, - "required": [ "/", "swap" ], - "additionalProperties": false -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/mntent.json b/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/mntent.json deleted file mode 100644 index 76066d052..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/doc-files/split/mntent.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "mntent", - "description": "An fstab entry", - "type": "object", - "properties": { - "device": { - "type": "string" - }, - "fstype": { - "type": "string" - }, - "options": { - "type": "array", - "minItems": 1, - "items": { "type": "string" } - }, - "dump": { - "type": "integer", - "minimum": 0 - }, - "fsck": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ "device", "fstype" ], - "additionalItems": false -} \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/examples/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/examples/package-info.java deleted file mode 100644 index adf1fa876..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/examples/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * API usage examples - * - *

    This package contains examples on how to use all features of this API - * (including augmenting schemas, URI redirections etc).

    - * - *

    All examples have a {@code main()} program, so you may run them and see - * the output. Suggestions welcome.

    - */ -package com.github.fge.jsonschema.examples; diff --git a/src/main/javadoc/com/github/fge/jsonschema/exceptions/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/exceptions/package-info.java deleted file mode 100644 index b824ae488..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/exceptions/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Validation processing exceptions - */ -package com.github.fge.jsonschema.exceptions; diff --git a/src/main/javadoc/com/github/fge/jsonschema/exceptions/unchecked/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/exceptions/unchecked/package-info.java deleted file mode 100644 index 3303e7cec..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/exceptions/unchecked/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Validation processing configuration error exceptions (unchecked) - */ -package com.github.fge.jsonschema.exceptions.unchecked; diff --git a/src/main/javadoc/com/github/fge/jsonschema/format/common/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/format/common/package-info.java deleted file mode 100644 index 3288968a4..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/format/common/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Common format attribute classes for draft v3 and draft v4 - */ - -package com.github.fge.jsonschema.format.common; \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/format/draftv3/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/format/draftv3/package-info.java deleted file mode 100644 index e14192887..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/format/draftv3/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Format attributes specific to draft v3 - */ - -package com.github.fge.jsonschema.format.draftv3; \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/format/draftv4/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/format/draftv4/package-info.java deleted file mode 100644 index 96c32619d..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/format/draftv4/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Format attributes specific to draft v4 - */ - -package com.github.fge.jsonschema.format.draftv4; \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/format/helpers/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/format/helpers/package-info.java deleted file mode 100644 index 486c6894d..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/format/helpers/package-info.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Helper classes for format attributes - * - *

    The one you may want to reuse is {@link - * com.github.fge.jsonschema.format.helpers.AbstractDateFormatAttribute}, which - * can be used to validate any date format using Joda Time's {@link - * org.joda.time.format.DateTimeFormat}.

    - */ -package com.github.fge.jsonschema.format.helpers; diff --git a/src/main/javadoc/com/github/fge/jsonschema/format/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/format/package-info.java deleted file mode 100644 index b2e51fb74..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/format/package-info.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Format attribute base classes - * - *

    The {@code format} keyword plays a particular role in JSON Schema - * validation, since it is the only keyword performing semantic validation. - * Note that supporting it is optional, and that implementations are - * asked to provide a way to deactivate format checking on demand. This - * implementation offers this option.

    - * - *

    Draft v4 defines a narrower subset of format attributes than draft v3. - * The following format attributes are common to both draft v3 and draft v4:

    - * - *
      - *
    • {@code date-time};
      • - *
    • {@code email};
      • - *
    • {@code host-name};
      • - *
    • {@code ipv6};
      • - *
    • {@code regex};
      • - *
    • {@code uri}.
      • - *
    - * - *

    Draft v3 defines the following additional attributes:

    - * - *
      - *
    • {@code date};
      • - *
    • {@code phone};
      • - *
    • {@code time};
      • - *
    • {@code utc-millisec};
      • - *
    • {@code color} (unsupported);
      • - *
    • {@code style} (unsupported).
      • - *
    - * - *

    Additionally, there is an attribute named {@code ip-address} in draft v3, - * and {@code ipv4} in draft v4, which can validate IPv4 addresses.

    - */ - -package com.github.fge.jsonschema.format; \ No newline at end of file diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/common/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/common/package-info.java deleted file mode 100644 index 631249fbb..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/common/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Digesters common to both draft v3 and draft v4 - */ - -package com.github.fge.jsonschema.keyword.digest.common; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv3/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv3/package-info.java deleted file mode 100644 index 886e4efaa..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv3/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Digesters specific to draft v3 - */ - -package com.github.fge.jsonschema.keyword.digest.draftv3; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv4/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv4/package-info.java deleted file mode 100644 index 146fd5ccd..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/draftv4/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Digesters specific to draft v4 - */ - -package com.github.fge.jsonschema.keyword.digest.draftv4; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/helpers/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/helpers/package-info.java deleted file mode 100644 index f4572d207..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/helpers/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Digester helper classes - */ - -package com.github.fge.jsonschema.keyword.digest.helpers; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/package-info.java deleted file mode 100644 index dc7e7de2b..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/digest/package-info.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword digesters - * - *

    Digesters play two important roles:

    - * - *
      - *
    • they detect similar schemas for a given keyword, and produce the same - * output in this case;
      • - *
    • they provide to later elements in the validation chain the list of - * types validated by a keyword.
      • - *
    - * - *

    The first item has two advantages: not only is the library's memory - * footprint reduced, it also allows a great simplification of keyword - * constructors.

    - */ - -package com.github.fge.jsonschema.keyword.digest; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/package-info.java deleted file mode 100644 index 2ed1ac316..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/package-info.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword syntax checkers, digesters and validators - * - *

    One schema keyword consists, apart from its name, of three elements:

    - * - *
      - *
    • a {@link com.github.fge.jsonschema.keyword.syntax.SyntaxChecker} - * which checks whether the keyword has the correct syntax in a JSON schema; - *
      • - *
    • a {@link com.github.fge.jsonschema.keyword.digest.Digester} which - * digests the schema for a specific keyword so as to use a more efficient - * form when building the validator;
      • - *
    • a {@link - * com.github.fge.jsonschema.keyword.validator.KeywordValidator} which - * validates an instance against the schema.
      • - *
    - * - *

    All these elements are run in this order. Note that keyword validators - * are always built by reflection. You can create your own custom keyword by - * providing its name and these three elements wrapped into a {@link - * com.github.fge.jsonschema.library.Keyword} to inject into a {@link - * com.github.fge.jsonschema.library.Library}, which you will then submit to a - * {@link com.github.fge.jsonschema.cfg.ValidationConfiguration}.

    - */ - -package com.github.fge.jsonschema.keyword; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/common/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/common/package-info.java deleted file mode 100644 index d76589ab2..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/common/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword validators common to both draft v3 and draft v4 - */ - -package com.github.fge.jsonschema.keyword.validator.common; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv3/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv3/package-info.java deleted file mode 100644 index 3b60ba53c..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv3/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword validators specific to draft v3 - */ - -package com.github.fge.jsonschema.keyword.validator.draftv3; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv4/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv4/package-info.java deleted file mode 100644 index f99fd6443..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/draftv4/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword validators specific to draft v4 - */ - -package com.github.fge.jsonschema.keyword.validator.draftv4; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/helpers/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/helpers/package-info.java deleted file mode 100644 index de55c0b8a..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/helpers/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword validator helper classes - */ - -package com.github.fge.jsonschema.keyword.validator.helpers; diff --git a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/package-info.java deleted file mode 100644 index 66684e2fd..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/keyword/validator/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword validators - * - *

    These are the actual validators of user data.

    - * - *

    Keywords are built by reflection, with a digested form of schemas - * (produced by a {@link com.github.fge.jsonschema.keyword.digest.Digester}) as - * the only constructor argument.

    - */ - -package com.github.fge.jsonschema.keyword.validator; diff --git a/src/main/javadoc/com/github/fge/jsonschema/library/digest/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/library/digest/package-info.java deleted file mode 100644 index d55b5d689..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/library/digest/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Dictionaries of builtin {@link - * com.github.fge.jsonschema.keyword.digest.Digester}s - */ -package com.github.fge.jsonschema.library.digest; diff --git a/src/main/javadoc/com/github/fge/jsonschema/library/format/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/library/format/package-info.java deleted file mode 100644 index 9b55bbc4f..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/library/format/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Dictionaries of builtin {@link - * com.github.fge.jsonschema.format.FormatAttribute}s - */ -package com.github.fge.jsonschema.library.format; diff --git a/src/main/javadoc/com/github/fge/jsonschema/library/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/library/package-info.java deleted file mode 100644 index 336b7245f..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/library/package-info.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Schema keyword libraries - * - *

    A {@link com.github.fge.jsonschema.library.Library} contains a set of - * keywords and all elements related to them (syntax validators, digesters and - * validator classes), along with format attributes.

    - * - *

    Libraries are immutable, but you can obtain a thawed copy of them in - * which you can inject new keywords and format attributes (or remove existing - * ones).

    - * - *

    The two predefined libraries are the draft v4 core schema library and the - * draft v3 core schema library.

    - */ -package com.github.fge.jsonschema.library; diff --git a/src/main/javadoc/com/github/fge/jsonschema/library/validator/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/library/validator/package-info.java deleted file mode 100644 index 34a7accb5..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/library/validator/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Dictionaries of builtin {@link - * com.github.fge.jsonschema.keyword.validator.KeywordValidator} constructors - */ -package com.github.fge.jsonschema.library.validator; diff --git a/src/main/javadoc/com/github/fge/jsonschema/main/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/main/package-info.java deleted file mode 100644 index c1c79a979..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/main/package-info.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Main interface to validation - * - *

    This package contains wrapper classes over validation processors.

    - * - *

    The main provider is {@link - * com.github.fge.jsonschema.main.JsonSchemaFactory}: from this class, you can - * obtain a {@link com.github.fge.jsonschema.processors.syntax.SyntaxValidator}, - * a {@link com.github.fge.jsonschema.main.JsonValidator} or a {@link - * com.github.fge.jsonschema.main.JsonSchema}.

    - */ -package com.github.fge.jsonschema.main; diff --git a/src/main/javadoc/com/github/fge/jsonschema/messages/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/messages/package-info.java deleted file mode 100644 index ad723d114..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/messages/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Messages used by exceptions - */ -package com.github.fge.jsonschema.messages; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/build/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/build/package-info.java deleted file mode 100644 index b68cf7b61..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/build/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Keyword builder processor - * - * @see com.github.fge.jsonschema.keyword.validator.KeywordValidator - */ -package com.github.fge.jsonschema.processors.build; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/data/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/data/package-info.java deleted file mode 100644 index 4c01c9747..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/data/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Inputs and outputs used by validation processors - */ -package com.github.fge.jsonschema.processors.data; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/digest/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/digest/package-info.java deleted file mode 100644 index dc3886ca1..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/digest/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Schema digester - * - * @see com.github.fge.jsonschema.keyword.digest.Digester - */ -package com.github.fge.jsonschema.processors.digest; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/format/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/format/package-info.java deleted file mode 100644 index 22d2d90d3..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/format/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Format attribute handler - * - * @see com.github.fge.jsonschema.format.FormatAttribute - */ -package com.github.fge.jsonschema.processors.format; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/package-info.java deleted file mode 100644 index c3ffed2f0..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/package-info.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Core validation processors - * - *

    A full validation makes use of the following individual processors, in - * order:

    - * - *
      - *
    • {@link com.github.fge.jsonschema.processors.ref reference - * resolution};
      • - *
    • {@link com.github.fge.jsonschema.processors.syntax syntax checking}; - *
      • - *
    • {@link com.github.fge.jsonschema.processors.digest schema digesting}; - *
      • - *
    • {@link com.github.fge.jsonschema.processors.build keyword building}. - *
      • - *
    - * - *

    All these individual processors are wrapped into a {@link - * com.github.fge.jsonschema.processors.validation.ValidationProcessor}, which - * handles the validation process as a whole -- including {@code $schema} - * detection.

    - */ -package com.github.fge.jsonschema.processors; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/ref/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/ref/package-info.java deleted file mode 100644 index d8f270655..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/ref/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * JSON Reference resolver - */ -package com.github.fge.jsonschema.processors.ref; diff --git a/src/main/javadoc/com/github/fge/jsonschema/processors/validation/package-info.java b/src/main/javadoc/com/github/fge/jsonschema/processors/validation/package-info.java deleted file mode 100644 index cf86e1b4d..000000000 --- a/src/main/javadoc/com/github/fge/jsonschema/processors/validation/package-info.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) - * - * This software is dual-licensed under: - * - * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any - * later version; - * - the Apache Software License (ASL) version 2.0. - * - * The text of both licenses is available under the src/resources/ directory of - * this project (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). - * - * Direct link to the sources: - * - * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt - * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt - */ - -/** - * Main validation processors and utility classes - * - *

    The main processors are:

    - * - *
      - *
    • {@link - * com.github.fge.jsonschema.processors.validation.ValidationProcessor}, - * which is the backbone behind all main classes, and the coordinator of - * all individual validation processors;
      • - *
    • {@link - * com.github.fge.jsonschema.processors.validation.ValidationChain}, which - * performs the schema-to-keyword conversion.
      • - *
    - */ -package com.github.fge.jsonschema.processors.validation; diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html deleted file mode 100644 index 045352fa1..000000000 --- a/src/main/javadoc/overview.html +++ /dev/null @@ -1,193 +0,0 @@ - - - - -A JSON Schema validator implementation in Java which aims for correctness and -performance, in that order - -

    What this is

    - -

    Motivation

    - -

    This implementation is meant to be purely server-side if Java is your -language of choice. You may, or may not, use it in your Java Web -application; this library has no dependencies on anything Web-related.

    - -

    Extensibility

    - -

    This project uses the infrastructure provided by json-schema-core, which -means you can use all the power in this library to include the processors -provided in this package into your own custom chains.

    - -

    What is more, you can define your own schemas, with dedicated keywords and/or -format attributes.

    - -

    Strong points

    - -

    This library has complete draft v3 and draft v4 validation support.

    - -

    It also has three particular features making it stand apart:

    - -
      -
    • regular expressions obey ECMA 262 (ie, those are JavaScript regular - expressions);
      • -
    • it can validate numeric JSON data or abitrary scale/precision. -
      • -
    - -

    Sample usage

    - -

    There are code examples in package {@link -com.github.fge.jsonschema.examples} which you can use to get started.

    - -

    The validation process

    - -

    The validation process is a five step process:

    - -
      -
    • $ref resolution;
      • -
    • schema syntax validation;
      • -
    • schema digesting;
      • -
    • keyword building;
      • -
    • instance validation (ie, validate your data).
      • -
    - -

    $ref resolution

    - -

    This is a critically important part of the validation process. You may -encounter, during validation, what is called a JSON -Reference. A JSON Reference is a JSON Object with one member named -$ref, and the value of this member -is a text value which embodies a URI. Implementations are required to follow -JSON References until an actual final content is reached (and this content may, -or may not, be a valid JSON Schema).

    - -

    Also, consider this schema:

    - -
    -    {
-        "$ref": "some://where/else",
-        "minimum": 3
-    }
-
    - -

    This is still a JSON Reference. Other schema keywords, such as -minimum in this example, should be -ignored. And this is what this implementation does.

    - -

    Note that any failure in $ref validation is considered a fatal error.

    - -

    The processor in charge of this step is {@link -com.github.fge.jsonschema.core.load.RefResolver}. It is located in package -json-schema-core.

    - -

    Schema syntax checking

    - -

    This is an equally important part of the validation process. One thing to -note about the previous step is that it will only check that JSON Reference -resolution ultimately leads to a JSON document, whatever that document is. Which -means it may not even be a JSON Object, therefore not a JSON Schema. This basic -check is done at that level.

    - -

    After schema syntax checking is done, you are ensured that the schema is well -formed: this simplifies later processing. Note however that syntax checking will -not follow JSON References.

    - -

    The processor in charge of this step is {@link -com.github.fge.jsonschema.core.keyword.syntax.SyntaxProcessor}. It is located in -the json-schema-core package.

    - -

    Digesting

    - -

    This step of the processing chain takes into account both the schema and the -instance to validate. Its role is to check the instance type, pick the relevant -keywords for that instance type into the current schema, and build digested -forms of these keywords for the next step.

    - -

    For instance, consider that you are validating a number instance, and the -current schema reads:

    - -
    -    {
-        "minItems": 3,
-        "maximum": 3
-    }
-
    - -

    {@code minItems} does not apply to numbers, it will therefore be filtered out -here. But this is not all. Now consider those two schemas:

    - -
    -    {
-        "additionalItems": true
-    }
-
    - -
    -    {
-        "additionalItems": { "type": "string" }
-    }
-
    - -

    They have exactly the same influence on the validation of the array itself -(note: the array, not its elements). The digest for these two schemas -when the instance to validate is an array will therefore be the same. This -allows to prune a lot of duplicates out of keyword caching.

    - -

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processors.digest.SchemaDigester}.

    - -

    Keyword building

    - -

    At this step, the digested form of the current schema is grabbed and all -relevant keywords are built (if they are not found in the cache). The real -validation can now take place.

    - -

    Again, all results are cached for future reuse. And as all keywords are -context-free, a same result can be reused across different schemas.

    - -

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processors.build.ValidatorBuilder}.

    - -

    Instance (aka data) validation

    - -

    This is the part which actually matters to end users: ensure that their data -is valid.

    - -

    This step of the processing consists of two distinct elements:

    - -
      -
    • running the keyword validators built at the previous step;
      • -
    • (recursively) validating children of arrays and/or objects.
      • -
    - -

    As some keywords require that this very same processor be called again, all -keyword validators keep a reference to it: this is what also allows keywords -such as {@code anyOf}, {@code allOf} and others to work correctly. In a similar -manner, this processor also needs a reference to the start of the chain (the -reference resolver processor).

    - -

    The processor in charge of this step is {@link -com.github.fge.jsonschema.processors.validation.ValidationProcessor}.

    - - - From 17cc0ea61b97be32901cc0fd842f990075754ce9 Mon Sep 17 00:00:00 2001 From: capstan Date: Thu, 5 Sep 2019 14:06:43 +0200 Subject: [PATCH 45/71] Restore javadoc overview page. Partial revert of commit ed7901ed5. --- src/main/javadoc/overview.html | 193 +++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 src/main/javadoc/overview.html diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html new file mode 100644 index 000000000..045352fa1 --- /dev/null +++ b/src/main/javadoc/overview.html @@ -0,0 +1,193 @@ + + + + +A JSON Schema validator implementation in Java which aims for correctness and +performance, in that order + +

    What this is

    + +

    Motivation

    + +

    This implementation is meant to be purely server-side if Java is your +language of choice. You may, or may not, use it in your Java Web +application; this library has no dependencies on anything Web-related.

    + +

    Extensibility

    + +

    This project uses the infrastructure provided by json-schema-core, which +means you can use all the power in this library to include the processors +provided in this package into your own custom chains.

    + +

    What is more, you can define your own schemas, with dedicated keywords and/or +format attributes.

    + +

    Strong points

    + +

    This library has complete draft v3 and draft v4 validation support.

    + +

    It also has three particular features making it stand apart:

    + +
      +
    • regular expressions obey ECMA 262 (ie, those are JavaScript regular + expressions);
      • +
    • it can validate numeric JSON data or abitrary scale/precision. +
      • +
    + +

    Sample usage

    + +

    There are code examples in package {@link +com.github.fge.jsonschema.examples} which you can use to get started.

    + +

    The validation process

    + +

    The validation process is a five step process:

    + +
      +
    • $ref resolution;
      • +
    • schema syntax validation;
      • +
    • schema digesting;
      • +
    • keyword building;
      • +
    • instance validation (ie, validate your data).
      • +
    + +

    $ref resolution

    + +

    This is a critically important part of the validation process. You may +encounter, during validation, what is called a JSON +Reference. A JSON Reference is a JSON Object with one member named +$ref, and the value of this member +is a text value which embodies a URI. Implementations are required to follow +JSON References until an actual final content is reached (and this content may, +or may not, be a valid JSON Schema).

    + +

    Also, consider this schema:

    + +
    +    {
+        "$ref": "some://where/else",
+        "minimum": 3
+    }
+
    + +

    This is still a JSON Reference. Other schema keywords, such as +minimum in this example, should be +ignored. And this is what this implementation does.

    + +

    Note that any failure in $ref validation is considered a fatal error.

    + +

    The processor in charge of this step is {@link +com.github.fge.jsonschema.core.load.RefResolver}. It is located in package +json-schema-core.

    + +

    Schema syntax checking

    + +

    This is an equally important part of the validation process. One thing to +note about the previous step is that it will only check that JSON Reference +resolution ultimately leads to a JSON document, whatever that document is. Which +means it may not even be a JSON Object, therefore not a JSON Schema. This basic +check is done at that level.

    + +

    After schema syntax checking is done, you are ensured that the schema is well +formed: this simplifies later processing. Note however that syntax checking will +not follow JSON References.

    + +

    The processor in charge of this step is {@link +com.github.fge.jsonschema.core.keyword.syntax.SyntaxProcessor}. It is located in +the json-schema-core package.

    + +

    Digesting

    + +

    This step of the processing chain takes into account both the schema and the +instance to validate. Its role is to check the instance type, pick the relevant +keywords for that instance type into the current schema, and build digested +forms of these keywords for the next step.

    + +

    For instance, consider that you are validating a number instance, and the +current schema reads:

    + +
    +    {
+        "minItems": 3,
+        "maximum": 3
+    }
+
    + +

    {@code minItems} does not apply to numbers, it will therefore be filtered out +here. But this is not all. Now consider those two schemas:

    + +
    +    {
+        "additionalItems": true
+    }
+
    + +
    +    {
+        "additionalItems": { "type": "string" }
+    }
+
    + +

    They have exactly the same influence on the validation of the array itself +(note: the array, not its elements). The digest for these two schemas +when the instance to validate is an array will therefore be the same. This +allows to prune a lot of duplicates out of keyword caching.

    + +

    The processor in charge of this step is {@link +com.github.fge.jsonschema.processors.digest.SchemaDigester}.

    + +

    Keyword building

    + +

    At this step, the digested form of the current schema is grabbed and all +relevant keywords are built (if they are not found in the cache). The real +validation can now take place.

    + +

    Again, all results are cached for future reuse. And as all keywords are +context-free, a same result can be reused across different schemas.

    + +

    The processor in charge of this step is {@link +com.github.fge.jsonschema.processors.build.ValidatorBuilder}.

    + +

    Instance (aka data) validation

    + +

    This is the part which actually matters to end users: ensure that their data +is valid.

    + +

    This step of the processing consists of two distinct elements:

    + +
      +
    • running the keyword validators built at the previous step;
      • +
    • (recursively) validating children of arrays and/or objects.
      • +
    + +

    As some keywords require that this very same processor be called again, all +keyword validators keep a reference to it: this is what also allows keywords +such as {@code anyOf}, {@code allOf} and others to work correctly. In a similar +manner, this processor also needs a reference to the start of the chain (the +reference resolver processor).

    + +

    The processor in charge of this step is {@link +com.github.fge.jsonschema.processors.validation.ValidationProcessor}.

    + + + From 7859b63363cfb706afa663d64e86c037dc74a3f8 Mon Sep 17 00:00:00 2001 From: capstan Date: Thu, 5 Sep 2019 17:06:52 +0200 Subject: [PATCH 46/71] Fix Javadoc generation warnings. --- .../fge/jsonschema/format/AbstractFormatAttribute.java | 1 + .../jsonschema/format/common/RFC3339DateTimeAttribute.java | 5 +++-- .../keyword/validator/helpers/NumericValidator.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/format/AbstractFormatAttribute.java b/src/main/java/com/github/fge/jsonschema/format/AbstractFormatAttribute.java index 69b9d5c58..5b44e7bb5 100644 --- a/src/main/java/com/github/fge/jsonschema/format/AbstractFormatAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/AbstractFormatAttribute.java @@ -72,6 +72,7 @@ public final EnumSet supportedTypes() * Return a new message for this format attribute * * @param data the validation context + * @param bundle the format bundle * @param key key in the format bundle message * @return a new message */ diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java index b8a0fbe4c..80a42ae75 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java @@ -18,8 +18,7 @@ import com.google.common.collect.ImmutableList; /** - * A {@link DateTimeFormatter} for date and time format defined in RFC3339. - * @see RFC 3339 - Section 5.6 + * A {@link DateTimeFormatter} for date and time format defined in RFC3339. * * This is backwards incompat with the original DateTimeAttribute. It will become the default in the future * to use it currently you need to: @@ -27,6 +26,8 @@ * .addFormatAttribute("date-time", RFC3339DateTimeAttribute.getInstance()) * .freeze(); * Then follow the rest of the steps in example 8 to hook it into your flow. + * + * @see RFC 3339 - Section 5.6 */ public class RFC3339DateTimeAttribute extends AbstractFormatAttribute { diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/helpers/NumericValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/helpers/NumericValidator.java index e6a9ac001..3a8669040 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/helpers/NumericValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/helpers/NumericValidator.java @@ -77,7 +77,8 @@ public final void validate(final Processor processor, * @param report the validation report * @param bundle the message bundle to use * @param data the validation data - */ + * @throws ProcessingException a processing error occurred during validation + */ protected abstract void validateLong(final ProcessingReport report, final MessageBundle bundle, final FullData data) throws ProcessingException; @@ -89,6 +90,7 @@ protected abstract void validateLong(final ProcessingReport report, * @param report the validation report * @param bundle the message bundle to use * @param data the validation data + * @throws ProcessingException a processing error occurred during validation */ protected abstract void validateDecimal(final ProcessingReport report, final MessageBundle bundle, final FullData data) From 4e2df07fb172f81ff34b9d77f10c1c98e23bbb07 Mon Sep 17 00:00:00 2001 From: capstan Date: Thu, 5 Sep 2019 22:47:38 +0200 Subject: [PATCH 47/71] Update Gradle to 5.6.2 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e8d638399..b3a475cb4 100644 --- a/build.gradle +++ b/build.gradle @@ -142,7 +142,7 @@ artifacts { } wrapper { - gradleVersion = "5.6.1"; + gradleVersion = "5.6.2"; distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"; } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f76b8798..c63446067 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-5.6.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 5a44e4333eadeae6b714e1ad5146745c89ce7748 Mon Sep 17 00:00:00 2001 From: capstan Date: Fri, 25 Oct 2019 09:08:25 +0200 Subject: [PATCH 48/71] Add ErrorProne checks and lint. --- build.gradle | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/build.gradle b/build.gradle index b3a475cb4..75ebcd806 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,17 @@ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt */ +plugins { + id("net.ltgt.errorprone") version "0.8.1" apply false +} + apply(plugin: "java"); apply(plugin: "maven"); apply(plugin: "signing"); apply(plugin: "osgi"); apply(plugin: "idea"); apply(plugin: "eclipse"); +apply(plugin: "net.ltgt.errorprone"); group = "com.github.java-json-tools"; version = "2.2.12-SNAPSHOT"; @@ -36,6 +41,14 @@ repositories { mavenCentral(); } +/* + * Add errorprone checking. + */ +dependencies { + errorprone("com.google.errorprone:error_prone_core:2.3.3") + errorproneJavac("com.google.errorprone:javac:9+181-r4173-1") +} + /* * List of dependencies */ @@ -87,6 +100,17 @@ task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource; } +/* + * Lint all the things! + */ +allprojects { + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:all" + } + } +} + /* * Javadoc: we need to tell where the overview.html is, it will not pick it up * automatically... From 0d70bd8633ae8eb833d286c17b979b9524f41f35 Mon Sep 17 00:00:00 2001 From: capstan Date: Fri, 25 Oct 2019 09:15:25 +0200 Subject: [PATCH 49/71] Travis Gradle improvements * Compile for both OpenJDK8 and 11 * Inhibit the install phase, so the compile warnings are visible in final travis output. * Override the gradle command to get both assemble and check. * Cache the gradle caches and wrapper so builds are less expensive. --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5c99a7f6..87d176072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,17 @@ -language: java \ No newline at end of file +language: java +jdk: + - openjdk8 + - openjdk11 +install: {} +script: + - ./gradlew assemble check + +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + From f5bfbbac87464ae764d11bad20a135edfe517828 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 29 Oct 2019 14:30:22 +0100 Subject: [PATCH 50/71] Bump to Java 7. See java-json-tools/jackson-coreutils/issues/12. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 75ebcd806..c2182e558 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,8 @@ apply(plugin: "net.ltgt.errorprone"); group = "com.github.java-json-tools"; version = "2.2.12-SNAPSHOT"; -sourceCompatibility = "1.6"; -targetCompatibility = "1.6"; // defaults to sourceCompatibility +sourceCompatibility = JavaVersion.VERSION_1_7; +targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility /* * Repositories to use @@ -68,7 +68,7 @@ dependencies { testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); } -javadoc.options.links("http://docs.oracle.com/javase/6/docs/api/"); +javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/"); javadoc.options.links("http://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); javadoc.options.links("http://fasterxml.github.com/jackson-databind/javadoc/2.2.0/"); javadoc.options.links("http://fasterxml.github.com/jackson-core/javadoc/2.2.0/"); From 49ecb1a23c42c63c03e7c8b62c7fb42a98796dcf Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 29 Oct 2019 15:24:13 +0100 Subject: [PATCH 51/71] Use https, fix Guava reference version, and fix project refs. --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index c2182e558..d49cdcafd 100644 --- a/build.gradle +++ b/build.gradle @@ -68,17 +68,17 @@ dependencies { testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); } +// FIXME: For some reason, making this https causes OpenJDK 11 to fail. javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/"); -javadoc.options.links("http://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); -javadoc.options.links("http://fasterxml.github.com/jackson-databind/javadoc/2.2.0/"); -javadoc.options.links("http://fasterxml.github.com/jackson-core/javadoc/2.2.0/"); -javadoc.options.links("http://www.javadoc.io/doc/com.google.guava/guava/16.0.1/"); -javadoc.options.links("http://fge.github.io/btf/"); -javadoc.options.links("http://fge.github.io/msg-simple/"); -javadoc.options.links("http://fge.github.io/jackson-coreutils/"); -javadoc.options.links("http://fge.github.io/uri-template/"); -javadoc.options.links("http://java-json-tools.github.io/json-schema-core/1.2.x/"); - +javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); +javadoc.options.links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); +javadoc.options.links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); +javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-jre/"); +javadoc.options.links("https://java-json-tools.github.io/btf/"); +javadoc.options.links("https://java-json-tools.github.io/msg-simple/"); +javadoc.options.links("https://java-json-tools.github.io/jackson-coreutils/"); +javadoc.options.links("https://java-json-tools.github.io/uri-template/"); +javadoc.options.links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); /* * Necessary! Otherwise TestNG will not be used... From 9a98166969dee1b8d9651eb98ec940ee43152848 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 29 Oct 2019 16:04:20 +0100 Subject: [PATCH 52/71] Fix ErrorProne and deprecated warnings. Couldn't figure out the reference equality issues in CallbackValidatorTest, so I suppressed it. --- .../fge/jsonschema/exceptions/InvalidInstanceException.java | 2 ++ .../fge/jsonschema/format/common/DateTimeAttribute.java | 4 +--- .../jsonschema/format/common/RFC3339DateTimeAttribute.java | 4 +--- .../github/fge/jsonschema/format/common/RegexAttribute.java | 6 +++--- .../keyword/digest/draftv3/DraftV3DependenciesDigester.java | 3 +++ .../validator/common/AdditionalPropertiesValidator.java | 4 ++-- .../keyword/validator/common/PatternValidator.java | 6 +++--- .../github/fge/jsonschema/main/cli/CustomHelpFormatter.java | 4 ++-- .../processors/validation/ObjectSchemaSelector.java | 4 ++-- .../jsonschema/processors/validation/ValidationStack.java | 6 ------ .../keyword/validator/callback/CallbackValidatorTest.java | 3 ++- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/exceptions/InvalidInstanceException.java b/src/main/java/com/github/fge/jsonschema/exceptions/InvalidInstanceException.java index f50d10a70..ef609b49b 100644 --- a/src/main/java/com/github/fge/jsonschema/exceptions/InvalidInstanceException.java +++ b/src/main/java/com/github/fge/jsonschema/exceptions/InvalidInstanceException.java @@ -28,6 +28,8 @@ public final class InvalidInstanceException extends ProcessingException { + private static final long serialVersionUID = -3273787152985150466L; + public InvalidInstanceException(final ProcessingMessage message) { super(message); diff --git a/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java index 20a4a9821..8aae60ad2 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/DateTimeAttribute.java @@ -31,8 +31,6 @@ import org.joda.time.format.DateTimeFormatterBuilder; import org.joda.time.format.DateTimeParser; -import java.util.List; - import static org.joda.time.DateTimeFieldType.*; /** @@ -41,7 +39,7 @@ public final class DateTimeAttribute extends AbstractFormatAttribute { - private static final List FORMATS = ImmutableList.of( + private static final ImmutableList FORMATS = ImmutableList.of( "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ); private static final DateTimeFormatter FORMATTER; diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java index 80a42ae75..73c1e12af 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java @@ -1,7 +1,5 @@ package com.github.fge.jsonschema.format.common; -import java.util.List; - import com.github.fge.jsonschema.cfg.ValidationConfiguration; import com.github.fge.jsonschema.library.DraftV4Library; import org.joda.time.format.DateTimeFormatter; @@ -31,7 +29,7 @@ */ public class RFC3339DateTimeAttribute extends AbstractFormatAttribute { - private static final List RFC3339_FORMATS = ImmutableList.of( + private static final ImmutableList RFC3339_FORMATS = ImmutableList.of( "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ); diff --git a/src/main/java/com/github/fge/jsonschema/format/common/RegexAttribute.java b/src/main/java/com/github/fge/jsonschema/format/common/RegexAttribute.java index 9db53adee..f20127c19 100644 --- a/src/main/java/com/github/fge/jsonschema/format/common/RegexAttribute.java +++ b/src/main/java/com/github/fge/jsonschema/format/common/RegexAttribute.java @@ -22,7 +22,7 @@ import com.github.fge.jackson.NodeType; import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.core.util.RhinoHelper; +import com.github.fge.jsonschema.core.util.RegexECMA262Helper; import com.github.fge.jsonschema.format.AbstractFormatAttribute; import com.github.fge.jsonschema.format.FormatAttribute; import com.github.fge.jsonschema.processors.data.FullData; @@ -34,7 +34,7 @@ *

    Again, here, we do not use {@link java.util.regex} because it does * not fit the bill.

    * - * @see RhinoHelper + * @see RegexECMA262Helper */ public final class RegexAttribute extends AbstractFormatAttribute @@ -58,7 +58,7 @@ public void validate(final ProcessingReport report, { final String value = data.getInstance().getNode().textValue(); - if (!RhinoHelper.regexIsValid(value)) + if (!RegexECMA262Helper.regexIsValid(value)) report.error(newMsg(data, bundle, "err.format.invalidRegex") .putArgument("value", value)); } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java index 386bb07bb..683dc962d 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java @@ -91,6 +91,9 @@ public JsonNode digest(final JsonNode schema) case STRING: propertyDeps.put(key, FACTORY.arrayNode() .add(value.textValue())); + break; + default: + break; } } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/AdditionalPropertiesValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/AdditionalPropertiesValidator.java index b466ba678..1741dad02 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/AdditionalPropertiesValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/AdditionalPropertiesValidator.java @@ -25,7 +25,7 @@ import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.processing.Processor; import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.core.util.RhinoHelper; +import com.github.fge.jsonschema.core.util.RegexECMA262Helper; import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; @@ -84,7 +84,7 @@ public void validate(final Processor processor, for (final String field: fields) for (final String regex: patternProperties) - if (RhinoHelper.regMatch(regex, field)) + if (RegexECMA262Helper.regMatch(regex, field)) tmp.add(field); fields.removeAll(tmp); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/PatternValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/PatternValidator.java index 653428a27..5bce7ea79 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/PatternValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/PatternValidator.java @@ -23,7 +23,7 @@ import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.processing.Processor; import com.github.fge.jsonschema.core.report.ProcessingReport; -import com.github.fge.jsonschema.core.util.RhinoHelper; +import com.github.fge.jsonschema.core.util.RegexECMA262Helper; import com.github.fge.jsonschema.keyword.validator.AbstractKeywordValidator; import com.github.fge.jsonschema.processors.data.FullData; import com.github.fge.msgsimple.bundle.MessageBundle; @@ -31,7 +31,7 @@ /** * Keyword validator for {@code pattern} * - * @see RhinoHelper + * @see RegexECMA262Helper */ public final class PatternValidator extends AbstractKeywordValidator @@ -50,7 +50,7 @@ public void validate(final Processor processor, final String regex = data.getSchema().getNode().get(keyword) .textValue(); final String value = data.getInstance().getNode().textValue(); - if (!RhinoHelper.regMatch(regex, value)) + if (!RegexECMA262Helper.regMatch(regex, value)) report.error(newMsg(data, bundle, "err.common.pattern.noMatch") .putArgument("regex", regex).putArgument("string", value)); } diff --git a/src/main/java/com/github/fge/jsonschema/main/cli/CustomHelpFormatter.java b/src/main/java/com/github/fge/jsonschema/main/cli/CustomHelpFormatter.java index 95c6eaa4a..752fd7bb3 100644 --- a/src/main/java/com/github/fge/jsonschema/main/cli/CustomHelpFormatter.java +++ b/src/main/java/com/github/fge/jsonschema/main/cli/CustomHelpFormatter.java @@ -34,7 +34,7 @@ final class CustomHelpFormatter implements HelpFormatter { - private static final List HELP_PREAMBLE = ImmutableList.of( + private static final ImmutableList HELP_PREAMBLE = ImmutableList.of( "Syntax:", " java -jar jsonschema.jar [options] schema file [file...]", " java -jar jsonschema.jar --syntax [options] schema [schema...]", @@ -42,7 +42,7 @@ final class CustomHelpFormatter "Options: " ); - private static final List HELP_POST + private static final ImmutableList HELP_POST = ImmutableList.builder() .add("") .add("Exit codes:") diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaSelector.java b/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaSelector.java index 91e63a10a..9ddc1f3bb 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaSelector.java +++ b/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaSelector.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.jsonpointer.JsonPointer; -import com.github.fge.jsonschema.core.util.RhinoHelper; +import com.github.fge.jsonschema.core.util.RegexECMA262Helper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -73,7 +73,7 @@ public Iterable selectSchemas(final String memberName) list.add(PROPERTIES.append(memberName)); for (final String regex: patternProperties) - if (RhinoHelper.regMatch(regex, memberName)) + if (RegexECMA262Helper.regMatch(regex, memberName)) list.add(PATTERNPROPERTIES.append(regex)); if (!list.isEmpty()) diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationStack.java b/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationStack.java index 0759cb87f..ea31f1730 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationStack.java +++ b/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationStack.java @@ -58,12 +58,6 @@ @ParametersAreNonnullByDefault final class ValidationStack { - /* - * Sentinel which is always the first element of the stack; we use it in - * order to simplify the pop code. - */ - private static final Element NULL_ELEMENT = new Element(null, null); - /* * Queue of visited contexts */ diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java index d5d936e94..92ada83b5 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/CallbackValidatorTest.java @@ -21,7 +21,7 @@ import static com.github.fge.jsonschema.TestUtils.anyReport; import static com.github.fge.jsonschema.TestUtils.onlyOnce; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -247,6 +247,7 @@ private DummyProcessor(final WantedState wanted1, } @Override + @SuppressWarnings("ReferenceEquality") public FullData process(final ProcessingReport report, final FullData input) throws ProcessingException From 0b3c05636cafd98acb61b0cea8c0767a6b0a1ca1 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Wed, 30 Oct 2019 15:46:24 +0100 Subject: [PATCH 53/71] Side-grade Guava to the android variant. See java-json-tools/jackson-coreutils/issues/12. Also added missing compile dependency that was luckily fulfilled by dependencies. --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d49cdcafd..96ba0416e 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,7 @@ dependencies { * List of dependencies */ dependencies { + compile(group: "com.google.guava", name: "guava", version: "25.1-android"); compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.10"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); @@ -73,7 +74,7 @@ javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/"); javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); javadoc.options.links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); javadoc.options.links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); -javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-jre/"); +javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); javadoc.options.links("https://java-json-tools.github.io/btf/"); javadoc.options.links("https://java-json-tools.github.io/msg-simple/"); javadoc.options.links("https://java-json-tools.github.io/jackson-coreutils/"); From 0a6bb3bc7fe6c9ab2e8a7ef8f5588d77573e085c Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Wed, 30 Oct 2019 16:08:21 +0100 Subject: [PATCH 54/71] Use https for JDK javadoc links. Conditionally adds a `--release=7` flag to tell javadoc the source compatibility. This inhibits javadoc in later JDKs erroring out expecting modules when there are none. See java-json-tools/btf/issues/7. --- build.gradle | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 96ba0416e..8fbe002a2 100644 --- a/build.gradle +++ b/build.gradle @@ -69,17 +69,25 @@ dependencies { testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); } -// FIXME: For some reason, making this https causes OpenJDK 11 to fail. -javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/"); -javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); -javadoc.options.links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); -javadoc.options.links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); -javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); -javadoc.options.links("https://java-json-tools.github.io/btf/"); -javadoc.options.links("https://java-json-tools.github.io/msg-simple/"); -javadoc.options.links("https://java-json-tools.github.io/jackson-coreutils/"); -javadoc.options.links("https://java-json-tools.github.io/uri-template/"); -javadoc.options.links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); +javadoc { + options { + def currentJavaVersion = org.gradle.api.JavaVersion.current() + // FIXME: https://github.com/gradle/gradle/issues/11182 + if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) { + addStringOption("-release", "7"); + } + links("https://docs.oracle.com/javase/7/docs/api/"); + links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); + links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); + links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); + links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); + links("https://java-json-tools.github.io/btf/"); + links("https://java-json-tools.github.io/msg-simple/"); + links("https://java-json-tools.github.io/jackson-coreutils/"); + links("https://java-json-tools.github.io/uri-template/"); + links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); + } +} /* * Necessary! Otherwise TestNG will not be used... From c42fad68c2719bec20cae1e1dfb04f4c0436adf6 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Wed, 30 Oct 2019 16:59:48 +0100 Subject: [PATCH 55/71] Update to Gradle 5.6.3. --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8fbe002a2..633ac5255 100644 --- a/build.gradle +++ b/build.gradle @@ -175,8 +175,8 @@ artifacts { } wrapper { - gradleVersion = "5.6.2"; - distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"; + gradleVersion = "5.6.3"; + distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"; } task pom { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c63446067..3a54a3332 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 584287140f363e2c494c29eec769a9c29e050d6d Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Thu, 31 Oct 2019 12:51:57 +0100 Subject: [PATCH 56/71] Update dep on json-schema-core to the snapshot release. --- build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 633ac5255..db869c577 100644 --- a/build.gradle +++ b/build.gradle @@ -34,11 +34,18 @@ version = "2.2.12-SNAPSHOT"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility +ext.forRelease = !version.endsWith("-SNAPSHOT"); + /* * Repositories to use */ repositories { mavenCentral(); + if (!forRelease) { + maven { + url "https://oss.sonatype.org/content/repositories/snapshots" + } + } } /* @@ -54,7 +61,7 @@ dependencies { */ dependencies { compile(group: "com.google.guava", name: "guava", version: "25.1-android"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.10"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12-SNAPSHOT"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); @@ -280,7 +287,6 @@ uploadArchives { } } -ext.forRelease = !version.endsWith("-SNAPSHOT"); signing { required { forRelease && gradle.taskGraph.hasTask("uploadArchives") }; sign configurations.archives; From 5a00fb214725bd98cecbd7730e350dbdae0bc2f8 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Thu, 31 Oct 2019 14:23:50 +0100 Subject: [PATCH 57/71] Bump Guava to 28.1-android. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index db869c577..bf6de69c6 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ dependencies { * List of dependencies */ dependencies { - compile(group: "com.google.guava", name: "guava", version: "25.1-android"); + compile(group: "com.google.guava", name: "guava", version: "28.1-android"); compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12-SNAPSHOT"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); @@ -87,7 +87,7 @@ javadoc { links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); - links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); + links("https://www.javadoc.io/doc/com.google.guava/guava/28.1-android/"); links("https://java-json-tools.github.io/btf/"); links("https://java-json-tools.github.io/msg-simple/"); links("https://java-json-tools.github.io/jackson-coreutils/"); From 8f1c5f41409e5c81e54ebe9b04f7de5e141f4ea4 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Thu, 31 Oct 2019 14:41:36 +0100 Subject: [PATCH 58/71] Replace deprecated JsonNode.put with .set. --- .../common/AdditionalPropertiesDigester.java | 4 ++-- .../draftv3/DraftV3DependenciesDigester.java | 8 ++++---- .../digest/draftv3/DraftV3PropertiesDigester.java | 2 +- .../draftv4/DraftV4DependenciesDigester.java | 6 +++--- .../digest/draftv4/DraftV4TypeDigester.java | 2 +- .../keyword/digest/draftv4/RequiredDigester.java | 2 +- .../digest/helpers/DraftV3TypeKeywordDigester.java | 4 ++-- .../keyword/digest/helpers/NumericDigester.java | 4 ++-- .../keyword/digest/helpers/SimpleDigester.java | 2 +- .../draftv3/DisallowKeywordValidator.java | 2 +- .../validator/draftv3/DraftV3TypeValidator.java | 2 +- .../keyword/validator/draftv4/AllOfValidator.java | 2 +- .../keyword/validator/draftv4/AnyOfValidator.java | 2 +- .../keyword/validator/draftv4/OneOfValidator.java | 2 +- .../validation/ObjectSchemaDigester.java | 4 ++-- .../keyword/special/ExtendsKeywordTest.java | 2 +- .../jsonschema/keyword/special/NotKeywordTest.java | 2 +- .../callback/draftv3/DisallowValidatorTest.java | 14 +++++++------- .../callback/draftv3/DraftV3TypeValidatorTest.java | 10 +++++----- .../callback/draftv3/ExtendsValidatorTest.java | 2 +- .../callback/draftv4/AllOfValidatorTest.java | 10 +++++----- .../callback/draftv4/AnyOfValidatorTest.java | 6 +++--- .../draftv4/DependenciesValidatorTest.java | 10 +++++----- .../callback/draftv4/OneOfValidatorTest.java | 10 +++++----- .../validation/ValidationProcessorTest.java | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/common/AdditionalPropertiesDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/common/AdditionalPropertiesDigester.java index 5f9a949fb..3a485700e 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/common/AdditionalPropertiesDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/common/AdditionalPropertiesDigester.java @@ -64,8 +64,8 @@ public JsonNode digest(final JsonNode schema) * not be the case if and only if it has boolean value false. */ ret.put(keyword, true); - ret.put("properties", properties); - ret.put("patternProperties", patternProperties); + ret.set("properties", properties); + ret.set("patternProperties", patternProperties); if (schema.get(keyword).asBoolean(true)) return ret; diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java index 683dc962d..d081b6f41 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java @@ -61,10 +61,10 @@ public JsonNode digest(final JsonNode schema) final ObjectNode ret = FACTORY.objectNode(); final ObjectNode propertyDeps = FACTORY.objectNode(); - ret.put("propertyDeps", propertyDeps); + ret.set("propertyDeps", propertyDeps); final ArrayNode schemaDeps = FACTORY.arrayNode(); - ret.put("schemaDeps", schemaDeps); + ret.set("schemaDeps", schemaDeps); final List list = Lists.newArrayList(); @@ -86,10 +86,10 @@ public JsonNode digest(final JsonNode schema) case ARRAY: final JsonNode node = sortedSet(value); if (node.size() != 0) - propertyDeps.put(key, node); + propertyDeps.set(key, node); break; case STRING: - propertyDeps.put(key, FACTORY.arrayNode() + propertyDeps.set(key, FACTORY.arrayNode() .add(value.textValue())); break; default: diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3PropertiesDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3PropertiesDigester.java index 2565374de..5d6c0aa59 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3PropertiesDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3PropertiesDigester.java @@ -56,7 +56,7 @@ public JsonNode digest(final JsonNode schema) // TODO: return an array directly (same for "required" in v4) final ObjectNode ret = FACTORY.objectNode(); final ArrayNode required = FACTORY.arrayNode(); - ret.put("required", required); + ret.set("required", required); final JsonNode node = schema.get(keyword); final List list = Lists.newArrayList(node.fieldNames()); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4DependenciesDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4DependenciesDigester.java index d82fe1200..9dc20c527 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4DependenciesDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4DependenciesDigester.java @@ -60,10 +60,10 @@ public JsonNode digest(final JsonNode schema) final ObjectNode ret = FACTORY.objectNode(); final ObjectNode propertyDeps = FACTORY.objectNode(); - ret.put("propertyDeps", propertyDeps); + ret.set("propertyDeps", propertyDeps); final ArrayNode schemaDeps = FACTORY.arrayNode(); - ret.put("schemaDeps", schemaDeps); + ret.set("schemaDeps", schemaDeps); final List list = Lists.newArrayList(); @@ -79,7 +79,7 @@ public JsonNode digest(final JsonNode schema) if (value.isObject()) // schema dep list.add(key); else // property dep - propertyDeps.put(key, sortedSet(value)); + propertyDeps.set(key, sortedSet(value)); } for (final String s: Ordering.natural().sortedCopy(list)) diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4TypeDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4TypeDigester.java index dc67e0206..1bb64e4c0 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4TypeDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4TypeDigester.java @@ -59,7 +59,7 @@ public JsonNode digest(final JsonNode schema) { final ObjectNode ret = FACTORY.objectNode(); final ArrayNode allowedTypes = FACTORY.arrayNode(); - ret.put(keyword, allowedTypes); + ret.set(keyword, allowedTypes); final JsonNode node = schema.get(keyword); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/RequiredDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/RequiredDigester.java index db3a11f37..75527ee8c 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/RequiredDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/RequiredDigester.java @@ -57,7 +57,7 @@ public JsonNode digest(final JsonNode schema) { final ObjectNode ret = FACTORY.objectNode(); final ArrayNode required = FACTORY.arrayNode(); - ret.put(keyword, required); + ret.set(keyword, required); final List list = Lists.newArrayList(schema.get(keyword)); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/DraftV3TypeKeywordDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/DraftV3TypeKeywordDigester.java index 00b0f55ea..127962ef5 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/DraftV3TypeKeywordDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/DraftV3TypeKeywordDigester.java @@ -49,9 +49,9 @@ public JsonNode digest(final JsonNode schema) { final ObjectNode ret = FACTORY.objectNode(); final ArrayNode simpleTypes = FACTORY.arrayNode(); - ret.put(keyword, simpleTypes); + ret.set(keyword, simpleTypes); final ArrayNode schemas = FACTORY.arrayNode(); - ret.put("schemas", schemas); + ret.set("schemas", schemas); final JsonNode node = schema.get(keyword); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/NumericDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/NumericDigester.java index 5e08958fb..69501ca1a 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/NumericDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/NumericDigester.java @@ -67,14 +67,14 @@ protected final ObjectNode digestedNumberNode(final JsonNode schema) ret.put("valueIsLong", isLong); if (isLong) { - ret.put(keyword, node.canConvertToInt() + ret.set(keyword, node.canConvertToInt() ? FACTORY.numberNode(node.intValue()) : FACTORY.numberNode(node.longValue())); return ret; } final BigDecimal decimal = node.decimalValue(); - ret.put(keyword, decimal.scale() == 0 + ret.set(keyword, decimal.scale() == 0 ? FACTORY.numberNode(decimal.toBigIntegerExact()) : node); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/SimpleDigester.java b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/SimpleDigester.java index c83141d11..87849e345 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/SimpleDigester.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/SimpleDigester.java @@ -43,7 +43,7 @@ public SimpleDigester(final String keyword, final NodeType first, public JsonNode digest(final JsonNode schema) { final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schema.get(keyword)); + ret.set(keyword, schema.get(keyword)); return ret; } } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DisallowKeywordValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DisallowKeywordValidator.java index eb128947d..22d472525 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DisallowKeywordValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DisallowKeywordValidator.java @@ -75,7 +75,7 @@ public void validate(final Processor processor, ptr = schemaPointer.append(JsonPointer.of(keyword, index)); newData = data.withSchema(tree.setPointer(ptr)); processor.process(subReport, newData); - fullReport.put(ptr.toString(), subReport.asJson()); + fullReport.set(ptr.toString(), subReport.asJson()); if (subReport.isSuccess()) nrSuccess++; } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DraftV3TypeValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DraftV3TypeValidator.java index 8894f4597..ac269fa30 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DraftV3TypeValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DraftV3TypeValidator.java @@ -79,7 +79,7 @@ public void validate(final Processor processor, ptr = schemaPointer.append(JsonPointer.of(keyword, index)); newData = data.withSchema(tree.setPointer(ptr)); processor.process(subReport, newData); - fullReport.put(ptr.toString(), subReport.asJson()); + fullReport.set(ptr.toString(), subReport.asJson()); if (subReport.isSuccess()) nrSuccess++; } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AllOfValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AllOfValidator.java index f7fb5f94b..77ab62332 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AllOfValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AllOfValidator.java @@ -66,7 +66,7 @@ public void validate(final Processor processor, ptr = schemaPointer.append(JsonPointer.of(keyword, index)); newData = data.withSchema(tree.setPointer(ptr)); processor.process(subReport, newData); - fullReport.put(ptr.toString(), subReport.asJson()); + fullReport.set(ptr.toString(), subReport.asJson()); if (subReport.isSuccess()) nrSuccess++; } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AnyOfValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AnyOfValidator.java index 27756d459..c2760eb16 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AnyOfValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AnyOfValidator.java @@ -66,7 +66,7 @@ public void validate(final Processor processor, ptr = schemaPointer.append(JsonPointer.of(keyword, index)); newData = data.withSchema(tree.setPointer(ptr)); processor.process(subReport, newData); - fullReport.put(ptr.toString(), subReport.asJson()); + fullReport.set(ptr.toString(), subReport.asJson()); if (subReport.isSuccess()) nrSuccess++; } diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/OneOfValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/OneOfValidator.java index d1eb70e8d..f40cd7dec 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/OneOfValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/OneOfValidator.java @@ -66,7 +66,7 @@ public void validate(final Processor processor, ptr = schemaPointer.append(JsonPointer.of(keyword, index)); newData = data.withSchema(tree.setPointer(ptr)); processor.process(subReport, newData); - fullReport.put(ptr.toString(), subReport.asJson()); + fullReport.set(ptr.toString(), subReport.asJson()); if (subReport.isSuccess()) nrSuccess++; } diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigester.java b/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigester.java index 722ea8ac7..67814ca95 100644 --- a/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigester.java +++ b/src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigester.java @@ -59,14 +59,14 @@ public JsonNode digest(final JsonNode schema) ArrayNode node; node = FACTORY.arrayNode(); - ret.put("properties", node); + ret.set("properties", node); set = Sets.newHashSet(schema.path("properties").fieldNames()); for (final String field: Ordering.natural().sortedCopy(set)) node.add(field); node = FACTORY.arrayNode(); - ret.put("patternProperties", node); + ret.set("patternProperties", node); set = Sets.newHashSet(schema.path("patternProperties").fieldNames()); for (final String field: Ordering.natural().sortedCopy(set)) diff --git a/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java b/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java index 32fab2b55..1edcdb1fb 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java @@ -83,7 +83,7 @@ public void initEnvironment() return; final ObjectNode schema = FACTORY.objectNode(); - schema.put("extends", FACTORY.objectNode()); + schema.set("extends", FACTORY.objectNode()); final SchemaTree tree = new CanonicalSchemaTree(SchemaKey.anonymousKey(), schema); diff --git a/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java b/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java index 243f1ddf8..f13d9b6ae 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java @@ -84,7 +84,7 @@ public void initEnvironment() return; final ObjectNode schema = FACTORY.objectNode(); - schema.put("not", FACTORY.objectNode()); + schema.set("not", FACTORY.objectNode()); final SchemaTree tree = new CanonicalSchemaTree(SchemaKey.anonymousKey(), schema); diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DisallowValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DisallowValidatorTest.java index 5f502dad3..dea7f6274 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DisallowValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DisallowValidatorTest.java @@ -54,8 +54,8 @@ protected void checkOkOk(final ProcessingReport report) final ObjectNode reports = FACTORY.objectNode(); final ArrayNode oneReport = FACTORY.arrayNode(); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -78,8 +78,8 @@ protected void checkOkKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), FACTORY.arrayNode()); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), FACTORY.arrayNode()); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -102,7 +102,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } @@ -116,11 +116,11 @@ protected JsonNode generateInstance() protected JsonNode generateDigest() { final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, FACTORY.arrayNode()); + ret.set(keyword, FACTORY.arrayNode()); final ArrayNode schemas = FACTORY.arrayNode(); schemas.add(0); schemas.add(1); - ret.put("schemas", schemas); + ret.set("schemas", schemas); return ret; } } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DraftV3TypeValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DraftV3TypeValidatorTest.java index 9e4fb34c1..4968f4f32 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DraftV3TypeValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DraftV3TypeValidatorTest.java @@ -68,8 +68,8 @@ protected void checkKoKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -84,7 +84,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } @@ -98,11 +98,11 @@ protected JsonNode generateInstance() protected JsonNode generateDigest() { final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, FACTORY.arrayNode()); + ret.set(keyword, FACTORY.arrayNode()); final ArrayNode schemas = FACTORY.arrayNode(); schemas.add(0); schemas.add(1); - ret.put("schemas", schemas); + ret.set("schemas", schemas); return ret; } } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/ExtendsValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/ExtendsValidatorTest.java index f48099215..355c79be1 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/ExtendsValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/ExtendsValidatorTest.java @@ -66,7 +66,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AllOfValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AllOfValidatorTest.java index 24e0b256f..6dae95d84 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AllOfValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AllOfValidatorTest.java @@ -61,8 +61,8 @@ protected void checkOkKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), FACTORY.arrayNode()); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), FACTORY.arrayNode()); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -85,8 +85,8 @@ protected void checkKoKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -102,7 +102,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AnyOfValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AnyOfValidatorTest.java index 48a6f82ba..14c920c3c 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AnyOfValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AnyOfValidatorTest.java @@ -68,8 +68,8 @@ protected void checkKoKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -84,7 +84,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/DependenciesValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/DependenciesValidatorTest.java index ea8b61d93..ac600cab5 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/DependenciesValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/DependenciesValidatorTest.java @@ -63,11 +63,11 @@ protected void checkKoKo(final ProcessingReport report) protected JsonNode generateSchema() { final ObjectNode value = FACTORY.objectNode(); - value.put("a", sub1); - value.put("b", sub2); + value.set("a", sub1); + value.set("b", sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, value); + ret.set(keyword, value); return ret; } @@ -88,8 +88,8 @@ protected JsonNode generateDigest() schemaDeps.add("b"); final ObjectNode ret = FACTORY.objectNode(); - ret.put("propertyDeps", FACTORY.objectNode()); - ret.put("schemaDeps", schemaDeps); + ret.set("propertyDeps", FACTORY.objectNode()); + ret.set("schemaDeps", schemaDeps); return ret; } } diff --git a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/OneOfValidatorTest.java b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/OneOfValidatorTest.java index 296f1cfc0..3532b29fe 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/OneOfValidatorTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/OneOfValidatorTest.java @@ -53,8 +53,8 @@ protected void checkOkOk(final ProcessingReport report) final ObjectNode reports = FACTORY.objectNode(); final ArrayNode oneReport = FACTORY.arrayNode(); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -84,8 +84,8 @@ protected void checkKoKo(final ProcessingReport report) final ArrayNode oneReport = FACTORY.arrayNode(); oneReport.add(MSG.asJson()); - reports.put(ptr1.toString(), oneReport); - reports.put(ptr2.toString(), oneReport); + reports.set(ptr1.toString(), oneReport); + reports.set(ptr2.toString(), oneReport); assertMessage(message) .isValidationError(keyword, @@ -101,7 +101,7 @@ protected JsonNode generateSchema() schemas.add(sub1); schemas.add(sub2); final ObjectNode ret = FACTORY.objectNode(); - ret.put(keyword, schemas); + ret.set(keyword, schemas); return ret; } diff --git a/src/test/java/com/github/fge/jsonschema/processors/validation/ValidationProcessorTest.java b/src/test/java/com/github/fge/jsonschema/processors/validation/ValidationProcessorTest.java index bcf238fe0..8b42fa609 100644 --- a/src/test/java/com/github/fge/jsonschema/processors/validation/ValidationProcessorTest.java +++ b/src/test/java/com/github/fge/jsonschema/processors/validation/ValidationProcessorTest.java @@ -75,7 +75,7 @@ public final class ValidationProcessorTest RAWSCHEMA = factory.objectNode(); RAWSCHEMA.put("minItems", 2) - .put("items", factory.objectNode().put(K1, 0)); + .set("items", factory.objectNode().put(K1, 0)); RAWINSTANCE = factory.arrayNode(); RAWINSTANCE.add(1); From 3c67cf92611de5f912129525cb468ad518fe28b0 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 5 Nov 2019 09:44:04 +0100 Subject: [PATCH 59/71] Bump libphonenumber to v8.10.22. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bf6de69c6..42a8a3e1d 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ dependencies { compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12-SNAPSHOT"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); - compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.0.0"); + compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.10.22"); compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); testCompile(group: "org.testng", name: "testng", version: "6.10") { From 7788ffe6886e2af916b22d610fb11752e909fb06 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 5 Nov 2019 10:42:18 +0100 Subject: [PATCH 60/71] Upgrade Fest Assert to AssertJ. Also re-ordered one `overridingErrorMessage` to be applied before the assert evaluation. Same fixes as for java-json-tools/json-schema-core/issues/66. --- build.gradle | 3 ++- .../matchers/ProcessingMessageAssert.java | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 42a8a3e1d..3ae1a7658 100644 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,8 @@ dependencies { exclude(group: "org.yaml", module: "snakeyaml"); }; testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2"); - testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); + // FIXME: update to 3.x once we're off of Java 7. + testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1"); } javadoc { diff --git a/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java b/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java index 5a53411bb..6248c7a73 100644 --- a/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java +++ b/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java @@ -19,6 +19,7 @@ package com.github.fge.jsonschema.matchers; +import org.assertj.core.api.AbstractAssert; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -27,16 +28,15 @@ import com.github.fge.jsonschema.core.report.ProcessingMessage; import com.github.fge.jsonschema.core.tree.SchemaTree; import com.github.fge.jsonschema.core.util.AsJson; -import org.fest.assertions.GenericAssert; import java.util.Collection; import java.util.Map; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.testng.Assert.*; public final class ProcessingMessageAssert - extends GenericAssert + extends AbstractAssert { private final JsonNode msg; @@ -48,7 +48,7 @@ public static ProcessingMessageAssert assertMessage( private ProcessingMessageAssert(final ProcessingMessage actual) { - super(ProcessingMessageAssert.class, actual); + super(actual, ProcessingMessageAssert.class); msg = actual.asJson(); } @@ -88,9 +88,10 @@ public ProcessingMessageAssert hasField(final String name, assertThat(msg.has(name)).isTrue(); final String input = msg.get(name).textValue(); final String expected = value.toString(); - assertThat(input).isEqualTo(expected) + assertThat(input) .overridingErrorMessage("Strings differ: wanted " + expected - + " but got " + input); + + " but got " + input) + .isEqualTo(expected); return this; } From 4558a007b2b6238e1835a5ae4497aa4672480ac0 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 26 Nov 2019 09:33:09 +0100 Subject: [PATCH 61/71] Replace OSGi plugin with biz.aQute.bnd. See java-json-tools/jackson-coreutils#13. --- build.gradle | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3ae1a7658..900a050c1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,15 @@ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt */ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0' + } +} + plugins { id("net.ltgt.errorprone") version "0.8.1" apply false } @@ -24,7 +33,7 @@ plugins { apply(plugin: "java"); apply(plugin: "maven"); apply(plugin: "signing"); -apply(plugin: "osgi"); +apply(plugin: "biz.aQute.bnd.builder"); apply(plugin: "idea"); apply(plugin: "eclipse"); apply(plugin: "net.ltgt.errorprone"); From 4a438c540ada99f2fab484a2786d220c306f94d8 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 26 Nov 2019 12:40:12 +0100 Subject: [PATCH 62/71] Warnings as errors --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 900a050c1..7ecd2e86e 100644 --- a/build.gradle +++ b/build.gradle @@ -132,7 +132,10 @@ task sourcesJar(type: Jar, dependsOn: classes) { allprojects { gradle.projectsEvaluated { tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:all" + options.compilerArgs << "-Xlint:all" << "-Werror" + } + tasks.withType(Javadoc) { + options.addStringOption('Xwerror', '-quiet') } } } From aa411fca24dd22414600e19a53af7cece9df75b0 Mon Sep 17 00:00:00 2001 From: capstan Date: Mon, 6 Jan 2020 13:45:46 +0100 Subject: [PATCH 63/71] Allow references to staging jars. Also fix the release script to refresh dependencies. --- build.gradle | 10 ++++++++++ dorelease.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7ecd2e86e..ab3f15f21 100644 --- a/build.gradle +++ b/build.gradle @@ -55,6 +55,16 @@ repositories { url "https://oss.sonatype.org/content/repositories/snapshots" } } + /* Allow staging references for last pre-release testing. */ + if (project.properties.containsKey("sonatypeUsername")) { + maven { + url "https://oss.sonatype.org/service/local/staging/deploy/maven2" + credentials { + username = project.properties["sonatypeUsername"] + password = project.properties["sonatypePassword"] + } + } + } } /* diff --git a/dorelease.sh b/dorelease.sh index f5cfc3289..62a9a4c34 100755 --- a/dorelease.sh +++ b/dorelease.sh @@ -17,5 +17,5 @@ # 5. Login as sonatypeUsername # 6. Follow the instructions here: http://central.sonatype.org/pages/releasing-the-deployment.html -./gradlew clean test uploadArchives +./gradlew --refresh-dependencies clean test uploadArchives From e3fb6fb9a575d356426040a6a071c0e8ecce006b Mon Sep 17 00:00:00 2001 From: capstan Date: Mon, 6 Jan 2020 14:36:53 +0100 Subject: [PATCH 64/71] 2.2.12 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ab3f15f21..3212b9c94 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ apply(plugin: "eclipse"); apply(plugin: "net.ltgt.errorprone"); group = "com.github.java-json-tools"; -version = "2.2.12-SNAPSHOT"; +version = "2.2.12"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility @@ -80,7 +80,7 @@ dependencies { */ dependencies { compile(group: "com.google.guava", name: "guava", version: "28.1-android"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12-SNAPSHOT"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12"); compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); compile(group: "joda-time", name: "joda-time", version: "2.9.7"); compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.10.22"); From 65d89524087b51f08f3fe06fec501f210cb3ca9f Mon Sep 17 00:00:00 2001 From: capstan Date: Mon, 6 Jan 2020 15:04:08 +0100 Subject: [PATCH 65/71] Announce 2.2.12 --- README.md | 6 +++--- build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 306d8a298..2a0d02e16 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ run by yourself. ## Versions -* current stable version: **2.2.11** +* current stable version: **2.2.12** ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x), [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). @@ -57,7 +57,7 @@ Gradle: ```groovy dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.11"); + compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.12"); } ``` @@ -67,7 +67,7 @@ Maven: com.github.java-json-tools json-schema-validator - 2.2.11 + 2.2.12 ``` diff --git a/build.gradle b/build.gradle index 3212b9c94..0df3567c1 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ apply(plugin: "eclipse"); apply(plugin: "net.ltgt.errorprone"); group = "com.github.java-json-tools"; -version = "2.2.12"; +version = "2.2.13-SNAPSHOT"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility From e672a856916f8582c74f7acdea35fe6923162203 Mon Sep 17 00:00:00 2001 From: capstan Date: Tue, 7 Jan 2020 11:13:29 +0100 Subject: [PATCH 66/71] Split monolithic build.gradle into project and settings files. --- build.gradle | 52 ++++---------------------------------- project.gradle | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ settings.gradle | 20 +++++++++++++++ 3 files changed, 92 insertions(+), 47 deletions(-) create mode 100644 project.gradle create mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle index 0df3567c1..a938befb8 100644 --- a/build.gradle +++ b/build.gradle @@ -38,10 +38,9 @@ apply(plugin: "idea"); apply(plugin: "eclipse"); apply(plugin: "net.ltgt.errorprone"); +apply(from: "project.gradle"); + group = "com.github.java-json-tools"; -version = "2.2.13-SNAPSHOT"; -sourceCompatibility = JavaVersion.VERSION_1_7; -targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility ext.forRelease = !version.endsWith("-SNAPSHOT"); @@ -75,47 +74,6 @@ dependencies { errorproneJavac("com.google.errorprone:javac:9+181-r4173-1") } -/* - * List of dependencies - */ -dependencies { - compile(group: "com.google.guava", name: "guava", version: "28.1-android"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12"); - compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); - compile(group: "joda-time", name: "joda-time", version: "2.9.7"); - compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.10.22"); - compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); - compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); - testCompile(group: "org.testng", name: "testng", version: "6.10") { - exclude(group: "junit", module: "junit"); - exclude(group: "org.beanshell", module: "bsh"); - exclude(group: "org.yaml", module: "snakeyaml"); - }; - testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2"); - // FIXME: update to 3.x once we're off of Java 7. - testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1"); -} - -javadoc { - options { - def currentJavaVersion = org.gradle.api.JavaVersion.current() - // FIXME: https://github.com/gradle/gradle/issues/11182 - if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) { - addStringOption("-release", "7"); - } - links("https://docs.oracle.com/javase/7/docs/api/"); - links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); - links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); - links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); - links("https://www.javadoc.io/doc/com.google.guava/guava/28.1-android/"); - links("https://java-json-tools.github.io/btf/"); - links("https://java-json-tools.github.io/msg-simple/"); - links("https://java-json-tools.github.io/jackson-coreutils/"); - links("https://java-json-tools.github.io/uri-template/"); - links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); - } -} - /* * Necessary! Otherwise TestNG will not be used... * @@ -221,8 +179,8 @@ task pom { project.ext { description = "A Java implementation of the JSON Schema specification"; - scmUrl = sprintf("git@github.com:box-metadata/%s", name); - projectURL = sprintf("https://github.com/box-metadata/%s", name); + scmUrl = sprintf("git@github.com:java-json-tools/%s.git", name); + projectURL = sprintf("https://github.com/java-json-tools/%s", name); sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"; sonatypeSnapshots = "https://oss.sonatype.org/content/repositories/snapshots/"; }; @@ -283,7 +241,7 @@ uploadArchives { scm { url "${scmUrl}"; - connection "scm:git:${scmUrl}"; + connection "${scmUrl}"; developerConnection "scm:git:${scmUrl}"; } diff --git a/project.gradle b/project.gradle new file mode 100644 index 000000000..ee2647143 --- /dev/null +++ b/project.gradle @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) + * + * This software is dual-licensed under: + * + * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any + * later version; + * - the Apache Software License (ASL) version 2.0. + * + * The text of this file and of both licenses is available at the root of this + * project or, if you have the jar distribution, in directory META-INF/, under + * the names LGPL-3.0.txt and ASL-2.0.txt respectively. + * + * Direct link to the sources: + * + * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt + * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt + */ + +/* + * Project-specific settings. Unfortunately we cannot put the name in there! + */ +group = "com.github.java-json-tools"; +version = "2.2.13-SNAPSHOT"; +sourceCompatibility = JavaVersion.VERSION_1_7; +targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility + +/* + * List of dependencies + */ +dependencies { + compile(group: "com.google.guava", name: "guava", version: "28.1-android"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12"); + compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); + compile(group: "joda-time", name: "joda-time", version: "2.9.7"); + compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.10.22"); + compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); + compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); + testCompile(group: "org.testng", name: "testng", version: "6.10") { + exclude(group: "junit", module: "junit"); + exclude(group: "org.beanshell", module: "bsh"); + exclude(group: "org.yaml", module: "snakeyaml"); + }; + testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2"); + // FIXME: update to 3.x once we're off of Java 7. + testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1"); +} + +javadoc { + options { + def currentJavaVersion = org.gradle.api.JavaVersion.current() + // FIXME: https://github.com/gradle/gradle/issues/11182 + if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) { + addStringOption("-release", "7"); + } + links("https://docs.oracle.com/javase/7/docs/api/"); + links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); + links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); + links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); + links("https://www.javadoc.io/doc/com.google.guava/guava/28.1-android/"); + links("https://java-json-tools.github.io/btf/"); + links("https://java-json-tools.github.io/msg-simple/"); + links("https://java-json-tools.github.io/jackson-coreutils/"); + links("https://java-json-tools.github.io/uri-template/"); + links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..4c0aacfa0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com) + * + * This software is dual-licensed under: + * + * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any + * later version; + * - the Apache Software License (ASL) version 2.0. + * + * The text of this file and of both licenses is available at the root of this + * project or, if you have the jar distribution, in directory META-INF/, under + * the names LGPL-3.0.txt and ASL-2.0.txt respectively. + * + * Direct link to the sources: + * + * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt + * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt + */ + +rootProject.name = "json-schema-validator"; From 0c76d529b78d56736e03b1702410268f0fa2d630 Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 8 Jan 2020 18:07:16 +0100 Subject: [PATCH 67/71] 2.2.13 * Guava to 28.2-android * json-schema-core to 1.2.13 * mailapi to 1.6.2 * joda-time to 2.10.5 * libphonenumber to 8.11.1 * jopt-simple to 5.0.4 * testng to 7.1.0 * mockito-core to 2.28.2 Also moved description into project.gradle --- build.gradle | 1 - project.gradle | 31 ++++++++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index a938befb8..0345fa456 100644 --- a/build.gradle +++ b/build.gradle @@ -178,7 +178,6 @@ task pom { */ project.ext { - description = "A Java implementation of the JSON Schema specification"; scmUrl = sprintf("git@github.com:java-json-tools/%s.git", name); projectURL = sprintf("https://github.com/java-json-tools/%s", name); sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"; diff --git a/project.gradle b/project.gradle index ee2647143..982a0a7b3 100644 --- a/project.gradle +++ b/project.gradle @@ -21,27 +21,32 @@ * Project-specific settings. Unfortunately we cannot put the name in there! */ group = "com.github.java-json-tools"; -version = "2.2.13-SNAPSHOT"; +version = "2.2.13"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility +project.ext { + description = "A Java implementation of the JSON Schema specification"; +} + /* * List of dependencies */ dependencies { - compile(group: "com.google.guava", name: "guava", version: "28.1-android"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.12"); - compile(group: "com.sun.mail", name: "mailapi", version: "1.6.1"); - compile(group: "joda-time", name: "joda-time", version: "2.9.7"); - compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.10.22"); + compile(group: "com.google.guava", name: "guava", version: "28.2-android"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.13"); + // FIXME: 1.6.4 exists, but has different license (EDL 1.0, EPL 2.0). Can update? + compile(group: "com.sun.mail", name: "mailapi", version: "1.6.2"); + compile(group: "joda-time", name: "joda-time", version: "2.10.5"); + compile(group: "com.googlecode.libphonenumber", name: "libphonenumber", version: "8.11.1"); compile(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); - compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.3"); - testCompile(group: "org.testng", name: "testng", version: "6.10") { + compile(group: "net.sf.jopt-simple", name: "jopt-simple", version: "5.0.4"); + testCompile(group: "org.testng", name: "testng", version: "7.1.0") { exclude(group: "junit", module: "junit"); exclude(group: "org.beanshell", module: "bsh"); exclude(group: "org.yaml", module: "snakeyaml"); }; - testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2"); + testCompile(group: "org.mockito", name: "mockito-core", version: "2.28.2"); // FIXME: update to 3.x once we're off of Java 7. testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1"); } @@ -54,10 +59,10 @@ javadoc { addStringOption("-release", "7"); } links("https://docs.oracle.com/javase/7/docs/api/"); - links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); - links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); - links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); - links("https://www.javadoc.io/doc/com.google.guava/guava/28.1-android/"); + links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/"); + links("https://fasterxml.github.io/jackson-databind/javadoc/2.10/"); + links("https://fasterxml.github.io/jackson-core/javadoc/2.10/"); + links("https://www.javadoc.io/doc/com.google.guava/guava/28.2-android/"); links("https://java-json-tools.github.io/btf/"); links("https://java-json-tools.github.io/msg-simple/"); links("https://java-json-tools.github.io/jackson-coreutils/"); From 2b38d8be087e1a7a074f3b22ec178f4a9fb5e865 Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 27 May 2020 15:11:39 +0200 Subject: [PATCH 68/71] Prepare for 2.2.14. * Add missing project dependency on jackson-coreutils, moving it to be jackson-coreutils-equivalence, and converting references to JsonNumEquivalence. * Updated to json-schema-core 1.2.14-SNAPSHOT. * Updated jackson-databind javadoc link versions. --- project.gradle | 9 +++++---- .../keyword/validator/common/EnumValidator.java | 6 +++--- .../keyword/validator/common/UniqueItemsValidator.java | 6 +++--- .../jsonschema/keyword/digest/AbstractDigesterTest.java | 4 ++-- .../processors/validation/ArraySchemaDigesterTest.java | 4 ++-- .../processors/validation/ObjectSchemaDigesterTest.java | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/project.gradle b/project.gradle index 982a0a7b3..6830ebbb1 100644 --- a/project.gradle +++ b/project.gradle @@ -21,7 +21,7 @@ * Project-specific settings. Unfortunately we cannot put the name in there! */ group = "com.github.java-json-tools"; -version = "2.2.13"; +version = "2.2.14-SNAPSHOT"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility @@ -34,7 +34,8 @@ project.ext { */ dependencies { compile(group: "com.google.guava", name: "guava", version: "28.2-android"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.13"); + compile(group: "com.github.java-json-tools", name: "jackson-coreutils-equivalence", version: "1.0-SNAPSHOT"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.14-SNAPSHOT"); // FIXME: 1.6.4 exists, but has different license (EDL 1.0, EPL 2.0). Can update? compile(group: "com.sun.mail", name: "mailapi", version: "1.6.2"); compile(group: "joda-time", name: "joda-time", version: "2.10.5"); @@ -60,8 +61,8 @@ javadoc { } links("https://docs.oracle.com/javase/7/docs/api/"); links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/"); - links("https://fasterxml.github.io/jackson-databind/javadoc/2.10/"); - links("https://fasterxml.github.io/jackson-core/javadoc/2.10/"); + links("https://fasterxml.github.io/jackson-databind/javadoc/2.11/"); + links("https://fasterxml.github.io/jackson-core/javadoc/2.11/"); links("https://www.javadoc.io/doc/com.google.guava/guava/28.2-android/"); links("https://java-json-tools.github.io/btf/"); links("https://java-json-tools.github.io/msg-simple/"); diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/EnumValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/EnumValidator.java index e0caaa50e..1df7aa1ea 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/EnumValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/EnumValidator.java @@ -20,7 +20,7 @@ package com.github.fge.jsonschema.keyword.validator.common; import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jackson.JsonNumEquals; +import com.github.fge.jackson.JsonNumEquivalence; import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.processing.Processor; import com.github.fge.jsonschema.core.report.ProcessingReport; @@ -32,13 +32,13 @@ /** * Keyword validator for {@code enum} * - * @see JsonNumEquals + * @see JsonNumEquivalence */ public final class EnumValidator extends AbstractKeywordValidator { private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + = JsonNumEquivalence.getInstance(); private final JsonNode values; diff --git a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/UniqueItemsValidator.java b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/UniqueItemsValidator.java index a04bab2f4..7cb8b2140 100644 --- a/src/main/java/com/github/fge/jsonschema/keyword/validator/common/UniqueItemsValidator.java +++ b/src/main/java/com/github/fge/jsonschema/keyword/validator/common/UniqueItemsValidator.java @@ -20,7 +20,7 @@ package com.github.fge.jsonschema.keyword.validator.common; import com.fasterxml.jackson.databind.JsonNode; -import com.github.fge.jackson.JsonNumEquals; +import com.github.fge.jackson.JsonNumEquivalence; import com.github.fge.jsonschema.core.exceptions.ProcessingException; import com.github.fge.jsonschema.core.processing.Processor; import com.github.fge.jsonschema.core.report.ProcessingReport; @@ -35,13 +35,13 @@ /** * Keyword validator for {@code uniqueItems} * - * @see JsonNumEquals + * @see JsonNumEquivalence */ public final class UniqueItemsValidator extends AbstractKeywordValidator { private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + = JsonNumEquivalence.getInstance(); private final boolean uniqueItems; diff --git a/src/test/java/com/github/fge/jsonschema/keyword/digest/AbstractDigesterTest.java b/src/test/java/com/github/fge/jsonschema/keyword/digest/AbstractDigesterTest.java index f9b3f47b2..7c601401c 100644 --- a/src/test/java/com/github/fge/jsonschema/keyword/digest/AbstractDigesterTest.java +++ b/src/test/java/com/github/fge/jsonschema/keyword/digest/AbstractDigesterTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JsonLoader; -import com.github.fge.jackson.JsonNumEquals; +import com.github.fge.jackson.JsonNumEquivalence; import com.github.fge.jackson.NodeType; import com.github.fge.jsonschema.core.util.Dictionary; import com.google.common.base.Equivalence; @@ -40,7 +40,7 @@ public abstract class AbstractDigesterTest { private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + = JsonNumEquivalence.getInstance(); private final String keyword; private final Digester digester; diff --git a/src/test/java/com/github/fge/jsonschema/processors/validation/ArraySchemaDigesterTest.java b/src/test/java/com/github/fge/jsonschema/processors/validation/ArraySchemaDigesterTest.java index 5b1094b92..71fa599a6 100644 --- a/src/test/java/com/github/fge/jsonschema/processors/validation/ArraySchemaDigesterTest.java +++ b/src/test/java/com/github/fge/jsonschema/processors/validation/ArraySchemaDigesterTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JsonLoader; -import com.github.fge.jackson.JsonNumEquals; +import com.github.fge.jackson.JsonNumEquivalence; import com.github.fge.jsonschema.keyword.digest.Digester; import com.google.common.base.Equivalence; import com.google.common.collect.Lists; @@ -37,7 +37,7 @@ public final class ArraySchemaDigesterTest { private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + = JsonNumEquivalence.getInstance(); private final Digester digester = ArraySchemaDigester.getInstance(); private final JsonNode testNode; diff --git a/src/test/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigesterTest.java b/src/test/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigesterTest.java index 2f611288c..9fe6622b1 100644 --- a/src/test/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigesterTest.java +++ b/src/test/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigesterTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JsonLoader; -import com.github.fge.jackson.JsonNumEquals; +import com.github.fge.jackson.JsonNumEquivalence; import com.github.fge.jsonschema.keyword.digest.Digester; import com.google.common.base.Equivalence; import com.google.common.collect.Lists; @@ -37,7 +37,7 @@ public final class ObjectSchemaDigesterTest { private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + = JsonNumEquivalence.getInstance(); private final Digester digester = ObjectSchemaDigester.getInstance(); private final JsonNode testNode; From 3a56aa9529aff89df5f78b0bc6faa2770cedf7c9 Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 27 May 2020 18:08:49 +0200 Subject: [PATCH 69/71] 2.2.14 --- README.md | 10 +++++----- project.gradle | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2a0d02e16..b02eaffc7 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ run by yourself. ## Versions -* current stable version: **2.2.12** +* current stable version: **2.2.14** ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x), [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)). @@ -57,7 +57,7 @@ Gradle: ```groovy dependencies { - compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.12"); + compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.14"); } ``` @@ -67,7 +67,7 @@ Maven: com.github.java-json-tools json-schema-validator - 2.2.12 + 2.2.14 ``` @@ -109,5 +109,5 @@ details. [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.html [ASL 2.0 badge]: https://img.shields.io/:license-Apache%202.0-blue.svg [ASL 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html -[Travis Badge]: https://api.travis-ci.org/java-json-tools/json-schema-validator.svg?branch=master -[Travis]: https://travis-ci.org/java-json-tools/json-schema-validator +[Travis Badge]: https://travis-ci.com/java-json-tools/json-schema-validator.svg?branch=master +[Travis]: https://travis-ci.com/java-json-tools/json-schema-validator diff --git a/project.gradle b/project.gradle index 6830ebbb1..3d2665129 100644 --- a/project.gradle +++ b/project.gradle @@ -21,7 +21,7 @@ * Project-specific settings. Unfortunately we cannot put the name in there! */ group = "com.github.java-json-tools"; -version = "2.2.14-SNAPSHOT"; +version = "2.2.14"; sourceCompatibility = JavaVersion.VERSION_1_7; targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility @@ -34,8 +34,8 @@ project.ext { */ dependencies { compile(group: "com.google.guava", name: "guava", version: "28.2-android"); - compile(group: "com.github.java-json-tools", name: "jackson-coreutils-equivalence", version: "1.0-SNAPSHOT"); - compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.14-SNAPSHOT"); + compile(group: "com.github.java-json-tools", name: "jackson-coreutils-equivalence", version: "1.0"); + compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.14"); // FIXME: 1.6.4 exists, but has different license (EDL 1.0, EPL 2.0). Can update? compile(group: "com.sun.mail", name: "mailapi", version: "1.6.2"); compile(group: "joda-time", name: "joda-time", version: "2.10.5"); From 09cf878a50ca184a7a5d7b4ceeea807c0ddb1299 Mon Sep 17 00:00:00 2001 From: "Sean C. Sullivan" Date: Sat, 20 Jun 2020 12:32:57 -0700 Subject: [PATCH 70/71] add Dependabot https://github.blog/2020-06-01-keep-all-your-packages-up-to-date-with-dependabot/ --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..4ace52b34 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" + time: "02:00" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + time: "02:00" From d265c6b15ca47a820de4a9d2f3de3b884c0a4b68 Mon Sep 17 00:00:00 2001 From: Andrew Jorgensen Date: Mon, 28 Sep 2020 17:42:43 -0700 Subject: [PATCH 71/71] Clarify "dual-licensed" (#351) I pulled the additional text directly from #136 where @fge answered the question, "Do I need to abide by both licenses? Or can I pick which one to abide by?" Adding it here in the LICENSE file to help avoid a need for anyone else to dive into closed issues to find the answer. --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 16cda1283..37e25e033 100644 --- a/LICENSE +++ b/LICENSE @@ -6,6 +6,7 @@ This software is dual-licensed under: The text of both licenses is included (under the names LGPL-3.0.txt and ASL-2.0.txt respectively). +Should you choose to redistribute, you can pick either, or continue to dual license. Direct link to the sources:

    link to source code