Skip to content

Commit

Permalink
Revert "Upgrade to Jackson 2.9.2 (#27032)"
Browse files Browse the repository at this point in the history
This reverts commit 0b9acc5.
  • Loading branch information
tlrx committed Oct 20, 2017
1 parent fcaca92 commit 72b9859
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 22 deletions.
4 changes: 2 additions & 2 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ lucene = 7.1.0-snapshot-f33ed4ba12a
# optional dependencies
spatial4j = 0.6
jts = 1.13
jackson = 2.9.2
snakeyaml = 1.18
jackson = 2.8.6
snakeyaml = 1.15
# when updating log4j, please update also docs/java-api/index.asciidoc
log4j = 2.9.1
slf4j = 1.6.2
Expand Down
1 change: 1 addition & 0 deletions client/sniffer/licenses/jackson-core-2.8.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ef7b1cc34de149600f5e75bc2d5bf40de894e60
1 change: 0 additions & 1 deletion client/sniffer/licenses/jackson-core-2.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/jackson-core-2.8.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ef7b1cc34de149600f5e75bc2d5bf40de894e60
1 change: 0 additions & 1 deletion core/licenses/jackson-core-2.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/jackson-dataformat-cbor-2.8.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b88721371cfa2d7242bb5e52fe70861aa061c050
1 change: 0 additions & 1 deletion core/licenses/jackson-dataformat-cbor-2.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/jackson-dataformat-smile-2.8.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71590ad45cee21249774e2f93e5eca66e446cef3
1 change: 0 additions & 1 deletion core/licenses/jackson-dataformat-smile-2.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/jackson-dataformat-yaml-2.8.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bd44d50f9a6cdff9c7578ea39d524eb519e35ab
1 change: 0 additions & 1 deletion core/licenses/jackson-dataformat-yaml-2.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/snakeyaml-1.15.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3b132bea69e8ee099f416044970997bde80f4ea6
1 change: 0 additions & 1 deletion core/licenses/snakeyaml-1.18.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@

/**
* 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.
Expand All @@ -47,9 +49,8 @@ public FastStringReader(String s) {
* Check to make sure that the stream has not been closed
*/
private void ensureOpen() throws IOException {
if (closed) {
if (length == -1)
throw new IOException("Stream closed");
}
}

@Override
Expand Down Expand Up @@ -195,7 +196,7 @@ public void reset() throws IOException {
*/
@Override
public void close() {
closed = true;
length = -1;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
final String incomplete = "{\"query\":";
for (int i = 1; i <= incomplete.length(); i++) {
String requestBody = incomplete.substring(0, i);
for (String requestBody : Arrays.asList("{", "{ \"query\" :")) {
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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: (org.elasticsearch.common.io.FastStringReader)\"invalid json\"; line: 1, column: 8]"));
+ " at [Source: invalid json; line: 1, column: 8]"));
}

public void testFieldMissing() {
Expand Down

Large diffs are not rendered by default.

0 comments on commit 72b9859

Please sign in to comment.