Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit 688fd2a

Browse files
suztomosuztomo
authored
Merge branch 'master' into linkage_monitor_github_action
2 parents 5ebca61 + bd215f7 commit 688fd2a

8 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎dependencies.properties‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ version.io_grpc=1.32.2
3434
# 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
3535
maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:1.18.1
3636
maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:1.18.1
37-
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.22.0
38-
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.22.0
37+
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.23.0
38+
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.23.0
3939
maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.24.0
4040
maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.24.0
4141
maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.24.0
@@ -51,8 +51,7 @@ maven.org_threeten_threetenbp=org.threeten:threetenbp:1.5.0
5151
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.0.7
5252
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.0.7
5353
maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.38.1
54-
maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:google-http-client-jackson2:1.38.0
55-
maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.11.3
54+
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.38.1
5655
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18
5756
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
5857

‎gax-grpc/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ _COMPILE_DEPS = [
1515
"@com_google_protobuf//:protobuf_java",
1616
"@com_google_guava_guava//jar",
1717
"@com_google_code_findbugs_jsr305//jar",
18+
"@com_google_code_gson_gson//jar",
1819
"@org_threeten_threetenbp//jar",
1920
"@com_google_auth_google_auth_library_oauth2_http//jar",
2021
"@com_google_auth_google_auth_library_credentials//jar",

‎gax-httpjson/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ _COMPILE_DEPS = [
1818
"@com_google_api_api_common//jar",
1919
"@com_google_auto_value_auto_value//jar",
2020
"@com_google_auto_value_auto_value_annotations//jar",
21-
"@com_google_http_client_google_http_client_jackson2//jar",
2221
"@javax_annotation_javax_annotation_api//jar",
22+
"@com_google_http_client_google_http_client_gson//jar",
2323
"@com_google_protobuf//:protobuf_java",
2424
"@com_google_protobuf_java_util//jar",
2525
"//gax:gax",

‎gax-httpjson/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies {
1212
libraries['maven.com_google_code_findbugs_jsr305'],
1313
libraries['maven.org_threeten_threetenbp'],
1414
libraries['maven.com_google_http_client_google_http_client'],
15+
libraries['maven.com_google_http_client_google_http_client_gson'],
1516
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
1617
libraries['maven.com_google_auth_google_auth_library_credentials'],
1718
libraries['maven.com_google_api_api_common']

‎gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonChannel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.google.api.client.http.HttpTransport;
3333
import com.google.api.client.http.javanet.NetHttpTransport;
3434
import com.google.api.client.json.JsonFactory;
35-
import com.google.api.client.json.jackson2.JacksonFactory;
35+
import com.google.api.client.json.gson.GsonFactory;
3636
import com.google.api.core.ApiFuture;
3737
import com.google.api.core.BetaApi;
3838
import com.google.api.core.SettableApiFuture;
@@ -49,7 +49,7 @@
4949
/** Implementation of HttpJsonChannel which can issue http-json calls. */
5050
@BetaApi
5151
public class ManagedHttpJsonChannel implements HttpJsonChannel, BackgroundResource {
52-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
52+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
5353

5454
private final Executor executor;
5555
private final String endpoint;

‎gax-httpjson/src/test/java/com/google/api/gax/httpjson/ApiMessageHttpRequestTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
package com.google.api.gax.httpjson;
3131

3232
import com.google.api.client.http.HttpRequest;
33-
import com.google.api.client.json.jackson2.JacksonFactory;
33+
import com.google.api.client.json.gson.GsonFactory;
3434
import com.google.api.client.testing.http.MockHttpTransport;
3535
import com.google.api.core.SettableApiFuture;
3636
import com.google.api.pathtemplate.PathTemplate;
@@ -152,7 +152,7 @@ public String getFieldValue(String s) {
152152
.setRequest(insertFrogRequest)
153153
.setApiMethodDescriptor(apiMethodDescriptor)
154154
.setHttpTransport(new MockHttpTransport())
155-
.setJsonFactory(new JacksonFactory())
155+
.setJsonFactory(new GsonFactory())
156156
.setResponseFuture(SettableApiFuture.<EmptyMessage>create())
157157
.build();
158158

‎gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpRequestRunnableTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import com.google.api.client.http.EmptyContent;
3333
import com.google.api.client.http.HttpRequest;
34-
import com.google.api.client.json.jackson2.JacksonFactory;
34+
import com.google.api.client.json.gson.GsonFactory;
3535
import com.google.api.client.testing.http.MockHttpTransport;
3636
import com.google.api.core.SettableApiFuture;
3737
import com.google.api.gax.httpjson.testing.FakeApiMessage;
@@ -155,7 +155,7 @@ public String serialize(EmptyMessage response) {
155155
.setRequest(catMessage)
156156
.setApiMethodDescriptor(methodDescriptor)
157157
.setHttpTransport(new MockHttpTransport())
158-
.setJsonFactory(new JacksonFactory())
158+
.setJsonFactory(new GsonFactory())
159159
.setResponseFuture(SettableApiFuture.<EmptyMessage>create())
160160
.build();
161161
}
@@ -177,7 +177,7 @@ public void testRequestUrlUnnormalized() throws IOException {
177177
.setRequest(catMessage)
178178
.setApiMethodDescriptor(methodDescriptor)
179179
.setHttpTransport(new MockHttpTransport())
180-
.setJsonFactory(new JacksonFactory())
180+
.setJsonFactory(new GsonFactory())
181181
.setResponseFuture(SettableApiFuture.<EmptyMessage>create())
182182
.build();
183183
HttpRequest httpRequest = httpRequestRunnable.createHttpRequest();

‎gax/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ _COMPILE_DEPS = [
2020
"@io_grpc_grpc_java//context:context",
2121
"@org_threeten_threetenbp//jar",
2222
"@com_google_http_client_google_http_client//jar",
23-
"@com_google_http_client_google_http_client_jackson2//jar",
24-
"@com_fasterxml_jackson_core_jackson_core//jar",
23+
"@com_google_http_client_google_http_client_gson//jar",
24+
"@com_google_code_gson_gson//jar",
2525
"@com_google_guava_failureaccess//jar",
2626
"@javax_annotation_javax_annotation_api//jar",
2727
]

0 commit comments

Comments
 (0)