Skip to content

Commit df29206

Browse files
authored
Upgrade Guava and remove jackson-guava binding (#215)
1 parent 1713c2f commit df29206

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>com.google.guava</groupId>
117117
<artifactId>guava</artifactId>
118-
<version>29.0-jre</version>
118+
<version>31.1-jre</version>
119119
</dependency>
120120

121121
<dependency>
@@ -136,12 +136,6 @@
136136
<version>${jackson-core.version}</version>
137137
</dependency>
138138

139-
<dependency>
140-
<groupId>com.fasterxml.jackson.datatype</groupId>
141-
<artifactId>jackson-datatype-guava</artifactId>
142-
<version>${jackson-core.version}</version>
143-
</dependency>
144-
145139
<dependency>
146140
<groupId>com.fasterxml.jackson.datatype</groupId>
147141
<artifactId>jackson-datatype-jdk8</artifactId>

src/main/java/com/treasuredata/client/TDHttpClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.fasterxml.jackson.databind.JsonMappingException;
2626
import com.fasterxml.jackson.databind.ObjectMapper;
2727
import com.fasterxml.jackson.databind.ObjectReader;
28-
import com.fasterxml.jackson.datatype.guava.GuavaModule;
2928
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
3029
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
3130
import com.google.common.annotations.VisibleForTesting;
@@ -86,7 +85,6 @@ public class TDHttpClient
8685
// Used for reading JSON response
8786
static ObjectMapper defaultObjectMapper = new ObjectMapper()
8887
.registerModule(new JsonOrgModule()) // for mapping query json strings into JSONObject
89-
.registerModule(new GuavaModule()) // for mapping to Guava Optional class
9088
.registerModule(new Jdk8Module())
9189
.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false)
9290
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

src/main/java/com/treasuredata/client/model/ObjectMappers.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.databind.DeserializationFeature;
55
import com.fasterxml.jackson.databind.ObjectMapper;
6-
import com.fasterxml.jackson.datatype.guava.GuavaModule;
76
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
87
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
98
import com.google.common.annotations.VisibleForTesting;
@@ -36,7 +35,6 @@ private static ObjectMapper createCompactMapper()
3635
{
3736
ObjectMapper mapper = new ObjectMapper();
3837
mapper.registerModule(new JsonOrgModule());
39-
mapper.registerModule(new GuavaModule().configureAbsentsAsNulls(false));
4038
mapper.registerModule(new Jdk8Module().configureAbsentsAsNulls(false));
4139
mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
4240
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

src/main/java/com/treasuredata/client/model/TDSavedQueryUpdateRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.fasterxml.jackson.annotation.JsonProperty;
2424
import com.fasterxml.jackson.core.JsonProcessingException;
2525
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import com.fasterxml.jackson.datatype.guava.GuavaModule;
2726
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
2827
import com.google.common.annotations.VisibleForTesting;
2928

@@ -79,7 +78,6 @@ static ObjectMapper getObjectMapper()
7978
{
8079
ObjectMapper mapper = new ObjectMapper();
8180
// Configure object mapper to exclude Optional.absent values in the generated json string
82-
mapper.registerModule(new GuavaModule().configureAbsentsAsNulls(false));
8381
mapper.registerModule(new Jdk8Module().configureAbsentsAsNulls(false));
8482
mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
8583
return mapper;

0 commit comments

Comments
 (0)