Merge pull request #79 from burtcorp/modernize

Refresh and modernize

Author: iconara

.travis.yml

@@ -1,4 +1,4 @@
-Copyright (c) 2016, Burt AB
+Copyright (c) 2016, Burt Intelligence AB and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

LICENSE.txt

@@ -1,34 +1,30 @@
 # jmespath-java
 
-[![Build Status](https://travis-ci.org/burtcorp/jmespath-java.png?branch=master)](https://travis-ci.org/burtcorp/jmespath-java)
+_If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can find the readme for a specific version via the release tags ([here is an example](https://github.com/burtcorp/jmespath-java/releases/tag/jmespath-0.5.0))._
 
-_If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can find the readme for a specific version via the release tags ([here is an example](https://github.com/burtcorp/jmespath-java/releases/tag/jmespath-0.1.0))._
-
-This is an implementation of [JMESPath](http://jmespath.org/) for Java and it supports searching JSON documents (via [Jackson](https://github.com/FasterXML/jackson) or [Gson](https://github.com/google/gson)) and structures containing basic Java objects (`Map`, `List`, `String`, etc.) – but can also be extended to work with any JSON-like structure.
+This is an implementation of [JMESPath](http://jmespath.org/) for Java. It supports multiple JSON libraries, for example [Jackson](https://github.com/FasterXML/jackson), [Jackson jr](https://github.com/FasterXML/jackson-jr), [Gson](https://github.com/google/gson), and structures containing basic Java objects (`Map`, `List`, `String`, etc.). It can be extended to support any JSON-like structure through a simple adapter.
 
 ## Installation
 
-Using Maven you can add this to your dependencies:
+You can install the library using Maven:
 
 ```xml
 <dependency>
   <groupId>io.burt</groupId>
-  <artifactId>jmespath</artifactId>
+  <artifactId>${jmespath.adapter}</artifactId>
   <version>${jmespath.version}</version>
 </dependency>
 ```
 
-Check the [releases page](https://github.com/burtcorp/jmespath-java/releases) for the value of `${jmespath.version}`.
+Replace `${jmespath.adapter}` with the adapter you need for your project, for example `jmespath-jackson` or `jmespath-gson`. You can also use `jmespath-core` if you are going to implement your own adapter in your project.
 
-If you don't want both the Jackson and Gson implementations you can change it to `jmespath-jackson` or `jmespath-gson`. Some time before 1.0 the dependencies will probably be reversed so that `jmespath` will not depend on the specific runtimes, so you unless you have the need for multiple runtimes you should depend on the specific runtime you need.
+Replace `${jmespath.version}` with the latest version from the [releases page](https://github.com/burtcorp/jmespath-java/releases).
 
 ### Dependencies
 
 `jmespath-core` has an ANTLR based parser, but the ANTLR runtime artifact has been shaded into the `io.burt.jmespath` package to avoid conflicts with other artifacts that may depend on ANTLR. This means that `jmespath-core` has no external dependencies.
 
-`jmespath-jackson` obviously depends on Jackson, specifically Jackson DataBind (`com.fasterxml.jackson.core:jackson-databind`), but other than that it only depends on `jmespath-core`.
-
-`jmespath-gson` depends on Gson, specifically `com.google.code.gson:gson`, but other than that only `jmespath-core`.
+The adapters each depend on their supporting libraries, for example Jackson Databind for `jmespath-jackson`.
 
 ## Basic usage
 
@@ -59,7 +55,7 @@ JsonNode result = expression.search(input);
 
 ## Description
 
-`jmespath-java` comes in three parts: `jmespath-core`, `jmespath-jackson`, and `jmespath-gson`. The former contains the expression parser, core runtime, default functions and a simple runtime adapter that can search structures made up from numbers, strings, booleans, `List` and `Map` available as `io.burt.jmespath.jcf.JcfRuntime` (for "Java Collections Framework"). The latter contains the Jackson and Gson runtime adapters, respectively, and is what you should be using most of the time. The JCF runtime is just for internal development and testing. It primarily exists to test that there's nothing runtime-specific in the implementation.
+`jmespath-java` comes in multiple parts: `jmespath-core`, and the adapters for different JSON libraries, like `jmespath-jackson`, and `jmespath-gson`. `jmespath-core` contains the expression parser, core runtime, default functions and a simple runtime adapter that can search structures made up from numbers, strings, booleans, `List` and `Map` available as `io.burt.jmespath.jcf.JcfRuntime` (for "Java Collections Framework"). The latter contains runtime adapters for each specific JSON library, and is what you should be using most of the time. The JCF runtime is just for internal development and testing. It primarily exists to test that there's nothing runtime-specific in the implementation.
 
 ## Configuration
 
@@ -177,4 +173,4 @@ And all dependencies should be installed, the code compiled and the tests run.
 
 # Copyright
 
-© 2016-2018 Burt AB, see LICENSE.txt (BSD 3-Clause).
+© 2016 Burt Intelligence AB and contributors, see LICENSE.txt (BSD 3-Clause).

README.md

@@ -13,6 +13,10 @@
     <version>0.5.2-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <antlr.version>4.9.3</antlr.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.antlr</groupId>

jmespath-core/pom.xml

@@ -29,10 +29,8 @@ private Description createDescription(JmesPathComplianceTest.ComplianceTest<T> c
   private Collection<JmesPathComplianceTest.ComplianceTest<T>> getAllTests() {
     try {
       return testClass.newInstance().getAllTests();
-    } catch (InstantiationException ie) {
-      throw new RuntimeException("Could not instantiate runtime", ie);
-    } catch (IllegalAccessException iae) {
-      throw new RuntimeException("Could not instantiate runtime", iae);
+    } catch (InstantiationException | IllegalAccessException e) {
+      throw new RuntimeException("Could not instantiate runtime", e);
     }
   }
 
@@ -42,9 +40,7 @@ public void run(RunNotifier notifier) {
       notifier.fireTestStarted(testDescription);
       try {
         complianceTest.run();
-      } catch (AssertionError ae) {
-        notifier.fireTestFailure(new Failure(testDescription, ae));
-      } catch (Exception e) {
+      } catch (AssertionError | Exception e) {
         notifier.fireTestFailure(new Failure(testDescription, e));
       } finally {
         notifier.fireTestFinished(testDescription);

jmespath-core/src/test/java/io/burt/jmespath/ComplianceRunner.java

@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.hamcrest.Matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.hamcrest.Matchers.containsString;
@@ -72,9 +72,10 @@ public void run() {
         Expression<U> compiledExpression = runtime.compile(expression);
         U result = compiledExpression.search(input);
         if (expectedError == null) {
-          assertTrue(
+          assertThat(
             String.format("Expected <%s> to be <%s>, expression <%s> compiled expression <%s>", result, expectedResult, expression, compiledExpression),
-            runtime.compare(expectedResult, result) == 0
+            runtime.compare(expectedResult, result),
+            is(0)
           );
         } else {
           fail(String.format("Expected \"%s\" error", expectedError));
@@ -136,10 +137,8 @@ public Iterable<String> getFeatureNames() {
         }
       }
       return featureNames;
-    } catch (IOException ioe) {
-      throw new RuntimeException("Could not load compliance feature names", ioe);
-    } catch (URISyntaxException use) {
-      throw new RuntimeException("Could not load compliance feature names", use);
+    } catch (IOException | URISyntaxException e) {
+      throw new RuntimeException("Could not load compliance feature names", e);
     }
   }
 

jmespath-core/src/test/java/io/burt/jmespath/JmesPathComplianceTest.java

@@ -31,7 +31,7 @@
 import static org.hamcrest.Matchers.containsString;
 
 public abstract class JmesPathRuntimeTest<T> {
-  private Adapter<T> runtime = createRuntime(RuntimeConfiguration.defaultConfiguration());
+  private final Adapter<T> runtime = createRuntime(RuntimeConfiguration.defaultConfiguration());
 
   protected T contact;
   protected T cloudtrail;

jmespath-core/src/test/java/io/burt/jmespath/JmesPathRuntimeTest.java

@@ -4,7 +4,7 @@
 import io.burt.jmespath.Adapter;
 
 public class JcfComplianceTest extends JmesPathComplianceTest<Object> {
-  private Adapter<Object> runtime = new JcfRuntime();
+  private final Adapter<Object> runtime = new JcfRuntime();
 
   @Override
   protected Adapter<Object> runtime() { return runtime; }

jmespath-core/src/test/java/io/burt/jmespath/jcf/JcfComplianceTest.java

@@ -20,6 +20,6 @@ public class JcfTest extends JmesPathRuntimeTest<Object> {
   @Test
   public void toListReturnsAListWhenGivenAnotherTypeOfCollection() {
     List<Object> list = runtime().toList(Collections.singleton(parse("1")));
-    assertThat(list, is(Arrays.asList(parse("1"))));
+    assertThat(list, is(Collections.singletonList(parse("1"))));
   }
 }

jmespath-core/src/test/java/io/burt/jmespath/jcf/JcfTest.java

@@ -13,6 +13,10 @@
     <version>0.5.2-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <gson.version>2.10.1</gson.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

jmespath-gson/pom.xml

@@ -91,13 +91,13 @@ public boolean isTruthy(JsonElement value) {
       case BOOLEAN:
         return value.getAsBoolean();
       case STRING:
-        return value.getAsString().length() > 0;
+        return !value.getAsString().isEmpty();
       case NUMBER:
         return true;
       case ARRAY:
-        return value.getAsJsonArray().size() > 0;
+        return !value.getAsJsonArray().isEmpty();
       case OBJECT:
-        return value.getAsJsonObject().size() > 0;
+        return !value.getAsJsonObject().isEmpty();
     }
     throw new IllegalStateException(String.format("Unknown node type encountered: %s", value.getClass()));
   }

jmespath-gson/src/main/java/io/burt/jmespath/gson/GsonRuntime.java

@@ -5,7 +5,7 @@
 import io.burt.jmespath.JmesPathComplianceTest;
 
 public class GsonComplianceTest extends JmesPathComplianceTest<JsonElement> {
-    private Adapter<JsonElement> runtime = new GsonRuntime();
+    private final Adapter<JsonElement> runtime = new GsonRuntime();
 
     @Override
     protected Adapter<JsonElement> runtime() {

jmespath-gson/src/test/java/io/burt/jmespath/gson/GsonComplianceTest.java

@@ -14,6 +14,10 @@
         <version>0.5.2-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <jackson-jr.version>2.14.2</jackson-jr.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -30,12 +34,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jr</groupId>
             <artifactId>jackson-jr-objects</artifactId>
-            <version>2.14.2</version>
+            <version>${jackson-jr.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jr</groupId>
             <artifactId>jackson-jr-stree</artifactId>
-            <version>2.14.2</version>
+            <version>${jackson-jr.version}</version>
         </dependency>
     </dependencies>
 

jmespath-jackson-jr/pom.xml

@@ -13,6 +13,10 @@
     <version>0.5.2-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <jackson.version>2.15.3</jackson.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

jmespath-jackson/pom.xml

@@ -97,9 +97,9 @@ public boolean isTruthy(JsonNode value) {
       case ARRAY:
       case BINARY:
       case OBJECT:
-        return value.size() > 0;
+        return !value.isEmpty();
       case STRING:
-        return value.textValue().length() > 0;
+        return !value.textValue().isEmpty();
       case BOOLEAN:
         return value.booleanValue();
       case MISSING:

jmespath-jackson/src/main/java/io/burt/jmespath/jackson/JacksonRuntime.java

@@ -6,7 +6,7 @@
 import io.burt.jmespath.Adapter;
 
 public class JacksonComplianceTest extends JmesPathComplianceTest<JsonNode> {
-  private Adapter<JsonNode> runtime = new JacksonRuntime();
+  private final Adapter<JsonNode> runtime = new JacksonRuntime();
 
   @Override
   protected Adapter<JsonNode> runtime() { return runtime; }

jmespath-jackson/src/test/java/io/burt/jmespath/jackson/JacksonComplianceTest.java

@@ -13,6 +13,10 @@
     <version>0.5.2-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <jakarta.jsonp.version>1.1.6</jakarta.jsonp.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

jmespath-jakarta-jsonp/pom.xml

@@ -110,11 +110,11 @@ public boolean isTruthy(JsonValue value) {
       case TRUE:
         return true;
       case ARRAY:
-        return ((JsonArray) value).size() > 0;
+        return !((JsonArray) value).isEmpty();
       case OBJECT:
-        return ((JsonObject) value).size() > 0;
+        return !((JsonObject) value).isEmpty();
       case STRING:
-        return ((JsonString) value).getString().length() > 0;
+        return !((JsonString) value).getString().isEmpty();
       default:
         throw new IllegalStateException(String.format("Unknown node type encountered: %s", value.getValueType()));
     }

jmespath-jakarta-jsonp/src/main/java/io/burt/jmespath/jakarta/jsonp/JsonpRuntime.java

@@ -6,7 +6,7 @@
 import javax.json.JsonValue;
 
 public class JsonpComplianceTest extends JmesPathComplianceTest<JsonValue> {
-  private Adapter<JsonValue> runtime = new JsonpRuntime();
+  private final Adapter<JsonValue> runtime = new JsonpRuntime();
 
   @Override
   protected Adapter<JsonValue> runtime() { return runtime; }

jmespath-jakarta-jsonp/src/test/java/io/burt/jmespath/jakarta/jsonp/JsonpComplianceTest.java

@@ -12,6 +12,11 @@
         <version>0.5.2-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <kotlin.version>1.6.0</kotlin.version>
+        <kotlinx.version>1.4.1</kotlinx.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -33,9 +38,10 @@
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-serialization-json</artifactId>
-            <version>1.4.1</version>
+            <version>${kotlinx.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -66,7 +72,4 @@
             </plugin>
         </plugins>
     </build>
-    <properties>
-        <kotlin.version>1.6.0</kotlin.version>
-    </properties>
 </project>

jmespath-kotlinx/pom.xml

@@ -13,6 +13,10 @@
     <version>0.5.2-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <vertx.version>4.4.6</vertx.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

jmespath-vertx/pom.xml

@@ -4,7 +4,7 @@
 import io.burt.jmespath.Adapter;
 
 public class VertxComplianceTest extends JmesPathComplianceTest<Object> {
-  private Adapter<Object> runtime = new VertxRuntime();
+  private final Adapter<Object> runtime = new VertxRuntime();
 
   @Override
   protected Adapter<Object> runtime() { return runtime; }

jmespath-vertx/src/test/java/io/burt/jmespath/vertx/VertxComplianceTest.java

@@ -13,13 +13,8 @@
   <url>https://github.com/burtcorp/jmespath-java</url>
 
   <properties>
-    <junit.version>4.13.1</junit.version>
+    <junit.version>4.13.2</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <jackson.version>2.9.9</jackson.version>
-    <jakarta.jsonp.version>1.1.6</jakarta.jsonp.version>
-    <gson.version>2.8.5</gson.version>
-    <antlr.version>4.7.2</antlr.version>
-    <vertx.version>3.7.1</vertx.version>
     <encoding>UTF-8</encoding>
   </properties>
 
@@ -109,8 +104,8 @@
             <arg>-Xlint:deprecation</arg>
             <arg>-Xlint:unchecked</arg>
           </compilerArgs>
-          <source>7</source>
-          <target>7</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
       <plugin>