Skip to content

Commit 3940859

Browse files
dependabot[bot]hiranya911
dependabot[bot]
and
hiranya911
authored
chore(deps): bump google-api-client-bom from 1.30.10 to 1.31.4 (#537)
* chore(deps): bump google-api-client-bom from 1.30.10 to 1.31.4 Bumps [google-api-client-bom](https://github.com/googleapis/google-api-java-client) from 1.30.10 to 1.31.4. - [Release notes](https://github.com/googleapis/google-api-java-client/releases) - [Changelog](https://github.com/googleapis/google-api-java-client/blob/master/CHANGELOG.md) - [Commits](googleapis/google-api-java-client@v1.30.10...v1.31.4) Signed-off-by: dependabot[bot] <[email protected]> * fix: Forcing the Jackson2 parser for; Removing direct invocation of API client Utils Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hiranya Jayathilaka <[email protected]>
1 parent fa51bb3 commit 3940859

34 files changed

+139
-110
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
<dependency>
401401
<groupId>com.google.api-client</groupId>
402402
<artifactId>google-api-client-bom</artifactId>
403-
<version>1.30.10</version>
403+
<version>1.31.4</version>
404404
<type>pom</type>
405405
<scope>import</scope>
406406
</dependency>

‎src/main/java/com/google/firebase/FirebaseApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.common.base.Preconditions.checkState;
2222
import static com.google.firebase.FirebaseOptions.APPLICATION_DEFAULT_CREDENTIALS;
2323

24-
import com.google.api.client.googleapis.util.Utils;
2524
import com.google.api.client.json.JsonFactory;
2625
import com.google.api.client.json.JsonParser;
2726
import com.google.api.core.ApiFuture;
@@ -35,6 +34,7 @@
3534
import com.google.common.base.MoreObjects;
3635
import com.google.common.base.Strings;
3736
import com.google.common.collect.ImmutableList;
37+
import com.google.firebase.internal.ApiClientUtils;
3838
import com.google.firebase.internal.FirebaseScheduledExecutor;
3939
import com.google.firebase.internal.FirebaseService;
4040
import com.google.firebase.internal.ListenableFuture2ApiFuture;
@@ -569,7 +569,7 @@ private static FirebaseOptions getOptionsFromEnvironment() throws IOException {
569569
.setCredentials(APPLICATION_DEFAULT_CREDENTIALS)
570570
.build();
571571
}
572-
JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
572+
JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
573573
FirebaseOptions.Builder builder = FirebaseOptions.builder();
574574
JsonParser parser;
575575
if (defaultConfig.startsWith("{")) {

‎src/main/java/com/google/firebase/FirebaseOptions.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22-
import com.google.api.client.googleapis.util.Utils;
2322
import com.google.api.client.http.HttpTransport;
2423
import com.google.api.client.json.JsonFactory;
2524
import com.google.api.client.util.Key;
@@ -29,6 +28,7 @@
2928
import com.google.common.base.Supplier;
3029
import com.google.common.base.Suppliers;
3130
import com.google.common.collect.ImmutableList;
31+
import com.google.firebase.internal.ApiClientUtils;
3232
import com.google.firebase.internal.FirebaseThreadManagers;
3333
import com.google.firebase.internal.NonNull;
3434
import com.google.firebase.internal.Nullable;
@@ -234,27 +234,27 @@ public Builder toBuilder() {
234234
}
235235

236236
/**
237-
* Builder for constructing {@link FirebaseOptions}.
237+
* Builder for constructing {@link FirebaseOptions}.
238238
*/
239239
public static final class Builder {
240240
@Key("databaseAuthVariableOverride")
241241
private Map<String, Object> databaseAuthVariableOverride = new HashMap<>();
242-
242+
243243
@Key("databaseUrl")
244244
private String databaseUrl;
245245

246246
@Key("projectId")
247247
private String projectId;
248-
248+
249249
@Key("storageBucket")
250250
private String storageBucket;
251251

252252
@Key("serviceAccountId")
253253
private String serviceAccountId;
254254
private Supplier<GoogleCredentials> credentialsSupplier;
255255
private FirestoreOptions firestoreOptions;
256-
private HttpTransport httpTransport = Utils.getDefaultTransport();
257-
private JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
256+
private HttpTransport httpTransport = ApiClientUtils.getDefaultTransport();
257+
private JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
258258
private ThreadManager threadManager = FirebaseThreadManagers.DEFAULT_THREAD_MANAGER;
259259
private int connectTimeout;
260260
private int readTimeout;

‎src/main/java/com/google/firebase/internal/ApiClientUtils.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616

1717
package com.google.firebase.internal;
1818

19+
import com.google.api.client.googleapis.util.Utils;
1920
import com.google.api.client.http.HttpRequestFactory;
2021
import com.google.api.client.http.HttpResponse;
2122
import com.google.api.client.http.HttpTransport;
23+
import com.google.api.client.json.JsonFactory;
24+
import com.google.api.client.json.jackson2.JacksonFactory;
2225
import com.google.common.collect.ImmutableList;
2326
import com.google.firebase.FirebaseApp;
2427

@@ -76,4 +79,15 @@ public static void disconnectQuietly(HttpResponse response) {
7679
}
7780
}
7881
}
82+
83+
public static JsonFactory getDefaultJsonFactory() {
84+
// Force using the Jackson2 parser for this project for now. Eventually we should switch
85+
// to Gson, but there are some issues that's preventing this migration at the moment.
86+
// See https://github.com/googleapis/google-api-java-client/issues/1779 for details.
87+
return JacksonFactory.getDefaultInstance();
88+
}
89+
90+
public static HttpTransport getDefaultTransport() {
91+
return Utils.getDefaultTransport();
92+
}
7993
}

‎src/main/java/com/google/firebase/remoteconfig/Template.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22-
import com.google.api.client.googleapis.util.Utils;
2322
import com.google.api.client.json.JsonFactory;
2423
import com.google.common.base.Strings;
2524
import com.google.firebase.ErrorCode;
25+
import com.google.firebase.internal.ApiClientUtils;
2626
import com.google.firebase.internal.NonNull;
2727
import com.google.firebase.remoteconfig.internal.TemplateResponse;
2828

@@ -100,7 +100,7 @@ public Template(String etag) {
100100
public static Template fromJSON(@NonNull String json) throws FirebaseRemoteConfigException {
101101
checkArgument(!Strings.isNullOrEmpty(json), "JSON String must not be null or empty.");
102102
// using the default json factory as no rpc calls are made here
103-
JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
103+
JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
104104
try {
105105
TemplateResponse templateResponse = jsonFactory.createJsonParser(json)
106106
.parseAndClose(TemplateResponse.class);
@@ -219,7 +219,7 @@ public Template setVersion(Version version) {
219219
* @return A JSON-serializable representation of this {@link Template} instance.
220220
*/
221221
public String toJSON() {
222-
JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
222+
JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
223223
try {
224224
return jsonFactory.toString(this.toTemplateResponse(true));
225225
} catch (IOException e) {

‎src/test/java/com/google/firebase/OutgoingHttpRequestTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
import static org.junit.Assert.assertSame;
2222
import static org.junit.Assert.assertTrue;
2323

24-
import com.google.api.client.googleapis.util.Utils;
2524
import com.google.api.client.http.GenericUrl;
2625
import com.google.api.client.http.HttpMethods;
2726
import com.google.api.client.http.HttpRequest;
2827
import com.google.api.client.http.json.JsonHttpContent;
2928
import com.google.api.client.testing.http.MockHttpTransport;
3029
import com.google.common.collect.ImmutableMap;
30+
import com.google.firebase.internal.ApiClientUtils;
31+
3132
import java.io.IOException;
3233
import org.junit.Test;
3334

@@ -73,7 +74,7 @@ public void testOutgoingHttpRequest() {
7374
@Test
7475
public void testOutgoingHttpRequestWithContent() throws IOException {
7576
JsonHttpContent streamingContent = new JsonHttpContent(
76-
Utils.getDefaultJsonFactory(),
77+
ApiClientUtils.getDefaultJsonFactory(),
7778
ImmutableMap.of("key", "value"));
7879
HttpRequest httpRequest = new MockHttpTransport().createRequestFactory()
7980
.buildPostRequest(new GenericUrl(TEST_URL), streamingContent);

‎src/test/java/com/google/firebase/auth/FirebaseAuthIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import static org.junit.Assert.assertTrue;
2525
import static org.junit.Assert.fail;
2626

27-
import com.google.api.client.googleapis.util.Utils;
2827
import com.google.api.client.http.GenericUrl;
2928
import com.google.api.client.http.HttpRequest;
3029
import com.google.api.client.http.HttpResponse;
@@ -52,6 +51,7 @@
5251
import com.google.firebase.auth.UserTestUtils.RandomUser;
5352
import com.google.firebase.auth.UserTestUtils.TemporaryUser;
5453
import com.google.firebase.auth.hash.Scrypt;
54+
import com.google.firebase.internal.ApiClientUtils;
5555
import com.google.firebase.internal.Nullable;
5656
import com.google.firebase.testing.IntegrationTestUtils;
5757
import java.io.IOException;
@@ -79,8 +79,8 @@ public class FirebaseAuthIT {
7979
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/resetPassword";
8080
private static final String EMAIL_LINK_SIGN_IN_URL =
8181
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/emailLinkSignin";
82-
private static final JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
83-
private static final HttpTransport transport = Utils.getDefaultTransport();
82+
private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
83+
private static final HttpTransport transport = ApiClientUtils.getDefaultTransport();
8484
private static final String ACTION_LINK_CONTINUE_URL = "http://localhost/?a=1&b=2#c=3";
8585

8686
private static final FirebaseAuth auth = FirebaseAuth.getInstance(

‎src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.junit.Assert.assertTrue;
2222
import static org.junit.Assert.fail;
2323

24-
import com.google.api.client.googleapis.util.Utils;
2524
import com.google.api.client.http.HttpTransport;
2625
import com.google.api.client.http.LowLevelHttpRequest;
2726
import com.google.api.client.json.gson.GsonFactory;
@@ -36,9 +35,9 @@
3635
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
3736
import com.google.firebase.auth.internal.FirebaseCustomAuthToken;
3837
import com.google.firebase.database.MapBuilder;
38+
import com.google.firebase.internal.ApiClientUtils;
3939
import com.google.firebase.testing.MultiRequestMockHttpTransport;
4040
import com.google.firebase.testing.ServiceAccount;
41-
import com.google.firebase.testing.TestUtils;
4241
import java.io.IOException;
4342
import java.util.List;
4443
import org.junit.After;
@@ -91,7 +90,7 @@ public void testCreateCustomTokenWithDeveloperClaims() throws Exception {
9190
@Test
9291
public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Exception {
9392
MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
94-
String content = Utils.getDefaultJsonFactory().toString(
93+
String content = ApiClientUtils.getDefaultJsonFactory().toString(
9594
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
9695
response.setContent(content);
9796
MockHttpTransport transport = new MultiRequestMockHttpTransport(ImmutableList.of(response));
@@ -116,7 +115,7 @@ public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Excep
116115

117116
@Test
118117
public void testCreateCustomTokenWithDiscoveredServiceAccount() throws Exception {
119-
String content = Utils.getDefaultJsonFactory().toString(
118+
String content = ApiClientUtils.getDefaultJsonFactory().toString(
120119
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
121120
List<MockLowLevelHttpResponse> responses = ImmutableList.of(
122121
// Service account discovery response

‎src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static org.junit.Assert.assertTrue;
2626
import static org.junit.Assert.fail;
2727

28-
import com.google.api.client.googleapis.util.Utils;
2928
import com.google.api.client.http.GenericUrl;
3029
import com.google.api.client.http.HttpHeaders;
3130
import com.google.api.client.http.HttpRequest;
@@ -48,6 +47,7 @@
4847
import com.google.firebase.auth.FirebaseUserManager.EmailLinkType;
4948
import com.google.firebase.auth.multitenancy.TenantAwareFirebaseAuth;
5049
import com.google.firebase.auth.multitenancy.TenantManager;
50+
import com.google.firebase.internal.ApiClientUtils;
5151
import com.google.firebase.internal.SdkUtils;
5252
import com.google.firebase.testing.MultiRequestMockHttpTransport;
5353
import com.google.firebase.testing.TestResponseInterceptor;
@@ -67,7 +67,7 @@
6767

6868
public class FirebaseUserManagerTest {
6969

70-
private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
70+
private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
7171

7272
private static final String TEST_TOKEN = "token";
7373

@@ -1210,7 +1210,7 @@ public void testLinkProvider() {
12101210
UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("test");
12111211
Map<String, Object> map = update
12121212
.setProviderToLink(USER_PROVIDER)
1213-
.getProperties(Utils.getDefaultJsonFactory());
1213+
.getProperties(ApiClientUtils.getDefaultJsonFactory());
12141214
assertEquals(2, map.size());
12151215
assertEquals(update.getUid(), map.get("localId"));
12161216
assertEquals(USER_PROVIDER, map.get("linkProviderUserInfo"));
@@ -1221,7 +1221,7 @@ public void testDeleteProvider() {
12211221
UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("test");
12221222
Map<String, Object> map = update
12231223
.setProvidersToUnlink(ImmutableList.of("google.com"))
1224-
.getProperties(Utils.getDefaultJsonFactory());
1224+
.getProperties(ApiClientUtils.getDefaultJsonFactory());
12251225
assertEquals(2, map.size());
12261226
assertEquals(update.getUid(), map.get("localId"));
12271227
assertEquals(ImmutableList.of("google.com"), map.get("deleteProvider"));
@@ -1233,7 +1233,7 @@ public void testDeleteProviderAndPhone() {
12331233
Map<String, Object> map = update
12341234
.setProvidersToUnlink(ImmutableList.of("google.com"))
12351235
.setPhoneNumber(null)
1236-
.getProperties(Utils.getDefaultJsonFactory());
1236+
.getProperties(ApiClientUtils.getDefaultJsonFactory());
12371237
assertEquals(2, map.size());
12381238
assertEquals(update.getUid(), map.get("localId"));
12391239
assertEquals(ImmutableList.of("google.com", "phone"), map.get("deleteProvider"));
@@ -2898,7 +2898,7 @@ public FirebaseUserManager get() {
28982898
return FirebaseUserManager.builder()
28992899
.setProjectId("test-project-id")
29002900
.setHttpRequestFactory(transport.createRequestFactory())
2901-
.setJsonFactory(Utils.getDefaultJsonFactory())
2901+
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
29022902
.build();
29032903
}
29042904
})

‎src/test/java/com/google/firebase/auth/ImportUserRecordTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
import static org.junit.Assert.assertEquals;
2020
import static org.junit.Assert.fail;
2121

22-
import com.google.api.client.googleapis.util.Utils;
2322
import com.google.api.client.json.JsonFactory;
2423
import com.google.common.base.Strings;
2524
import com.google.common.collect.ImmutableList;
2625
import com.google.common.collect.ImmutableMap;
2726
import com.google.common.io.BaseEncoding;
27+
import com.google.firebase.internal.ApiClientUtils;
28+
2829
import java.io.IOException;
2930
import java.util.ArrayList;
3031
import java.util.Date;
@@ -35,7 +36,7 @@
3536

3637
public class ImportUserRecordTest {
3738

38-
private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
39+
private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
3940

4041
@Test
4142
public void testUidOnlyRecord() {

0 commit comments

Comments
 (0)