Skip to content

Commit 09a8382

Browse files
feat: migrate from google-http-client-jackson2 to google-http-client-gson (#2471)
* chore: test gson compatibility * chore: update imports in samples * chore: fix lint * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 688b6a6 commit 09a8382

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

google-cloud-bigquery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>com.google.http-client</groupId>
30-
<artifactId>google-http-client-jackson2</artifactId>
30+
<artifactId>google-http-client-gson</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.google.cloud</groupId>

google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.bigquery.benchmark;
1818

19-
import com.google.api.client.json.jackson2.JacksonFactory;
19+
import com.google.api.client.json.gson.GsonFactory;
2020
import com.google.cloud.bigquery.BigQuery;
2121
import com.google.cloud.bigquery.BigQueryOptions;
2222
import com.google.cloud.bigquery.FieldValue;
@@ -40,7 +40,7 @@ public static void main(String[] args) throws Exception {
4040
return;
4141
}
4242
String[] requests =
43-
new JacksonFactory()
43+
new GsonFactory()
4444
.createJsonParser(new FileInputStream(args[0]))
4545
.parseAndClose(String[].class);
4646

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.google.api.client.http.HttpTransport;
3131
import com.google.api.client.http.json.JsonHttpContent;
3232
import com.google.api.client.json.JsonFactory;
33-
import com.google.api.client.json.jackson2.JacksonFactory;
33+
import com.google.api.client.json.gson.GsonFactory;
3434
import com.google.api.core.InternalApi;
3535
import com.google.api.core.InternalExtensionOnly;
3636
import com.google.api.services.bigquery.Bigquery;
@@ -105,7 +105,7 @@ public HttpBigQueryRpc(BigQueryOptions options) {
105105
HttpRequestInitializer initializer = transportOptions.getHttpRequestInitializer(options);
106106
this.options = options;
107107
bigquery =
108-
new Bigquery.Builder(transport, new JacksonFactory(), initializer)
108+
new Bigquery.Builder(transport, new GsonFactory(), initializer)
109109
.setRootUrl(options.getHost())
110110
.setApplicationName(options.getApplicationName())
111111
.build();

samples/snippets/src/main/java/com/example/bigquery/AuthUserFlow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
2525
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2626
import com.google.api.client.json.JsonFactory;
27-
import com.google.api.client.json.jackson2.JacksonFactory;
27+
import com.google.api.client.json.gson.GsonFactory;
2828
import com.google.api.client.util.store.FileDataStoreFactory;
2929
import com.google.api.gax.paging.Page;
3030
import com.google.auth.oauth2.GoogleCredentials;
@@ -49,7 +49,7 @@ public class AuthUserFlow {
4949

5050
private static final File DATA_STORE_DIR =
5151
new File(AuthUserFlow.class.getResource("/").getPath(), "credentials");
52-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
52+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
5353
// i.e redirect_uri http://localhost:61984/Callback
5454
private static final int LOCAL_RECEIVER_PORT = 61984;
5555

samples/snippets/src/main/java/com/example/bigquery/AuthUserQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
2525
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2626
import com.google.api.client.json.JsonFactory;
27-
import com.google.api.client.json.jackson2.JacksonFactory;
27+
import com.google.api.client.json.gson.GsonFactory;
2828
import com.google.api.client.util.store.FileDataStoreFactory;
2929
import com.google.auth.oauth2.GoogleCredentials;
3030
import com.google.auth.oauth2.UserCredentials;
@@ -49,7 +49,7 @@ public class AuthUserQuery {
4949

5050
private static final File DATA_STORE_DIR =
5151
new File(AuthUserQuery.class.getResource("/").getPath(), "credentials");
52-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
52+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
5353
// i.e redirect_uri http://localhost:61984/Callback
5454
private static final int LOCAL_RECEIVER_PORT = 61984;
5555

0 commit comments

Comments
 (0)