Upgrade to Jackson 2.9.2 (#27032)

Upgrade to Jackson 2.9.2 and also use a boolean `closed` flag to indicate that a FastStringReader instance is closed, so that length is still correctly reported after the reader is closed.
elastic · Oct 19, 2017 · 2a73127 · 2a73127
1 parent 7d6453c
commit 2a73127
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 19 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -5,8 +5,8 @@ lucene            = 7.1.0-snapshot-f33ed4ba12a
 # optional dependencies
 spatial4j         = 0.6
 jts               = 1.13
-jackson           = 2.8.6
-snakeyaml         = 1.15
+jackson           = 2.9.2
+snakeyaml         = 1.18
 # when updating log4j, please update also docs/java-api/index.asciidoc
 log4j             = 2.9.1
 slf4j             = 1.6.2

diff --git a/client/sniffer/licenses/jackson-core-2.8.6.jar.sha1 b/client/sniffer/licenses/jackson-core-2.8.6.jar.sha1
diff --git a/client/sniffer/licenses/jackson-core-2.9.2.jar.sha1 b/client/sniffer/licenses/jackson-core-2.9.2.jar.sha1
@@ -0,0 +1 @@
+aed20e50152a2f19adc1995c8d8f307c7efa414d
diff --git a/core/licenses/jackson-core-2.8.6.jar.sha1 b/core/licenses/jackson-core-2.8.6.jar.sha1
diff --git a/core/licenses/jackson-core-2.9.2.jar.sha1 b/core/licenses/jackson-core-2.9.2.jar.sha1
@@ -0,0 +1 @@
+aed20e50152a2f19adc1995c8d8f307c7efa414d
diff --git a/core/licenses/jackson-dataformat-cbor-2.8.6.jar.sha1 b/core/licenses/jackson-dataformat-cbor-2.8.6.jar.sha1
diff --git a/core/licenses/jackson-dataformat-cbor-2.9.2.jar.sha1 b/core/licenses/jackson-dataformat-cbor-2.9.2.jar.sha1
@@ -0,0 +1 @@
+9ad705ca14f5d1879dfffc3d94a521bf2f2e8ea7
diff --git a/core/licenses/jackson-dataformat-smile-2.8.6.jar.sha1 b/core/licenses/jackson-dataformat-smile-2.8.6.jar.sha1
diff --git a/core/licenses/jackson-dataformat-smile-2.9.2.jar.sha1 b/core/licenses/jackson-dataformat-smile-2.9.2.jar.sha1
@@ -0,0 +1 @@
+a7cf50aff5bd96e3a0ba551a688bf402e2a594c3
diff --git a/core/licenses/jackson-dataformat-yaml-2.8.6.jar.sha1 b/core/licenses/jackson-dataformat-yaml-2.8.6.jar.sha1
diff --git a/core/licenses/jackson-dataformat-yaml-2.9.2.jar.sha1 b/core/licenses/jackson-dataformat-yaml-2.9.2.jar.sha1
@@ -0,0 +1 @@
+cafb9bafb3fc94ac18ed53043396f2c7bccd6c4f
diff --git a/core/licenses/snakeyaml-1.15.jar.sha1 b/core/licenses/snakeyaml-1.15.jar.sha1
diff --git a/core/licenses/snakeyaml-1.18.jar.sha1 b/core/licenses/snakeyaml-1.18.jar.sha1
@@ -0,0 +1 @@
+e4a441249ade301985cb8d009d4e4a72b85bf68e
diff --git a/core/src/main/java/org/elasticsearch/common/io/FastStringReader.java b/core/src/main/java/org/elasticsearch/common/io/FastStringReader.java
@@ -24,16 +24,14 @@
 
 /**
  * A character stream whose source is a string that is <b>not thread safe</b>
- * <p>
- * (shay.banon
- * )
  */
 public class FastStringReader extends Reader implements CharSequence {
 
     private String str;
     private int length;
     private int next = 0;
     private int mark = 0;
+    private boolean closed = false;
 
     /**
      * Creates a new string reader.
@@ -49,8 +47,9 @@ public FastStringReader(String s) {
      * Check to make sure that the stream has not been closed
      */
     private void ensureOpen() throws IOException {
-        if (length == -1)
+        if (closed) {
             throw new IOException("Stream closed");
+        }
     }
 
     @Override
@@ -196,7 +195,7 @@ public void reset() throws IOException {
      */
     @Override
     public void close() {
-        length = -1;
+        closed = true;
     }
 
     @Override

diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java b/core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java
@@ -72,18 +72,18 @@ public void testParseTopLevelBuilderEmptyObject() throws IOException {
     public void testParseTopLevelBuilderMalformedJson() throws IOException {
         for (String requestBody : Arrays.asList("\"\"", "\"someString\"", "\"{\"")) {
             try (XContentParser parser = createParser(JsonXContent.jsonXContent, requestBody)) {
-                ParsingException exception =
-                    expectThrows(ParsingException.class, () -> RestActions.getQueryContent(parser));
+                ParsingException exception = expectThrows(ParsingException.class, () -> RestActions.getQueryContent(parser));
                 assertEquals("Expected [START_OBJECT] but found [VALUE_STRING]", exception.getMessage());
             }
         }
     }
 
     public void testParseTopLevelBuilderIncompleteJson() throws IOException {
-        for (String requestBody : Arrays.asList("{", "{ \"query\" :")) {
+        final String incomplete = "{\"query\":";
+        for (int i = 1; i <= incomplete.length(); i++) {
+            String requestBody = incomplete.substring(0, i);
             try (XContentParser parser = createParser(JsonXContent.jsonXContent, requestBody)) {
-                ParsingException exception =
-                    expectThrows(ParsingException.class, () -> RestActions.getQueryContent(parser));
+                ParsingException exception = expectThrows(ParsingException.class, () -> RestActions.getQueryContent(parser));
                 assertEquals("Failed to parse", exception.getMessage());
                 assertEquals(JsonEOFException.class, exception.getRootCause().getClass());
             }

diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/JsonProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/JsonProcessorTests.java
@@ -62,7 +62,7 @@ public void testInvalidJson() {
         Exception exception = expectThrows(IllegalArgumentException.class, () -> jsonProcessor.execute(ingestDocument));
         assertThat(exception.getCause().getCause().getMessage(), equalTo("Unrecognized token"
                 + " 'invalid': was expecting ('true', 'false' or 'null')\n"
-                + " at [Source: invalid json; line: 1, column: 8]"));
+                + " at [Source: (org.elasticsearch.common.io.FastStringReader)\"invalid json\"; line: 1, column: 8]"));
     }
 
     public void testFieldMissing() {