diff --git a/pom.xml b/pom.xml
index 210e5db1b..f5946da6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,7 +400,7 @@
com.google.api-client
google-api-client-bom
- 1.30.10
+ 1.31.4
pom
import
diff --git a/src/main/java/com/google/firebase/FirebaseApp.java b/src/main/java/com/google/firebase/FirebaseApp.java
index 06188cd55..d525d0673 100644
--- a/src/main/java/com/google/firebase/FirebaseApp.java
+++ b/src/main/java/com/google/firebase/FirebaseApp.java
@@ -21,7 +21,6 @@
import static com.google.common.base.Preconditions.checkState;
import static com.google.firebase.FirebaseOptions.APPLICATION_DEFAULT_CREDENTIALS;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.JsonParser;
import com.google.api.core.ApiFuture;
@@ -35,6 +34,7 @@
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.FirebaseScheduledExecutor;
import com.google.firebase.internal.FirebaseService;
import com.google.firebase.internal.ListenableFuture2ApiFuture;
@@ -569,7 +569,7 @@ private static FirebaseOptions getOptionsFromEnvironment() throws IOException {
.setCredentials(APPLICATION_DEFAULT_CREDENTIALS)
.build();
}
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
FirebaseOptions.Builder builder = FirebaseOptions.builder();
JsonParser parser;
if (defaultConfig.startsWith("{")) {
diff --git a/src/main/java/com/google/firebase/FirebaseOptions.java b/src/main/java/com/google/firebase/FirebaseOptions.java
index 6ee074d6f..f13f022db 100644
--- a/src/main/java/com/google/firebase/FirebaseOptions.java
+++ b/src/main/java/com/google/firebase/FirebaseOptions.java
@@ -19,7 +19,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.util.Key;
@@ -29,6 +28,7 @@
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.FirebaseThreadManagers;
import com.google.firebase.internal.NonNull;
import com.google.firebase.internal.Nullable;
@@ -234,18 +234,18 @@ public Builder toBuilder() {
}
/**
- * Builder for constructing {@link FirebaseOptions}.
+ * Builder for constructing {@link FirebaseOptions}.
*/
public static final class Builder {
@Key("databaseAuthVariableOverride")
private Map databaseAuthVariableOverride = new HashMap<>();
-
+
@Key("databaseUrl")
private String databaseUrl;
@Key("projectId")
private String projectId;
-
+
@Key("storageBucket")
private String storageBucket;
@@ -253,8 +253,8 @@ public static final class Builder {
private String serviceAccountId;
private Supplier credentialsSupplier;
private FirestoreOptions firestoreOptions;
- private HttpTransport httpTransport = Utils.getDefaultTransport();
- private JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ private HttpTransport httpTransport = ApiClientUtils.getDefaultTransport();
+ private JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
private ThreadManager threadManager = FirebaseThreadManagers.DEFAULT_THREAD_MANAGER;
private int connectTimeout;
private int readTimeout;
diff --git a/src/main/java/com/google/firebase/internal/ApiClientUtils.java b/src/main/java/com/google/firebase/internal/ApiClientUtils.java
index f2724196b..723fc6d52 100644
--- a/src/main/java/com/google/firebase/internal/ApiClientUtils.java
+++ b/src/main/java/com/google/firebase/internal/ApiClientUtils.java
@@ -16,9 +16,12 @@
package com.google.firebase.internal;
+import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpRequestFactory;
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.common.collect.ImmutableList;
import com.google.firebase.FirebaseApp;
@@ -76,4 +79,15 @@ public static void disconnectQuietly(HttpResponse response) {
}
}
}
+
+ public static JsonFactory getDefaultJsonFactory() {
+ // Force using the Jackson2 parser for this project for now. Eventually we should switch
+ // to Gson, but there are some issues that's preventing this migration at the moment.
+ // See https://github.com/googleapis/google-api-java-client/issues/1779 for details.
+ return JacksonFactory.getDefaultInstance();
+ }
+
+ public static HttpTransport getDefaultTransport() {
+ return Utils.getDefaultTransport();
+ }
}
diff --git a/src/main/java/com/google/firebase/remoteconfig/Template.java b/src/main/java/com/google/firebase/remoteconfig/Template.java
index 24bd68a5b..d94cfc89e 100644
--- a/src/main/java/com/google/firebase/remoteconfig/Template.java
+++ b/src/main/java/com/google/firebase/remoteconfig/Template.java
@@ -19,10 +19,10 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.base.Strings;
import com.google.firebase.ErrorCode;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.NonNull;
import com.google.firebase.remoteconfig.internal.TemplateResponse;
@@ -100,7 +100,7 @@ public Template(String etag) {
public static Template fromJSON(@NonNull String json) throws FirebaseRemoteConfigException {
checkArgument(!Strings.isNullOrEmpty(json), "JSON String must not be null or empty.");
// using the default json factory as no rpc calls are made here
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
try {
TemplateResponse templateResponse = jsonFactory.createJsonParser(json)
.parseAndClose(TemplateResponse.class);
@@ -219,7 +219,7 @@ public Template setVersion(Version version) {
* @return A JSON-serializable representation of this {@link Template} instance.
*/
public String toJSON() {
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
try {
return jsonFactory.toString(this.toTemplateResponse(true));
} catch (IOException e) {
diff --git a/src/test/java/com/google/firebase/OutgoingHttpRequestTest.java b/src/test/java/com/google/firebase/OutgoingHttpRequestTest.java
index 792d621f5..ffd17f057 100644
--- a/src/test/java/com/google/firebase/OutgoingHttpRequestTest.java
+++ b/src/test/java/com/google/firebase/OutgoingHttpRequestTest.java
@@ -21,13 +21,14 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpMethods;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.json.JsonHttpContent;
import com.google.api.client.testing.http.MockHttpTransport;
import com.google.common.collect.ImmutableMap;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import org.junit.Test;
@@ -73,7 +74,7 @@ public void testOutgoingHttpRequest() {
@Test
public void testOutgoingHttpRequestWithContent() throws IOException {
JsonHttpContent streamingContent = new JsonHttpContent(
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
ImmutableMap.of("key", "value"));
HttpRequest httpRequest = new MockHttpTransport().createRequestFactory()
.buildPostRequest(new GenericUrl(TEST_URL), streamingContent);
diff --git a/src/test/java/com/google/firebase/auth/FirebaseAuthIT.java b/src/test/java/com/google/firebase/auth/FirebaseAuthIT.java
index 7d02d3536..f8e454af6 100644
--- a/src/test/java/com/google/firebase/auth/FirebaseAuthIT.java
+++ b/src/test/java/com/google/firebase/auth/FirebaseAuthIT.java
@@ -24,7 +24,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
@@ -52,6 +51,7 @@
import com.google.firebase.auth.UserTestUtils.RandomUser;
import com.google.firebase.auth.UserTestUtils.TemporaryUser;
import com.google.firebase.auth.hash.Scrypt;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.Nullable;
import com.google.firebase.testing.IntegrationTestUtils;
import java.io.IOException;
@@ -79,8 +79,8 @@ public class FirebaseAuthIT {
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/resetPassword";
private static final String EMAIL_LINK_SIGN_IN_URL =
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/emailLinkSignin";
- private static final JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
- private static final HttpTransport transport = Utils.getDefaultTransport();
+ private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
+ private static final HttpTransport transport = ApiClientUtils.getDefaultTransport();
private static final String ACTION_LINK_CONTINUE_URL = "http://localhost/?a=1&b=2#c=3";
private static final FirebaseAuth auth = FirebaseAuth.getInstance(
diff --git a/src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java b/src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java
index 5e37161cd..b51fe0c7b 100644
--- a/src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java
+++ b/src/test/java/com/google/firebase/auth/FirebaseCustomTokenTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.LowLevelHttpRequest;
import com.google.api.client.json.gson.GsonFactory;
@@ -36,9 +35,9 @@
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.auth.internal.FirebaseCustomAuthToken;
import com.google.firebase.database.MapBuilder;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.testing.MultiRequestMockHttpTransport;
import com.google.firebase.testing.ServiceAccount;
-import com.google.firebase.testing.TestUtils;
import java.io.IOException;
import java.util.List;
import org.junit.After;
@@ -91,7 +90,7 @@ public void testCreateCustomTokenWithDeveloperClaims() throws Exception {
@Test
public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Exception {
MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- String content = Utils.getDefaultJsonFactory().toString(
+ String content = ApiClientUtils.getDefaultJsonFactory().toString(
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
response.setContent(content);
MockHttpTransport transport = new MultiRequestMockHttpTransport(ImmutableList.of(response));
@@ -116,7 +115,7 @@ public void testCreateCustomTokenWithoutServiceAccountCredentials() throws Excep
@Test
public void testCreateCustomTokenWithDiscoveredServiceAccount() throws Exception {
- String content = Utils.getDefaultJsonFactory().toString(
+ String content = ApiClientUtils.getDefaultJsonFactory().toString(
ImmutableMap.of("signedBlob", BaseEncoding.base64().encode("test-signature".getBytes())));
List responses = ImmutableList.of(
// Service account discovery response
diff --git a/src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java b/src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java
index bbe8b2e3a..7a25175b0 100644
--- a/src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java
+++ b/src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java
@@ -25,7 +25,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpHeaders;
import com.google.api.client.http.HttpRequest;
@@ -48,6 +47,7 @@
import com.google.firebase.auth.FirebaseUserManager.EmailLinkType;
import com.google.firebase.auth.multitenancy.TenantAwareFirebaseAuth;
import com.google.firebase.auth.multitenancy.TenantManager;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.SdkUtils;
import com.google.firebase.testing.MultiRequestMockHttpTransport;
import com.google.firebase.testing.TestResponseInterceptor;
@@ -67,7 +67,7 @@
public class FirebaseUserManagerTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
private static final String TEST_TOKEN = "token";
@@ -1210,7 +1210,7 @@ public void testLinkProvider() {
UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("test");
Map map = update
.setProviderToLink(USER_PROVIDER)
- .getProperties(Utils.getDefaultJsonFactory());
+ .getProperties(ApiClientUtils.getDefaultJsonFactory());
assertEquals(2, map.size());
assertEquals(update.getUid(), map.get("localId"));
assertEquals(USER_PROVIDER, map.get("linkProviderUserInfo"));
@@ -1221,7 +1221,7 @@ public void testDeleteProvider() {
UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("test");
Map map = update
.setProvidersToUnlink(ImmutableList.of("google.com"))
- .getProperties(Utils.getDefaultJsonFactory());
+ .getProperties(ApiClientUtils.getDefaultJsonFactory());
assertEquals(2, map.size());
assertEquals(update.getUid(), map.get("localId"));
assertEquals(ImmutableList.of("google.com"), map.get("deleteProvider"));
@@ -1233,7 +1233,7 @@ public void testDeleteProviderAndPhone() {
Map map = update
.setProvidersToUnlink(ImmutableList.of("google.com"))
.setPhoneNumber(null)
- .getProperties(Utils.getDefaultJsonFactory());
+ .getProperties(ApiClientUtils.getDefaultJsonFactory());
assertEquals(2, map.size());
assertEquals(update.getUid(), map.get("localId"));
assertEquals(ImmutableList.of("google.com", "phone"), map.get("deleteProvider"));
@@ -2898,7 +2898,7 @@ public FirebaseUserManager get() {
return FirebaseUserManager.builder()
.setProjectId("test-project-id")
.setHttpRequestFactory(transport.createRequestFactory())
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.build();
}
})
diff --git a/src/test/java/com/google/firebase/auth/ImportUserRecordTest.java b/src/test/java/com/google/firebase/auth/ImportUserRecordTest.java
index e2ae36c09..5a90690eb 100644
--- a/src/test/java/com/google/firebase/auth/ImportUserRecordTest.java
+++ b/src/test/java/com/google/firebase/auth/ImportUserRecordTest.java
@@ -19,12 +19,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.BaseEncoding;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
@@ -35,7 +36,7 @@
public class ImportUserRecordTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test
public void testUidOnlyRecord() {
diff --git a/src/test/java/com/google/firebase/auth/ListProviderConfigsPageTest.java b/src/test/java/com/google/firebase/auth/ListProviderConfigsPageTest.java
index ba08f9c77..d62ee4936 100644
--- a/src/test/java/com/google/firebase/auth/ListProviderConfigsPageTest.java
+++ b/src/test/java/com/google/firebase/auth/ListProviderConfigsPageTest.java
@@ -23,9 +23,10 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.common.collect.ImmutableList;
import com.google.firebase.auth.internal.ListOidcProviderConfigsResponse;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -344,7 +345,7 @@ public void testInvalidMaxResults() throws IOException {
private static OidcProviderConfig newOidcProviderConfig(String providerConfigId)
throws IOException {
- return Utils.getDefaultJsonFactory().fromString(
+ return ApiClientUtils.getDefaultJsonFactory().fromString(
String.format("{\"name\":\"%s\"}", providerConfigId), OidcProviderConfig.class);
}
diff --git a/src/test/java/com/google/firebase/auth/ListUsersPageTest.java b/src/test/java/com/google/firebase/auth/ListUsersPageTest.java
index 5e848069d..db490fb6a 100644
--- a/src/test/java/com/google/firebase/auth/ListUsersPageTest.java
+++ b/src/test/java/com/google/firebase/auth/ListUsersPageTest.java
@@ -23,13 +23,13 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.io.BaseEncoding;
-import com.google.firebase.auth.ListUsersPage;
import com.google.firebase.auth.ListUsersPage.ListUsersResult;
import com.google.firebase.auth.internal.DownloadAccountResponse;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -349,14 +349,14 @@ public void testInvalidMaxResults() throws IOException {
}
private static ExportedUserRecord newUser(String uid) throws IOException {
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
DownloadAccountResponse.User parsed = jsonFactory.fromString(
String.format("{\"localId\":\"%s\"}", uid), DownloadAccountResponse.User.class);
return new ExportedUserRecord(parsed, jsonFactory);
}
private static ExportedUserRecord newUser(String uid, String passwordHash) throws IOException {
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
DownloadAccountResponse.User parsed = jsonFactory.fromString(
String.format("{\"localId\":\"%s\", \"passwordHash\":\"%s\"}", uid, passwordHash),
DownloadAccountResponse.User.class);
diff --git a/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java b/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
index 1fb4ca37b..8242d5966 100644
--- a/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
+++ b/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
@@ -20,15 +20,16 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.Map;
import org.junit.Test;
public class OidcProviderConfigTest {
- private static final JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
private static final String OIDC_JSON_STRING =
("{"
diff --git a/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java b/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
index e957c1ddb..b9464452e 100644
--- a/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
+++ b/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
@@ -21,10 +21,11 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@
public class SamlProviderConfigTest {
- private static final JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
private static final String SAML_JSON_STRING =
("{"
diff --git a/src/test/java/com/google/firebase/auth/TestTokenFactory.java b/src/test/java/com/google/firebase/auth/TestTokenFactory.java
index 0510dbb66..7bf9eebb7 100644
--- a/src/test/java/com/google/firebase/auth/TestTokenFactory.java
+++ b/src/test/java/com/google/firebase/auth/TestTokenFactory.java
@@ -16,7 +16,6 @@
package com.google.firebase.auth;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.webtoken.JsonWebSignature;
import com.google.api.client.json.webtoken.JsonWebToken;
@@ -26,6 +25,8 @@
import com.google.api.client.util.Clock;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.BaseEncoding;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
@@ -35,7 +36,7 @@
class TestTokenFactory {
- public static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ public static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
public static final Clock CLOCK = new FixedClock(2002000L * 1000);
public static final String PROJECT_ID = "proj-test-101";
public static final String PRIVATE_KEY_ID = "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd";
diff --git a/src/test/java/com/google/firebase/auth/UserProviderTest.java b/src/test/java/com/google/firebase/auth/UserProviderTest.java
index 69806dc36..7ed8611e1 100644
--- a/src/test/java/com/google/firebase/auth/UserProviderTest.java
+++ b/src/test/java/com/google/firebase/auth/UserProviderTest.java
@@ -18,9 +18,10 @@
import static org.junit.Assert.assertEquals;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableMap;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +29,7 @@
public class UserProviderTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test
public void testAllProperties() throws IOException {
diff --git a/src/test/java/com/google/firebase/auth/UserRecordTest.java b/src/test/java/com/google/firebase/auth/UserRecordTest.java
index 22911d537..6d50f075c 100644
--- a/src/test/java/com/google/firebase/auth/UserRecordTest.java
+++ b/src/test/java/com/google/firebase/auth/UserRecordTest.java
@@ -5,13 +5,13 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.auth.UserRecord.UpdateRequest;
import com.google.firebase.auth.internal.DownloadAccountResponse;
import com.google.firebase.auth.internal.GetAccountInfoResponse;
+import com.google.firebase.internal.ApiClientUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -21,7 +21,7 @@
public class UserRecordTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test(expected = NullPointerException.class)
public void testNullResponse() {
diff --git a/src/test/java/com/google/firebase/auth/internal/CryptoSignersTest.java b/src/test/java/com/google/firebase/auth/internal/CryptoSignersTest.java
index 73477ad42..679fe5a3c 100644
--- a/src/test/java/com/google/firebase/auth/internal/CryptoSignersTest.java
+++ b/src/test/java/com/google/firebase/auth/internal/CryptoSignersTest.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpStatusCodes;
import com.google.api.client.testing.http.MockHttpTransport;
@@ -39,6 +38,7 @@
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.auth.FirebaseAuthException;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.testing.MultiRequestMockHttpTransport;
import com.google.firebase.testing.ServiceAccount;
import com.google.firebase.testing.TestResponseInterceptor;
@@ -70,7 +70,7 @@ public void testInvalidServiceAccountCryptoSigner() {
@Test
public void testIAMCryptoSigner() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
- String response = Utils.getDefaultJsonFactory().toString(
+ String response = ApiClientUtils.getDefaultJsonFactory().toString(
ImmutableMap.of("signedBlob", signature));
MockHttpTransport transport = new MockHttpTransport.Builder()
.setLowLevelHttpResponse(new MockLowLevelHttpResponse().setContent(response))
@@ -78,7 +78,7 @@ public void testIAMCryptoSigner() throws Exception {
TestResponseInterceptor interceptor = new TestResponseInterceptor();
CryptoSigners.IAMCryptoSigner signer = new CryptoSigners.IAMCryptoSigner(
transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
"test-service-account@iam.gserviceaccount.com");
signer.setInterceptor(interceptor);
@@ -99,7 +99,7 @@ public void testIAMCryptoSignerHttpError() {
.build();
CryptoSigners.IAMCryptoSigner signer = new CryptoSigners.IAMCryptoSigner(
transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
"test-service-account@iam.gserviceaccount.com");
try {
signer.sign("foo".getBytes());
@@ -115,7 +115,7 @@ public void testIAMCryptoSignerHttpError() {
@Test
public void testInvalidIAMCryptoSigner() {
try {
- new CryptoSigners.IAMCryptoSigner(null, Utils.getDefaultJsonFactory(), "test");
+ new CryptoSigners.IAMCryptoSigner(null, ApiClientUtils.getDefaultJsonFactory(), "test");
fail("No error thrown for null request factory");
} catch (NullPointerException expected) {
// expected
@@ -131,7 +131,7 @@ public void testInvalidIAMCryptoSigner() {
try {
new CryptoSigners.IAMCryptoSigner(transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(), null);
+ ApiClientUtils.getDefaultJsonFactory(), null);
fail("No error thrown for null service account");
} catch (IllegalArgumentException expected) {
// expected
@@ -139,7 +139,7 @@ public void testInvalidIAMCryptoSigner() {
try {
new CryptoSigners.IAMCryptoSigner(transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(), "");
+ ApiClientUtils.getDefaultJsonFactory(), "");
fail("No error thrown for empty service account");
} catch (IllegalArgumentException expected) {
// expected
@@ -149,7 +149,7 @@ public void testInvalidIAMCryptoSigner() {
@Test
public void testMetadataService() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
- String response = Utils.getDefaultJsonFactory().toString(
+ String response = ApiClientUtils.getDefaultJsonFactory().toString(
ImmutableMap.of("signedBlob", signature));
MockHttpTransport transport = new MultiRequestMockHttpTransport(
ImmutableList.of(
@@ -178,7 +178,7 @@ public void testMetadataService() throws Exception {
@Test
public void testExplicitServiceAccountEmail() throws Exception {
String signature = BaseEncoding.base64().encode("signed-bytes".getBytes());
- String response = Utils.getDefaultJsonFactory().toString(
+ String response = ApiClientUtils.getDefaultJsonFactory().toString(
ImmutableMap.of("signedBlob", signature));
// Explicit service account should get precedence
diff --git a/src/test/java/com/google/firebase/auth/internal/ListOidcProviderConfigsResponseTest.java b/src/test/java/com/google/firebase/auth/internal/ListOidcProviderConfigsResponseTest.java
index fbe587e56..433084951 100644
--- a/src/test/java/com/google/firebase/auth/internal/ListOidcProviderConfigsResponseTest.java
+++ b/src/test/java/com/google/firebase/auth/internal/ListOidcProviderConfigsResponseTest.java
@@ -20,17 +20,17 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.auth.OidcProviderConfig;
+import com.google.firebase.internal.ApiClientUtils;
import org.junit.Test;
public class ListOidcProviderConfigsResponseTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test
public void testDefaultValues() throws Exception {
diff --git a/src/test/java/com/google/firebase/auth/internal/ListSamlProviderConfigsResponseTest.java b/src/test/java/com/google/firebase/auth/internal/ListSamlProviderConfigsResponseTest.java
index 6950fe352..ae32728ec 100644
--- a/src/test/java/com/google/firebase/auth/internal/ListSamlProviderConfigsResponseTest.java
+++ b/src/test/java/com/google/firebase/auth/internal/ListSamlProviderConfigsResponseTest.java
@@ -20,17 +20,17 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.auth.SamlProviderConfig;
+import com.google.firebase.internal.ApiClientUtils;
import org.junit.Test;
public class ListSamlProviderConfigsResponseTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test
public void testDefaultValues() throws Exception {
diff --git a/src/test/java/com/google/firebase/auth/internal/ListTenantsResponseTest.java b/src/test/java/com/google/firebase/auth/internal/ListTenantsResponseTest.java
index 7d65966bb..684af2339 100644
--- a/src/test/java/com/google/firebase/auth/internal/ListTenantsResponseTest.java
+++ b/src/test/java/com/google/firebase/auth/internal/ListTenantsResponseTest.java
@@ -20,17 +20,17 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.auth.multitenancy.Tenant;
+import com.google.firebase.internal.ApiClientUtils;
import org.junit.Test;
public class ListTenantsResponseTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
@Test
public void testDefaultValues() throws Exception {
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/FirebaseTenantClientTest.java b/src/test/java/com/google/firebase/auth/multitenancy/FirebaseTenantClientTest.java
index c76046543..b94038925 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/FirebaseTenantClientTest.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/FirebaseTenantClientTest.java
@@ -24,7 +24,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpHeaders;
import com.google.api.client.http.HttpRequest;
@@ -46,6 +45,7 @@
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseAuthException;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.SdkUtils;
import com.google.firebase.testing.MultiRequestMockHttpTransport;
import com.google.firebase.testing.TestResponseInterceptor;
@@ -60,7 +60,7 @@
public class FirebaseTenantClientTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
private static final String TEST_TOKEN = "token";
@@ -398,7 +398,9 @@ private static TenantManager createRetryDisabledTenantManager(MockLowLevelHttpRe
.setCredentials(credentials)
.build());
FirebaseTenantClient tenantClient = new FirebaseTenantClient(
- "test-project-id", Utils.getDefaultJsonFactory(), transport.createRequestFactory());
+ "test-project-id",
+ ApiClientUtils.getDefaultJsonFactory(),
+ transport.createRequestFactory());
return new TenantManager(app, tenantClient);
}
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/ListTenantsPageTest.java b/src/test/java/com/google/firebase/auth/multitenancy/ListTenantsPageTest.java
index 10830592f..a5479e21b 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/ListTenantsPageTest.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/ListTenantsPageTest.java
@@ -23,10 +23,11 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.common.collect.ImmutableList;
import com.google.firebase.auth.FirebaseAuthException;
import com.google.firebase.auth.internal.ListTenantsResponse;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -319,7 +320,7 @@ public void testInvalidMaxResults() throws IOException {
}
private static Tenant newTenant(String tenantId) throws IOException {
- return Utils.getDefaultJsonFactory().fromString(
+ return ApiClientUtils.getDefaultJsonFactory().fromString(
String.format("{\"name\":\"%s\"}", tenantId), Tenant.class);
}
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthIT.java b/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthIT.java
index 1ebac213f..93b7dab94 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthIT.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthIT.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
@@ -54,6 +53,7 @@
import com.google.firebase.auth.UserTestUtils;
import com.google.firebase.auth.UserTestUtils.RandomUser;
import com.google.firebase.auth.UserTestUtils.TemporaryUser;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.Nullable;
import com.google.firebase.testing.IntegrationTestUtils;
import java.io.IOException;
@@ -73,8 +73,8 @@ public class TenantAwareFirebaseAuthIT {
private static final String VERIFY_CUSTOM_TOKEN_URL =
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/verifyCustomToken";
- private static final JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
- private static final HttpTransport transport = Utils.getDefaultTransport();
+ private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
+ private static final HttpTransport transport = ApiClientUtils.getDefaultTransport();
private static TenantManager tenantManager;
private static TenantAwareFirebaseAuth tenantAwareAuth;
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthTest.java b/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthTest.java
index db0099791..68e35492e 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthTest.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuthTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpMethods;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.json.GenericJson;
@@ -38,6 +37,7 @@
import com.google.firebase.auth.MockGoogleCredentials;
import com.google.firebase.auth.MockTokenVerifier;
import com.google.firebase.auth.SessionCookieOptions;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.testing.TestResponseInterceptor;
import com.google.firebase.testing.TestUtils;
import java.io.ByteArrayOutputStream;
@@ -270,7 +270,7 @@ private static FirebaseApp initializeAppWithResponse(String response) {
MockHttpTransport transport = new MockHttpTransport.Builder()
.setLowLevelHttpResponse(new MockLowLevelHttpResponse().setContent(response))
.build();
- return FirebaseApp.initializeApp(new FirebaseOptions.Builder()
+ return FirebaseApp.initializeApp(FirebaseOptions.builder()
.setCredentials(new MockGoogleCredentials("token"))
.setHttpTransport(transport)
.setProjectId("test-project-id")
@@ -281,7 +281,7 @@ private static GenericJson parseRequestContent(TestResponseInterceptor intercept
throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
interceptor.getResponse().getRequest().getContent().writeTo(out);
- return Utils.getDefaultJsonFactory().fromString(
+ return ApiClientUtils.getDefaultJsonFactory().fromString(
new String(out.toByteArray()), GenericJson.class);
}
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java b/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
index 7ea4f2539..f4ee0a326 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
@@ -20,17 +20,18 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.json.JsonFactory;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.IOException;
import java.util.Map;
import org.junit.Test;
public class TenantTest {
- private static final JsonFactory JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
- private static final String TENANT_JSON_STRING =
+ private static final String TENANT_JSON_STRING =
"{"
+ "\"name\":\"projects/project-id/resource/TENANT_ID\","
+ "\"displayName\":\"DISPLAY_NAME\","
diff --git a/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java b/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
index 7e927f51b..ca4b063f0 100644
--- a/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
+++ b/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
@@ -251,7 +251,7 @@ private ErrorHandlingHttpClient createHttpClient(
.build();
return new ErrorHandlingHttpClient<>(
transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
new TestPlatformErrorHandler());
}
@@ -265,7 +265,7 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
};
return new ErrorHandlingHttpClient<>(
transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
new TestPlatformErrorHandler());
}
@@ -281,7 +281,7 @@ private static class TestPlatformErrorHandler extends
AbstractPlatformErrorHandler {
TestPlatformErrorHandler() {
- super(Utils.getDefaultJsonFactory());
+ super(ApiClientUtils.getDefaultJsonFactory());
}
@Override
diff --git a/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java b/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
index 591914002..8b3e75efd 100644
--- a/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
+++ b/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
@@ -22,7 +22,6 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.ByteArrayContent;
import com.google.api.client.http.HttpContent;
import com.google.api.client.http.HttpMethods;
@@ -53,7 +52,7 @@
public class ErrorHandlingHttpClientTest {
- private static final JsonFactory DEFAULT_JSON_FACTORY = Utils.getDefaultJsonFactory();
+ private static final JsonFactory DEFAULT_JSON_FACTORY = ApiClientUtils.getDefaultJsonFactory();
private static final HttpRequestInfo TEST_REQUEST = HttpRequestInfo.buildGetRequest(
"https://firebase.google.com");
@@ -69,7 +68,7 @@ public void testNullRequestFactory() {
@Test(expected = NullPointerException.class)
public void testNullJsonFactory() {
new ErrorHandlingHttpClient<>(
- Utils.getDefaultTransport().createRequestFactory(),
+ ApiClientUtils.getDefaultTransport().createRequestFactory(),
null,
new TestHttpErrorHandler());
}
@@ -77,7 +76,7 @@ public void testNullJsonFactory() {
@Test(expected = NullPointerException.class)
public void testNullErrorHandler() {
new ErrorHandlingHttpClient<>(
- Utils.getDefaultTransport().createRequestFactory(),
+ ApiClientUtils.getDefaultTransport().createRequestFactory(),
DEFAULT_JSON_FACTORY,
null);
}
@@ -267,7 +266,7 @@ public void testRetryOnError() {
HttpRequestFactory requestFactory = ApiClientUtils.newAuthorizedRequestFactory(
app, retryConfig);
ErrorHandlingHttpClient client = new ErrorHandlingHttpClient<>(
- requestFactory, Utils.getDefaultJsonFactory(), new TestHttpErrorHandler());
+ requestFactory, ApiClientUtils.getDefaultJsonFactory(), new TestHttpErrorHandler());
try {
client.sendAndParse(TEST_REQUEST, GenericData.class);
@@ -302,7 +301,7 @@ public AccessToken refreshAccessToken() throws IOException {
.build());
HttpRequestFactory requestFactory = ApiClientUtils.newAuthorizedRequestFactory(app);
ErrorHandlingHttpClient client = new ErrorHandlingHttpClient<>(
- requestFactory, Utils.getDefaultJsonFactory(), new TestHttpErrorHandler());
+ requestFactory, ApiClientUtils.getDefaultJsonFactory(), new TestHttpErrorHandler());
try {
client.sendAndParse(TEST_REQUEST, GenericData.class);
diff --git a/src/test/java/com/google/firebase/messaging/FirebaseMessagingClientImplTest.java b/src/test/java/com/google/firebase/messaging/FirebaseMessagingClientImplTest.java
index a64c68d4b..17848cc65 100644
--- a/src/test/java/com/google/firebase/messaging/FirebaseMessagingClientImplTest.java
+++ b/src/test/java/com/google/firebase/messaging/FirebaseMessagingClientImplTest.java
@@ -43,6 +43,7 @@
import com.google.firebase.FirebaseOptions;
import com.google.firebase.OutgoingHttpRequest;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.SdkUtils;
import com.google.firebase.messaging.WebpushNotification.Action;
import com.google.firebase.messaging.WebpushNotification.Direction;
@@ -355,7 +356,7 @@ public void initialize(HttpRequest httpRequest) {
};
FirebaseMessagingClientImpl client = FirebaseMessagingClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(transport.createRequestFactory(initializer))
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
.setResponseInterceptor(interceptor)
@@ -555,7 +556,7 @@ private FirebaseMessagingClientImpl initMessagingClient(
return FirebaseMessagingClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(transport.createRequestFactory())
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
.setResponseInterceptor(interceptor)
@@ -578,7 +579,7 @@ private FirebaseMessagingClientImpl initClientWithFaultyTransport() {
HttpTransport transport = TestUtils.createFaultyHttpTransport();
return FirebaseMessagingClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(transport.createRequestFactory())
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
.build();
@@ -596,7 +597,7 @@ private void checkRequest(
HttpRequest request, Map expected) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
request.getContent().writeTo(out);
- JsonParser parser = Utils.getDefaultJsonFactory().createJsonParser(out.toString());
+ JsonParser parser = ApiClientUtils.getDefaultJsonFactory().createJsonParser(out.toString());
Map parsed = new HashMap<>();
parser.parseAndClose(parsed);
assertEquals(expected, parsed);
@@ -663,7 +664,7 @@ private int countLinesWithPrefix(String[] lines, String prefix) {
private FirebaseMessagingClientImpl.Builder fullyPopulatedBuilder() {
return FirebaseMessagingClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(Utils.getDefaultTransport().createRequestFactory())
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory());
}
diff --git a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
index 7724e4f6e..e7222ccb5 100644
--- a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
+++ b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
@@ -40,6 +40,7 @@
import com.google.firebase.OutgoingHttpRequest;
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.testing.TestResponseInterceptor;
import com.google.firebase.testing.TestUtils;
import java.io.ByteArrayOutputStream;
@@ -352,7 +353,7 @@ public void testUnsubscribeParseError() {
@Test(expected = NullPointerException.class)
public void testRequestFactoryIsNull() {
- new InstanceIdClientImpl(null, Utils.getDefaultJsonFactory());
+ new InstanceIdClientImpl(null, ApiClientUtils.getDefaultJsonFactory());
}
@Test(expected = NullPointerException.class)
@@ -420,7 +421,7 @@ private static InstanceIdClientImpl initInstanceIdClient(
.build();
return new InstanceIdClientImpl(
transport.createRequestFactory(),
- Utils.getDefaultJsonFactory(),
+ ApiClientUtils.getDefaultJsonFactory(),
interceptor);
}
@@ -435,7 +436,7 @@ private void checkTopicManagementRequest(
ByteArrayOutputStream out = new ByteArrayOutputStream();
request.getContent().writeTo(out);
Map parsed = new HashMap<>();
- JsonParser parser = Utils.getDefaultJsonFactory().createJsonParser(out.toString());
+ JsonParser parser = ApiClientUtils.getDefaultJsonFactory().createJsonParser(out.toString());
parser.parseAndClose(parsed);
assertEquals(2, parsed.size());
assertEquals("/topics/test-topic", parsed.get("to"));
@@ -467,6 +468,6 @@ private void checkExceptionFromHttpResponse(
private InstanceIdClient initClientWithFaultyTransport() {
return new InstanceIdClientImpl(
TestUtils.createFaultyHttpTransport().createRequestFactory(),
- Utils.getDefaultJsonFactory());
+ ApiClientUtils.getDefaultJsonFactory());
}
}
diff --git a/src/test/java/com/google/firebase/messaging/MessageTest.java b/src/test/java/com/google/firebase/messaging/MessageTest.java
index 90b867d5f..992644b35 100644
--- a/src/test/java/com/google/firebase/messaging/MessageTest.java
+++ b/src/test/java/com/google/firebase/messaging/MessageTest.java
@@ -25,6 +25,7 @@
import com.google.api.client.json.JsonParser;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.messaging.AndroidConfig.Priority;
import java.io.IOException;
import java.math.BigDecimal;
@@ -186,7 +187,7 @@ public void testAndroidMessageWithNotification() throws IOException {
.put("body_loc_args", ImmutableList.of("body-arg1", "body-arg2", "body-arg3"))
.put("channel_id", "channel-id")
// There is a problem with the JsonParser assignment to BigDecimal takes priority over
- // all other number types and so this integer value is interpreted as a BigDecimal
+ // all other number types and so this integer value is interpreted as a BigDecimal
// rather than an Integer.
.put("notification_count", BigDecimal.valueOf(4L))
.build();
@@ -227,7 +228,7 @@ public void testAndroidMessageWithDirectBootOk() throws IOException {
public void testAndroidNotificationWithNegativeCount() throws IllegalArgumentException {
AndroidNotification.builder().setNotificationCount(-1).build();
}
-
+
@Test
public void testAndroidMessageWithoutLocalization() throws IOException {
Message message = Message.builder()
@@ -934,7 +935,7 @@ private static void assertJsonEquals(
}
private static Map toMap(Object object) throws IOException {
- JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
+ JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
String json = jsonFactory.toString(object);
JsonParser parser = jsonFactory.createJsonParser(json);
Map map = new HashMap<>();
diff --git a/src/test/java/com/google/firebase/projectmanagement/FirebaseProjectManagementServiceImplTest.java b/src/test/java/com/google/firebase/projectmanagement/FirebaseProjectManagementServiceImplTest.java
index 8d227ef52..853074e65 100644
--- a/src/test/java/com/google/firebase/projectmanagement/FirebaseProjectManagementServiceImplTest.java
+++ b/src/test/java/com/google/firebase/projectmanagement/FirebaseProjectManagementServiceImplTest.java
@@ -26,7 +26,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestFactory;
import com.google.api.client.http.HttpResponse;
@@ -44,6 +43,7 @@
import com.google.firebase.FirebaseOptions;
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.SdkUtils;
import com.google.firebase.internal.TestApiClientUtils;
import com.google.firebase.testing.MultiRequestMockHttpTransport;
@@ -1135,7 +1135,7 @@ private void checkRequestPayload(Map expected) throws IOExceptio
private void checkRequestPayload(int index, Map expected) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
interceptor.getResponse(index).getRequest().getContent().writeTo(out);
- JsonParser parser = Utils.getDefaultJsonFactory().createJsonParser(out.toString());
+ JsonParser parser = ApiClientUtils.getDefaultJsonFactory().createJsonParser(out.toString());
Map parsed = new HashMap<>();
parser.parseAndClose(parsed);
assertEquals(expected, parsed);
diff --git a/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java b/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java
index 9be41852d..71e6f81ec 100644
--- a/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java
+++ b/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java
@@ -43,6 +43,7 @@
import com.google.firebase.FirebaseOptions;
import com.google.firebase.OutgoingHttpRequest;
import com.google.firebase.auth.MockGoogleCredentials;
+import com.google.firebase.internal.ApiClientUtils;
import com.google.firebase.internal.SdkUtils;
import com.google.firebase.remoteconfig.internal.TemplateResponse;
import com.google.firebase.testing.TestResponseInterceptor;
@@ -1150,7 +1151,7 @@ private FirebaseRemoteConfigClientImpl initRemoteConfigClient(
return FirebaseRemoteConfigClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(transport.createRequestFactory())
.setResponseInterceptor(interceptor)
.build();
@@ -1160,7 +1161,7 @@ private FirebaseRemoteConfigClientImpl initClientWithFaultyTransport() {
HttpTransport transport = TestUtils.createFaultyHttpTransport();
return FirebaseRemoteConfigClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(transport.createRequestFactory())
.build();
}
@@ -1168,7 +1169,7 @@ private FirebaseRemoteConfigClientImpl initClientWithFaultyTransport() {
private FirebaseRemoteConfigClientImpl.Builder fullyPopulatedBuilder() {
return FirebaseRemoteConfigClientImpl.builder()
.setProjectId("test-project")
- .setJsonFactory(Utils.getDefaultJsonFactory())
+ .setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
.setRequestFactory(Utils.getDefaultTransport().createRequestFactory());
}
@@ -1209,7 +1210,7 @@ private void checkRequestContent(
HttpRequest request, Map expected) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
request.getContent().writeTo(out);
- JsonParser parser = Utils.getDefaultJsonFactory().createJsonParser(out.toString());
+ JsonParser parser = ApiClientUtils.getDefaultJsonFactory().createJsonParser(out.toString());
Map parsed = new HashMap<>();
parser.parseAndClose(parsed);
assertEquals(expected, parsed);
diff --git a/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java b/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
index c9890354e..3d0c55024 100644
--- a/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
+++ b/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
@@ -18,7 +18,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.api.client.googleapis.util.Utils;
import com.google.api.client.http.ByteArrayContent;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
@@ -34,6 +33,8 @@
import com.google.firebase.TestOnlyImplFirebaseTrampolines;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.internal.ApiClientUtils;
+
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
@@ -53,7 +54,8 @@ public class IntegrationTestUtils {
private static synchronized GenericJson ensureServiceAccount() {
if (serviceAccount == null) {
try (InputStream stream = new FileInputStream(IT_SERVICE_ACCOUNT_PATH)) {
- serviceAccount = Utils.getDefaultJsonFactory().fromInputStream(stream, GenericJson.class);
+ serviceAccount = ApiClientUtils.getDefaultJsonFactory()
+ .fromInputStream(stream, GenericJson.class);
} catch (IOException e) {
String msg = String.format("Failed to read service account certificate from %s. "
+ "Integration tests require a service account credential obtained from a Firebase "
@@ -146,23 +148,23 @@ public static List getRandomNode(FirebaseApp app, int count)
}
return builder.build();
}
-
+
public static class AppHttpClient {
private final FirebaseApp app;
private final FirebaseOptions options;
private final HttpRequestFactory requestFactory;
-
+
public AppHttpClient() {
this(FirebaseApp.getInstance());
}
-
+
public AppHttpClient(FirebaseApp app) {
this.app = checkNotNull(app);
this.options = app.getOptions();
this.requestFactory = this.options.getHttpTransport().createRequestFactory();
}
-
+
public ResponseInfo put(String path, String json) throws IOException {
String url = options.getDatabaseUrl() + path + "?access_token=" + getToken();
HttpRequest request = requestFactory.buildPutRequest(new GenericUrl(url),
@@ -177,18 +179,18 @@ public ResponseInfo put(String path, String json) throws IOException {
}
}
}
-
+
private String getToken() {
// TODO: We should consider exposing getToken (or similar) publicly for the
// purpose of servers doing authenticated REST requests like this.
return TestOnlyImplFirebaseTrampolines.getToken(app, false);
}
}
-
+
public static class ResponseInfo {
private final int status;
private final byte[] payload;
-
+
private ResponseInfo(HttpResponse response) throws IOException {
this.status = response.getStatusCode();
this.payload = ByteStreams.toByteArray(response.getContent());