Merge branch 'JSONP-1.1'
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/02993157 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/02993157 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/02993157 Branch: refs/heads/master Commit: 02993157ee39c0c2c20ebd34215fccf869ab9c1c Parents: d344cbc a2a1a04 Author: Mark Struberg <[email protected]> Authored: Fri Feb 24 13:01:13 2017 +0100 Committer: Mark Struberg <[email protected]> Committed: Fri Feb 24 13:01:13 2017 +0100 ---------------------------------------------------------------------- johnzon-core/pom.xml | 2 +- .../johnzon/core/JsonArrayBuilderImpl.java | 44 +- .../johnzon/core/JsonBuilderFactoryImpl.java | 23 + .../apache/johnzon/core/JsonGeneratorImpl.java | 36 +- .../johnzon/core/JsonMergePatchBuilder.java | 74 ++ .../johnzon/core/JsonObjectBuilderImpl.java | 78 +- .../johnzon/core/JsonPatchBuilderImpl.java | 185 ++++ .../org/apache/johnzon/core/JsonPatchImpl.java | 213 +++++ .../apache/johnzon/core/JsonPatchOperation.java | 143 +++ .../apache/johnzon/core/JsonPointerImpl.java | 484 ++++++++++ .../apache/johnzon/core/JsonPointerUtil.java | 49 + .../apache/johnzon/core/JsonProviderImpl.java | 137 ++- .../org/apache/johnzon/core/SimpleStack.java | 4 +- .../johnzon/core/JsonArrayBuilderImplTest.java | 35 + .../johnzon/core/JsonMergeBatchBuilderTest.java | 36 + .../johnzon/core/JsonObjectBuilderImplTest.java | 88 +- .../johnzon/core/JsonPatchBuilderTest.java | 440 +++++++++ .../org/apache/johnzon/core/JsonPatchTest.java | 953 +++++++++++++++++++ .../apache/johnzon/core/JsonPointerTest.java | 667 +++++++++++++ .../johnzon/core/JsonPointerUtilTest.java | 98 ++ .../apache/johnzon/core/JsonReaderImplTest.java | 4 +- .../test/resources/json/jsonPointerTest.json | 15 + johnzon-distribution/pom.xml | 15 +- johnzon-jaxrs/pom.xml | 2 +- johnzon-jsonb/pom.xml | 4 +- johnzon-mapper/pom.xml | 2 +- .../johnzon/mapper/MappingParserImpl.java | 2 +- .../org/apache/johnzon/mapper/MapperTest.java | 5 +- johnzon-maven-plugin/pom.xml | 6 +- johnzon-websocket/pom.xml | 44 +- .../src/test/resources/arquillian.xml | 6 + jsonb-api/pom.xml | 4 +- pom.xml | 25 +- 33 files changed, 3852 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
