[jayway-jsonpath] 02/07: Merge tag 'upstream/2.0.0'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 3 09:41:44 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jayway-jsonpath.

commit 666118fc10c34ff9a0525753758c2b92f2e83048
Merge: e9d5900 0bb66d8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jul 30 21:55:18 2016 +0200

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 .gitignore                                         |     4 +
 .travis.yml                                        |     1 +
 Procfile                                           |     1 +
 README                                             |    97 -
 README.md                                          |   376 +
 build.gradle                                       |    78 +
 changelog.md                                       |    63 +
 gradle/binaryCompatibility.gradle                  |   138 +
 gradle/binarycompat-report.groovy                  |   153 +
 gradle/publishMaven.gradle                         |    94 +
 json-path-assert/build.gradle                      |    21 +
 json-path-assert/pom.xml                           |    45 -
 .../java/com/jayway/jsonassert/JsonAssert.java     |    25 +-
 .../java/com/jayway/jsonassert/JsonAsserter.java   |     5 -
 .../jayway/jsonassert/impl/JsonAsserterImpl.java   |    33 +-
 .../java/com/jayway/jsonassert/JsonAssertTest.java |    61 +-
 json-path-web-test/build.gradle                    |    43 +
 .../java/com/jayway/jsonpath/web/bench/Bench.java  |   156 +
 .../java/com/jayway/jsonpath/web/bench/Result.java |    18 +
 .../java/com/jayway/jsonpath/web/boot/Main.java    |    75 +
 .../jayway/jsonpath/web/resource/ApiResource.java  |    86 +
 .../src/main/resources/simplelogger.properties     |     2 +
 .../src/main/resources/webapp/index.html           |   361 +
 .../main/resources/webapp}/js/jsonpath-0.8.0.js    |     0
 .../src/main/resources/webapp/json/20k.json        |   926 +
 .../main/resources/webapp/json/citm_catalog.json   | 50469 +++++++++++++++++++
 .../src/main/resources/webapp/json/goessner.json   |     1 +
 .../src/main/resources/webapp/json/twitter.json    |   298 +
 .../src/main/resources/webapp/json/webxml.json     |   100 +
 json-path/build.gradle                             |    82 +
 json-path/pom.xml                                  |    50 -
 .../java/com/jayway/jsonpath/Configuration.java    |   231 +-
 .../main/java/com/jayway/jsonpath/Criteria.java    |   965 +-
 ...nitePathException.java => DocumentContext.java} |    11 +-
 .../com/jayway/jsonpath/EvaluationListener.java    |    63 +
 .../src/main/java/com/jayway/jsonpath/Filter.java  |   240 +-
 .../jayway/jsonpath/InvalidCriteriaException.java  |     6 +-
 .../com/jayway/jsonpath/InvalidJsonException.java  |     5 +-
 .../com/jayway/jsonpath/InvalidModelException.java |    38 -
 ...tion.java => InvalidModificationException.java} |    11 +-
 .../com/jayway/jsonpath/InvalidPathException.java  |     5 +-
 .../main/java/com/jayway/jsonpath/JsonModel.java   |  1066 -
 .../main/java/com/jayway/jsonpath/JsonPath.java    |   364 +-
 ...iteriaException.java => JsonPathException.java} |    14 +-
 .../src/main/java/com/jayway/jsonpath/Option.java  |    75 +-
 .../java/com/jayway/jsonpath/ParseContext.java     |    19 +-
 .../com/jayway/jsonpath/PathNotFoundException.java |     5 -
 .../main/java/com/jayway/jsonpath/Predicate.java   |    53 +
 .../main/java/com/jayway/jsonpath/ReadContext.java |    93 +-
 .../src/main/java/com/jayway/jsonpath/TypeRef.java |    54 +
 ...Transformer.java => ValueCompareException.java} |    18 +-
 .../java/com/jayway/jsonpath/WriteContext.java     |   129 +
 .../java/com/jayway/jsonpath/internal/Cache.java   |   113 +
 .../com/jayway/jsonpath/internal/CompiledPath.java |    73 +
 .../com/jayway/jsonpath/internal/DefaultsImpl.java |    37 +
 .../internal/EvaluationAbortException.java         |     4 +
 .../jsonpath/internal/EvaluationContext.java       |    73 +
 .../jayway/jsonpath/internal/JsonFormatter.java    |    65 +-
 .../com/jayway/jsonpath/internal/JsonReader.java   |   211 +-
 .../java/com/jayway/jsonpath/internal/Path.java    |    58 +
 .../com/jayway/jsonpath/internal/PathCompiler.java |   505 +
 .../java/com/jayway/jsonpath/internal/PathRef.java |   239 +
 .../com/jayway/jsonpath/internal/PathToken.java    |    79 -
 .../jayway/jsonpath/internal/PathTokenizer.java    |   285 -
 .../java/com/jayway/jsonpath/internal/Utils.java   |   290 +-
 .../jsonpath/internal/filter/ArrayEvalFilter.java  |   201 -
 .../jsonpath/internal/filter/ArrayIndexFilter.java |   155 -
 .../jsonpath/internal/filter/ArrayQueryFilter.java |    51 -
 .../jsonpath/internal/filter/FieldFilter.java      |   136 -
 .../jsonpath/internal/filter/FilterFactory.java    |    85 -
 .../jsonpath/internal/filter/HasPathFilter.java    |    72 -
 .../internal/filter/PassthroughFilter.java         |    46 -
 .../jsonpath/internal/filter/PathTokenFilter.java  |    70 -
 .../jsonpath/internal/filter/ScanFilter.java       |    62 -
 .../jsonpath/internal/filter/WildcardFilter.java   |    57 -
 .../internal/filter/eval/ExpressionEvaluator.java  |   243 -
 .../jsonpath/internal/token/ArrayPathToken.java    |   185 +
 .../internal/token/EvaluationContextImpl.java      |   195 +
 .../jayway/jsonpath/internal/token/PathToken.java  |   211 +
 .../internal/token/PredicateContextImpl.java       |    82 +
 .../internal/token/PredicatePathToken.java         |    99 +
 .../jsonpath/internal/token/PropertyPathToken.java |    59 +
 .../jsonpath/internal/token/RootPathToken.java     |    66 +
 .../jsonpath/internal/token/ScanPathToken.java     |   176 +
 .../jsonpath/internal/token/WildcardPathToken.java |    57 +
 .../java/com/jayway/jsonpath/spi/HttpProvider.java |    17 -
 .../jayway/jsonpath/spi/HttpProviderFactory.java   |    36 -
 .../java/com/jayway/jsonpath/spi/JsonProvider.java |   113 -
 .../jayway/jsonpath/spi/JsonProviderFactory.java   |    35 -
 .../com/jayway/jsonpath/spi/MappingProvider.java   |    29 -
 .../jsonpath/spi/MappingProviderFactory.java       |    54 -
 .../main/java/com/jayway/jsonpath/spi/Mode.java    |    46 -
 .../jsonpath/spi/impl/AbstractJsonProvider.java    |   144 -
 .../jayway/jsonpath/spi/impl/JacksonProvider.java  |   110 -
 .../jsonpath/spi/json/AbstractJsonProvider.java    |   184 +
 .../jayway/jsonpath/spi/json/GsonJsonProvider.java |   254 +
 .../spi/json/JacksonJsonNodeJsonProvider.java      |   250 +
 .../jsonpath/spi/json/JacksonJsonProvider.java     |   114 +
 .../com/jayway/jsonpath/spi/json/JsonProvider.java |   168 +
 .../spi/{impl => json}/JsonSmartJsonProvider.java  |    70 +-
 .../jsonpath/spi/mapper/GsonMappingProvider.java   |    80 +
 .../spi/mapper/JacksonMappingProvider.java         |    62 +
 .../spi/mapper/JsonSmartMappingProvider.java       |   238 +
 .../mapper/MappingException.java}                  |    18 +-
 .../jsonpath/spi/mapper/MappingProvider.java       |    45 +
 .../test/java/com/jayway/jsonpath/BaseTest.java    |    96 +
 .../test/java/com/jayway/jsonpath/CastTest.java    |    21 -
 .../jayway/jsonpath/DocumentationPageTests.java    |    88 -
 .../test/java/com/jayway/jsonpath/EscapeTest.java  |    44 +
 .../jayway/jsonpath/EvaluationListenerTest.java    |   111 +
 .../com/jayway/jsonpath/ExpressionEvalTest.java    |   234 -
 .../test/java/com/jayway/jsonpath/FilterTest.java  |   663 +-
 .../com/jayway/jsonpath/GsonJsonProviderTest.java  |   146 +
 .../test/java/com/jayway/jsonpath/HelpTest.java    |   122 -
 .../java/com/jayway/jsonpath/HttpProviderTest.java |    49 -
 .../java/com/jayway/jsonpath/InlineFilterTest.java |   160 +
 .../test/java/com/jayway/jsonpath/IssuesTest.java  |   246 -
 .../jsonpath/JacksonJsonNodeJsonProviderTest.java  |   106 +
 .../test/java/com/jayway/jsonpath/JacksonTest.java |    48 +
 .../jayway/jsonpath/JsonModelChainedCallsTest.java |   101 -
 .../com/jayway/jsonpath/JsonModelMappingTest.java  |   143 -
 .../java/com/jayway/jsonpath/JsonModelOpsTest.java |   286 -
 .../com/jayway/jsonpath/JsonModelSubModelTest.java |   116 -
 .../java/com/jayway/jsonpath/JsonModelTest.java    |   135 -
 .../com/jayway/jsonpath/JsonPathFilterTest.java    |   132 -
 .../java/com/jayway/jsonpath/JsonProviderTest.java |   136 +-
 .../test/java/com/jayway/jsonpath/MapperTest.java  |    45 +
 .../java/com/jayway/jsonpath/MultiPropTest.java    |    60 +
 .../test/java/com/jayway/jsonpath/OptionsTest.java |   103 +
 .../test/java/com/jayway/jsonpath/PathTest.java    |   156 -
 .../java/com/jayway/jsonpath/PredicateTest.java    |    26 +
 .../java/com/jayway/jsonpath/ReadContextTest.java  |    26 +
 .../java/com/jayway/jsonpath/ReturnTypeTest.java   |    85 +
 .../test/java/com/jayway/jsonpath/WriteTest.java   |   219 +
 .../internal/filter/ArrayEvalFilterTest.java       |    57 -
 .../jsonpath/{ => old}/ArraySlicingTest.java       |    17 +-
 .../jayway/jsonpath/{ => old}/ComplianceTest.java  |   149 +-
 .../java/com/jayway/jsonpath/old/FilterTest.java   |   491 +
 .../java/com/jayway/jsonpath/old/IssuesTest.java   |   563 +
 .../jayway/jsonpath/{ => old}/JsonPathTest.java    |   134 +-
 .../JsonProviderTest.java}                         |    38 +-
 .../jsonpath/{ => old}/NullHandlingTest.java       |    38 +-
 .../internal}/ArrayIndexFilterTest.java            |     7 +-
 .../jsonpath/old/internal/ArrayPathTokenTest.java  |    88 +
 .../old/internal/PredicatePathTokenTest.java       |   140 +
 .../old/internal/PropertyPathTokenTest.java        |    98 +
 .../jsonpath/old/internal/ScanPathTokenTest.java   |   215 +
 .../internal/TestBase.java}                        |    63 +-
 .../jsonpath/old/internal/TestInternal3.java       |    56 +
 .../jsonpath/reader/ReadConfigurationTest.java     |    42 -
 .../jayway/jsonpath/util/ScriptEngineJsonPath.java |    61 -
 json-path/src/test/resources/js/json.js            |   530 -
 json-path/src/test/resources/js/path.html          |    59 -
 json-path/src/test/resources/js/wrapper.js         |    12 -
 .../src/test/resources/simplelogger.properties     |     3 +
 pom.xml                                            |   298 -
 settings.gradle                                    |     2 +
 system.properties                                  |     1 +
 158 files changed, 62766 insertions(+), 8033 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jayway-jsonpath.git



More information about the pkg-java-commits mailing list