From 63ed2caecc200a407ef40b249bed158f18e2c5ae Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Thu, 14 Jan 2021 22:51:12 +0000
Subject: [PATCH] fix: use Gson instead of Jackson (#1661)

* use GSon instead of Jackson

* remove jackson2

* fix callback
---
 .../auth/oauth2/AppIdentityCredentialTest.java         |  8 ++++----
 .../json/jackson2/JacksonNotificationCallback.java     |  8 ++++----
 google-api-client/pom.xml                              |  5 -----
 .../oauth2/GoogleAuthorizationCodeTokenRequest.java    |  2 +-
 .../auth/oauth2/GoogleRefreshTokenRequest.java         |  2 +-
 .../api/client/googleapis/json/package-info.java       |  2 +-
 .../notifications/TypedNotificationCallback.java       |  2 +-
 .../notifications/json/JsonNotificationCallback.java   |  2 +-
 .../testing/auth/oauth2/MockGoogleCredential.java      |  4 ++--
 .../testing/auth/oauth2/MockTokenServerTransport.java  |  4 ++--
 .../testing/compute/MockMetadataServerTransport.java   |  4 ++--
 .../com/google/api/client/googleapis/util/Utils.java   |  4 ++--
 .../auth/oauth2/DefaultCredentialProviderTest.java     |  4 ++--
 .../auth/oauth2/GoogleAuthorizationCodeFlowTest.java   |  4 ++--
 .../GoogleAuthorizationCodeTokenRequestTest.java       |  4 ++--
 .../googleapis/auth/oauth2/GoogleCredentialTest.java   |  4 ++--
 .../auth/oauth2/GoogleIdTokenVerifierTest.java         |  8 ++++----
 .../auth/oauth2/GooglePublicKeysManagerTest.java       | 10 +++++-----
 .../api/client/googleapis/batch/BatchRequestTest.java  |  6 +++---
 .../googleapis/compute/ComputeCredentialTest.java      |  4 ++--
 .../googleapis/json/GoogleJsonErrorContainerTest.java  |  4 ++--
 .../client/googleapis/json/GoogleJsonErrorTest.java    |  4 ++--
 .../services/AbstractGoogleClientRequestTest.java      |  4 ++--
 .../googleapis/services/AbstractGoogleClientTest.java  |  4 ++--
 .../services/json/AbstractGoogleJsonClientTest.java    |  4 ++--
 .../CommonGoogleJsonClientRequestInitializerTest.java  |  4 ++--
 .../GoogleJsonResponseExceptionFactoryTestingTest.java |  4 ++--
 .../google/api/client/googleapis/util/UtilsTest.java   |  2 --
 28 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
index 98cf6f043..961a8ffe7 100644
--- a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
+++ b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
@@ -20,7 +20,7 @@
 import com.google.api.client.http.HttpRequest;
 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.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import java.io.IOException;
 import java.util.Arrays;
@@ -72,7 +72,7 @@ public void testAppEngineCredentialWrapper() throws IOException {
     final Collection<String> emptyScopes = Collections.emptyList();
 
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     MockAppIdentityService appIdentity = new MockAppIdentityService();
     appIdentity.setAccessTokenText(expectedAccessToken);
@@ -108,7 +108,7 @@ public void testAppEngineCredentialWrapperGetAccessToken() throws IOException {
     final String expectedAccessToken = "ExpectedAccessToken";
 
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     MockAppIdentityService appIdentity = new MockAppIdentityService();
     appIdentity.setAccessTokenText(expectedAccessToken);
@@ -124,7 +124,7 @@ public void testAppEngineCredentialWrapperGetAccessToken() throws IOException {
   }
 
   public void testAppEngineCredentialWrapperNullTransportThrows() throws IOException {
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     try {
       new AppIdentityCredential.AppEngineCredentialWrapper(null, jsonFactory);
       fail();
diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
index 3d795ff6a..52267bc49 100644
--- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
+++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
@@ -17,13 +17,13 @@
 import com.google.api.client.googleapis.notifications.TypedNotificationCallback;
 import com.google.api.client.googleapis.notifications.json.JsonNotificationCallback;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.Beta;
 
 /**
  * {@link Beta} <br>
  * A {@link TypedNotificationCallback} which uses an JSON content encoding with {@link
- * JacksonFactory#getDefaultInstance()}.
+ * GsonFactory#getDefaultInstance()}.
  *
  * <p>Must NOT be implemented in form of an anonymous class as this will break serialization.
  *
@@ -31,7 +31,7 @@
  *
  * <pre>
  * static class MyNotificationCallback
- * extends GsonNotificationCallback{@literal <}ListResponse{@literal >} {
+ * extends JacksonNotificationCallback{@literal <}ListResponse{@literal >} {
  *
  * private static final long serialVersionUID = 1L;
  *
@@ -67,6 +67,6 @@ public abstract class JacksonNotificationCallback<T> extends JsonNotificationCal
 
   @Override
   protected JsonFactory getJsonFactory() {
-    return JacksonFactory.getDefaultInstance();
+    return GsonFactory.getDefaultInstance();
   }
 }
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index a8b852704..5cb54fbd9 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -121,14 +121,9 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-jackson2</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-gson</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
index 4fa858179..ff05084a9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
@@ -43,7 +43,7 @@
  * static void requestAccessToken() throws IOException {
  * try {
  * GoogleTokenResponse response =
- * new GoogleAuthorizationCodeTokenRequest(new NetHttpTransport(), new JacksonFactory(),
+ * new GoogleAuthorizationCodeTokenRequest(new NetHttpTransport(), new GsonFactory(),
  * "812741506391.apps.googleusercontent.com", "{client_secret}",
  * "4/P7q7W91a-oMsCeLvIaQm6bTrgtp7", "https://oauth2-login-demo.appspot.com/code")
  * .execute();
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
index 6fdcd9de9..55ba20fc0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
@@ -41,7 +41,7 @@
  * static void refreshAccessToken() throws IOException {
  * try {
  * TokenResponse response =
- * new GoogleRefreshTokenRequest(new NetHttpTransport(), new JacksonFactory(),
+ * new GoogleRefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
  * "tGzv3JOkF0XG5Qx2TlKWIA", "s6BhdRkqt3", "7Fjfp0ZBr1KtDRbnfVdmIw").execute();
  * System.out.println("Access token: " + response.getAccessToken());
  * } catch (TokenResponseException e) {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
index 781b5f9a5..d3c81065c 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
@@ -113,7 +113,7 @@
  * headers.setApplicationName("Google-YouTubeSample/1.0");
  * headers.gdataVersion = "2";
  * JsonCParser parser = new JsonCParser();
- * parser.jsonFactory = new JacksonFactory();
+ * parser.jsonFactory = new GsonFactory();
  * transport.addParser(parser);
  * // insert authentication code...
  * return transport;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
index 51c27c296..be7f5fe52 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
@@ -51,7 +51,7 @@
  *
  * {@literal @}Override
  * protected ObjectParser getObjectParser(Notification notification) throws IOException {
- * return new JsonObjectParser(new JacksonFactory());
+ * return new JsonObjectParser(new GsonFactory());
  * }
  *
  * {@literal @}Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
index 8d774bce5..70658bce7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
@@ -50,7 +50,7 @@
  *
  * {@literal @}Override
  * protected JsonFactory getJsonFactory() throws IOException {
- * return new JacksonFactory();
+ * return new GsonFactory();
  * }
  *
  * {@literal @}Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
index d90bf281a..0058a2840 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
@@ -6,7 +6,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
@@ -84,7 +84,7 @@ public MockGoogleCredential build() {
         setClientAuthentication(new MockClientAuthentication());
       }
       if (getJsonFactory() == null) {
-        setJsonFactory(new JacksonFactory());
+        setJsonFactory(new GsonFactory());
       }
       return new MockGoogleCredential(this);
     }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
index be992a905..1ad0d7de0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
@@ -21,7 +21,7 @@
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -47,7 +47,7 @@ public class MockTokenServerTransport extends MockHttpTransport {
   private static final Logger LOGGER = Logger.getLogger(MockTokenServerTransport.class.getName());
 
   static final String EXPECTED_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
-  static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  static final JsonFactory JSON_FACTORY = new GsonFactory();
   final String tokenServerUrl;
   Map<String, String> serviceAccounts = new HashMap<String, String>();
   Map<String, String> clients = new HashMap<String, String>();
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
index 82f2297ad..1814d067e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
@@ -20,7 +20,7 @@
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
@@ -41,7 +41,7 @@ public class MockMetadataServerTransport extends MockHttpTransport {
   private static final String METADATA_TOKEN_SERVER_URL =
       METADATA_SERVER_URL + "/computeMetadata/v1/instance/service-accounts/default/token";
 
-  static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   String accessToken;
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
index 5f0459244..d1e9ca8c0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
@@ -17,7 +17,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.Beta;
 
 /**
@@ -39,7 +39,7 @@ private static class JsonFactoryInstanceHolder {
     // other APIs to not require one of these for input. This was the most commonly used
     // implementation in public samples. This is a compile-time dependency to help detect the
     // dependency as early as possible.
-    static final JsonFactory INSTANCE = new JacksonFactory();
+    static final JsonFactory INSTANCE = new GsonFactory();
   }
 
   /** Returns a cached default implementation of the HttpTransport interface. */
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
index baa4a5d05..d3ea60ccc 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
@@ -23,7 +23,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import java.io.File;
@@ -45,7 +45,7 @@
 /** Tests {@link DefaultCredentialProvider}. */
 public class DefaultCredentialProviderTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   private static final Collection<String> SCOPES =
       Collections.unmodifiableCollection(Arrays.asList("scope1", "scope2"));
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
index 96100426c..ad3722982 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
@@ -14,7 +14,7 @@
 
 package com.google.api.client.googleapis.auth.oauth2;
 
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.common.collect.ImmutableList;
 import junit.framework.TestCase;
@@ -33,7 +33,7 @@ public void testBuilder() {
     GoogleAuthorizationCodeFlow.Builder builder =
         new GoogleAuthorizationCodeFlow.Builder(
             new MockHttpTransport(),
-            new JacksonFactory(),
+            new GsonFactory(),
             CLIENT_ID,
             CLIENT_SECRET,
             ImmutableList.of("https://www.googleapis.com/auth/userinfo.email"));
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
index 44c647b12..17d4e9d62 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
@@ -15,7 +15,7 @@
 package com.google.api.client.googleapis.auth.oauth2;
 
 import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import junit.framework.TestCase;
 
@@ -35,7 +35,7 @@ public void test() {
     GoogleAuthorizationCodeTokenRequest request =
         new GoogleAuthorizationCodeTokenRequest(
             new MockHttpTransport(),
-            new JacksonFactory(),
+            new GsonFactory(),
             CLIENT_ID,
             CLIENT_SECRET,
             CODE,
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
index 31932502d..9c3fb2555 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
@@ -18,7 +18,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.util.SecurityTestUtils;
 import java.io.ByteArrayInputStream;
@@ -36,7 +36,7 @@
  */
 public class GoogleCredentialTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   private static final Collection<String> SCOPES =
       Collections.unmodifiableCollection(Arrays.asList("scope1", "scope2"));
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
index b7a362218..cd8d6cb76 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.auth.openidconnect.IdTokenVerifier;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature.Header;
 import com.google.api.client.testing.http.FixedClock;
 import com.google.api.client.util.Clock;
@@ -52,7 +52,7 @@ public void testBuilder() throws Exception {
     GoogleIdTokenVerifier.Builder builder =
         new GoogleIdTokenVerifier.Builder(
                 new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(),
-                new JacksonFactory())
+                new GsonFactory())
             .setIssuer(ISSUER)
             .setAudience(TRUSTED_CLIENT_IDS);
     assertEquals(Clock.SYSTEM, builder.getClock());
@@ -71,7 +71,7 @@ public void testVerify() throws Exception {
     GoogleIdTokenVerifier verifier =
         new GoogleIdTokenVerifier.Builder(
                 new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(),
-                new JacksonFactory())
+                new GsonFactory())
             .build();
     Header header = new Header();
     header.setAlgorithm("RS25");
@@ -83,7 +83,7 @@ public void testVerify() throws Exception {
     assertFalse(verifier.verify(idToken2));
     verifier =
         new GoogleIdTokenVerifier(
-            new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new JacksonFactory());
+            new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory());
     assertFalse(verifier.verify(idToken));
     assertFalse(verifier.verify(idToken2));
     // TODO(yanivi): add a unit test that returns true
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
index 5a2380713..af586708b 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
@@ -20,7 +20,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.FixedClock;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -68,7 +68,7 @@ public class GooglePublicKeysManagerTest extends TestCase {
 
   public void testBuilder() throws Exception {
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     GooglePublicKeysManager.Builder builder =
         new GooglePublicKeysManager.Builder(transport, jsonFactory);
 
@@ -102,7 +102,7 @@ public LowLevelHttpResponse execute() {
   public void testRefresh() throws Exception {
     GooglePublicKeysManager certs =
         new GooglePublicKeysManager.Builder(
-                new PublicCertsMockHttpTransport(), new JacksonFactory())
+                new PublicCertsMockHttpTransport(), new GsonFactory())
             .build();
     certs.refresh();
     assertEquals(2, certs.getPublicKeys().size());
@@ -112,7 +112,7 @@ public void testLoadCerts_cache() throws Exception {
     PublicCertsMockHttpTransport transport = new PublicCertsMockHttpTransport();
     transport.useAgeHeader = true;
     GooglePublicKeysManager certs =
-        new GooglePublicKeysManager.Builder(transport, new JacksonFactory())
+        new GooglePublicKeysManager.Builder(transport, new GsonFactory())
             .setClock(new FixedClock(100))
             .build();
 
@@ -123,7 +123,7 @@ public void testLoadCerts_cache() throws Exception {
 
   public void testGetCacheTimeInSec() throws Exception {
     GooglePublicKeysManager certs =
-        new GooglePublicKeysManager.Builder(new MockHttpTransport(), new JacksonFactory()).build();
+        new GooglePublicKeysManager.Builder(new MockHttpTransport(), new GsonFactory()).build();
     assertEquals(
         12000,
         certs.getCacheTimeInSec(
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
index 4e74f9ac4..5ddb9e931 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
@@ -25,7 +25,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.protobuf.ProtoObjectParser;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
@@ -527,7 +527,7 @@ private BatchRequest getBatchPopulatedWithRequests(
     credential = new MockCredential();
 
     ObjectParser parser =
-        testBinary ? new ProtoObjectParser() : new JsonObjectParser(new JacksonFactory());
+        testBinary ? new ProtoObjectParser() : new JsonObjectParser(new GsonFactory());
     BatchRequest batchRequest =
         new BatchRequest(transport, credential).setBatchUrl(new GenericUrl(TEST_BATCH_URL));
     HttpRequest request1 = jsonHttpRequest1.buildHttpRequest();
@@ -629,7 +629,7 @@ public void subTestExecuteWithVoidCallback(boolean testServerError) throws IOExc
         new MockGoogleClientRequest<String>(client, METHOD1, URI_TEMPLATE1, null, String.class);
     MockGoogleClientRequest<String> jsonHttpRequest2 =
         new MockGoogleClientRequest<String>(client, METHOD2, URI_TEMPLATE2, null, String.class);
-    ObjectParser parser = new JsonObjectParser(new JacksonFactory());
+    ObjectParser parser = new JsonObjectParser(new GsonFactory());
     BatchRequest batchRequest =
         new BatchRequest(transport, null).setBatchUrl(new GenericUrl(TEST_BATCH_URL));
     HttpRequest request1 = jsonHttpRequest1.buildHttpRequest();
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
index c89118132..88fddd12b 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.googleapis.testing.compute.MockMetadataServerTransport;
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import junit.framework.TestCase;
 
 /**
@@ -32,7 +32,7 @@ public void testExecuteRefreshToken() throws Exception {
 
     HttpTransport transport = new MockMetadataServerTransport(ACCESS_TOKEN);
 
-    ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory());
+    ComputeCredential credential = new ComputeCredential(transport, new GsonFactory());
 
     assertTrue(credential.refreshToken());
     assertEquals(ACCESS_TOKEN, credential.getAccessToken());
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
index 87613ec61..9db097428 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import junit.framework.TestCase;
 
 /**
@@ -26,7 +26,7 @@
  */
 public class GoogleJsonErrorContainerTest extends TestCase {
 
-  static final JsonFactory FACTORY = new JacksonFactory();
+  static final JsonFactory FACTORY = new GsonFactory();
   static final String ERROR =
       "{"
           + "\"error\":{"
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
index f5d106170..83960bc81 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
@@ -22,7 +22,7 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -36,7 +36,7 @@
  */
 public class GoogleJsonErrorTest extends TestCase {
 
-  static final JsonFactory FACTORY = new JacksonFactory();
+  static final JsonFactory FACTORY = new GsonFactory();
   static final String ERROR =
       "{"
           + "\"code\":403,"
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
index 5a44807a8..734e3900b 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
@@ -27,7 +27,7 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
@@ -48,7 +48,7 @@ public class AbstractGoogleClientRequestTest extends TestCase {
   private static final String ROOT_URL = "https://www.googleapis.com/test/";
   private static final String SERVICE_PATH = "path/v1/";
   private static final String URI_TEMPLATE = "tests/{testId}";
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final JsonObjectParser JSON_OBJECT_PARSER = new JsonObjectParser(JSON_FACTORY);
   private static final String ERROR_CONTENT =
       "{\"error\":{\"code\":401,\"errors\":[{\"domain\":\"global\","
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
index d2715b04d..2164af792 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
@@ -26,7 +26,7 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
@@ -42,7 +42,7 @@
  */
 public class AbstractGoogleClientTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final JsonObjectParser JSON_OBJECT_PARSER = new JsonObjectParser(JSON_FACTORY);
   private static final HttpTransport TRANSPORT = new MockHttpTransport();
 
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
index 9305aa94b..1efc2c1e9 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
@@ -22,7 +22,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -56,7 +56,7 @@ public LowLevelHttpResponse execute() {
             };
           }
         };
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     MockGoogleJsonClient client =
         new MockGoogleJsonClient.Builder(
                 transport, jsonFactory, HttpTesting.SIMPLE_URL, "", null, false)
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
index 3067f336a..efa8a58ee 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
@@ -14,7 +14,7 @@
 
 import com.google.api.client.googleapis.testing.services.json.MockGoogleJsonClient;
 import com.google.api.client.http.HttpContent;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.util.Key;
@@ -46,7 +46,7 @@ public void testInitialize() throws Exception {
     MockGoogleJsonClient client =
         new MockGoogleJsonClient.Builder(
                 new MockHttpTransport(),
-                new JacksonFactory(),
+                new GsonFactory(),
                 HttpTesting.SIMPLE_URL,
                 "test/",
                 null,
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
index 36cbb7cdb..c4f41a1d3 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import java.io.IOException;
 import junit.framework.TestCase;
 
@@ -27,7 +27,7 @@
  */
 public class GoogleJsonResponseExceptionFactoryTestingTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final int HTTP_CODE_NOT_FOUND = 404;
   private static final String REASON_PHRASE_NOT_FOUND = "NOT FOUND";
 
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
index c4326747e..f2b47e21d 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
@@ -17,7 +17,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.HashMap;
@@ -34,7 +33,6 @@ public class UtilsTest extends TestCase {
   public void testGetDefaultJsonFactory() {
     JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
     assertNotNull(jsonFactory);
-    assertTrue(jsonFactory instanceof JacksonFactory);
     JsonFactory secondCall = Utils.getDefaultJsonFactory();
     assertSame(jsonFactory, secondCall);
   }