Replacing Jackson Factory with Gson Factory and further code updation

.test-infra/dockerized-jenkins/plugins.txt

@@ -54,7 +54,7 @@ github-branch-source
 gradle
 handlebars
 handy-uri-templates-2-api
-jackson2-api
+gson-api
 jacoco
 javadoc
 jaxb

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

@@ -731,7 +731,7 @@ class BeamModulePlugin implements Plugin<Project> {
         google_ads                                  : "com.google.api-ads:google-ads:$google_ads_version",
         google_ads_stubs_v14                        : "com.google.api-ads:google-ads-stubs-v14:$google_ads_version",
         google_api_client                           : "com.google.api-client:google-api-client:$google_clients_version", // for the libraries using $google_clients_version below.
-        google_api_client_jackson2                  : "com.google.api-client:google-api-client-jackson2:$google_clients_version",
+        google_api_client_gson                      : "com.google.api-client:google-api-client-gson:$google_clients_version",
         google_api_client_java6                     : "com.google.api-client:google-api-client-java6:$google_clients_version",
         google_api_common                           : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version
         google_api_services_bigquery                : "com.google.apis:google-api-services-bigquery:v2-rev20240323-2.0.0",  // [bomupgrader] sets version
@@ -768,7 +768,7 @@ class BeamModulePlugin implements Plugin<Project> {
         google_http_client_apache_v2                : "com.google.http-client:google-http-client-apache-v2", // google_cloud_platform_libraries_bom sets version
         google_http_client_gson                     : "com.google.http-client:google-http-client-gson", // google_cloud_platform_libraries_bom sets version
         google_http_client_jackson                  : "com.google.http-client:google-http-client-jackson:1.29.2",
-        google_http_client_jackson2                 : "com.google.http-client:google-http-client-jackson2", // google_cloud_platform_libraries_bom sets version
+        google_http_client_gson                     : "com.google.http-client:google-http-client-gson", // google_cloud_platform_libraries_bom sets version
         google_http_client_protobuf                 : "com.google.http-client:google-http-client-protobuf", // google_cloud_platform_libraries_bom sets version
         google_oauth_client                         : "com.google.oauth-client:google-oauth-client:$google_oauth_clients_version",
         google_oauth_client_java6                   : "com.google.oauth-client:google-oauth-client-java6:$google_oauth_clients_version",

runners/google-cloud-dataflow-java/build.gradle

@@ -108,8 +108,8 @@ dependencies {
   implementation library.java.google_auth_library_credentials
   implementation library.java.google_auth_library_oauth2_http
   implementation library.java.google_http_client
-  implementation library.java.google_http_client_jackson2
-  permitUnusedDeclared library.java.google_http_client_jackson2 // BEAM-11761
+  implementation library.java.google_http_client_gson
+  permitUnusedDeclared library.java.google_http_client_gson // BEAM-11761
   implementation library.java.hamcrest
   implementation library.java.jackson_annotations
   implementation library.java.jackson_core

runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java

@@ -44,7 +44,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.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -580,7 +580,7 @@ public void testPackageUploadIsSkippedWithNonExistentResource() throws Exception
   /** Builds a fake GoogleJsonResponseException for testing API error handling. */
   private static GoogleJsonResponseException googleJsonResponseException(
       final int status, final String reason, final String message) throws IOException {
-    final JsonFactory jsonFactory = new JacksonFactory();
+    final JsonFactory jsonFactory = new GsonFactory();
     HttpTransport transport =
         new MockHttpTransport() {
           @Override

runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/graph/LengthPrefixUnknownCodersTest.java

@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertNotSame;
 
 import com.google.api.client.json.GenericJson;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.dataflow.model.InstructionOutput;
 import com.google.api.services.dataflow.model.ParDoInstruction;
 import com.google.api.services.dataflow.model.ParallelInstruction;
@@ -89,7 +89,7 @@ public class LengthPrefixUnknownCodersTest {
   public void setup() {
     MockitoAnnotations.initMocks(this);
     instruction = new ParallelInstruction();
-    instruction.setFactory(new JacksonFactory());
+    instruction.setFactory(new GsonFactory());
   }
 
   /** Test wrapping unknown coders with {@code LengthPrefixCoder} */
@@ -142,7 +142,7 @@ public void testLengthPrefixAndReplaceUnknownCoder() throws Exception {
   public void testLengthPrefixInstructionOutputCoder() throws Exception {
     InstructionOutput output = new InstructionOutput();
     output.setCodec(CloudObjects.asCloudObject(windowedValueCoder, /*sdkComponents=*/ null));
-    output.setFactory(new JacksonFactory());
+    output.setFactory(new GsonFactory());
 
     InstructionOutput prefixedOutput = forInstructionOutput(output, false);
     assertEqualsAsJson(
@@ -267,7 +267,7 @@ private static ParallelInstructionNode createReadNode(
                             .setCodec(CloudObjects.asCloudObject(coder, /*sdkComponents=*/ null))
                             .setSpec(CloudObject.forClassName(readClassName))));
 
-    parallelInstruction.setFactory(new JacksonFactory());
+    parallelInstruction.setFactory(new GsonFactory());
     return ParallelInstructionNode.create(parallelInstruction, Nodes.ExecutionLocation.UNKNOWN);
   }
 
@@ -276,7 +276,7 @@ private static InstructionOutputNode createInstructionOutputNode(String name, Co
         new InstructionOutput()
             .setName(name)
             .setCodec(CloudObjects.asCloudObject(coder, /*sdkComponents=*/ null));
-    instructionOutput.setFactory(new JacksonFactory());
+    instructionOutput.setFactory(new GsonFactory());
     return InstructionOutputNode.create(instructionOutput, "fakeId");
   }
 }

runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/testing/GenericJsonAssert.java

@@ -18,15 +18,15 @@
 package org.apache.beam.runners.dataflow.worker.testing;
 
 import com.google.api.client.json.GenericJson;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import java.io.IOException;
 import org.json.JSONException;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 /** Assertions on {@link GenericJson} class. */
 public class GenericJsonAssert {
 
-  private static final JacksonFactory jacksonFactory = JacksonFactory.getDefaultInstance();
+  private static final GsonFactory gsonFactory = GsonFactory.getDefaultInstance();
 
   /**
    * Asserts that {@code actual} has the same JSON representation as {@code expected}.
@@ -39,8 +39,8 @@ public static void assertEqualsAsJson(Object expected, Object actual) {
 
     try {
       String expectedJsonText =
-          expected instanceof String ? (String) expected : jacksonFactory.toString(expected);
-      String actualJsonText = jacksonFactory.toString(actual);
+          expected instanceof String ? (String) expected : gsonFactory.toString(expected);
+      String actualJsonText = gsonFactory.toString(actual);
       JSONAssert.assertEquals(expectedJsonText, actualJsonText, true);
     } catch (JSONException ex) {
       throw new IllegalArgumentException("Could not parse JSON", ex);

runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/testing/GenericJsonMatcher.java

@@ -18,7 +18,7 @@
 package org.apache.beam.runners.dataflow.worker.testing;
 
 import com.google.api.client.json.GenericJson;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import java.io.IOException;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
@@ -35,11 +35,11 @@ public final class GenericJsonMatcher extends TypeSafeMatcher<GenericJson> {
 
   private String expectedJsonText;
 
-  private static final JacksonFactory jacksonFactory = JacksonFactory.getDefaultInstance();
+  private static final GsonFactory gsonFactory = GsonFactory.getDefaultInstance();
 
   private GenericJsonMatcher(GenericJson expected) {
     try {
-      expectedJsonText = jacksonFactory.toString(expected);
+      expectedJsonText = gsonFactory.toString(expected);
     } catch (IOException ex) {
       throw new IllegalArgumentException("Could not parse JSON", ex);
     }
@@ -52,7 +52,7 @@ public static GenericJsonMatcher jsonOf(GenericJson genericJson) {
   @Override
   protected boolean matchesSafely(GenericJson actual) {
     try {
-      String actualJsonText = jacksonFactory.toString(actual);
+      String actualJsonText = gsonFactory.toString(actual);
       JSONCompareResult result =
           JSONCompare.compareJSON(expectedJsonText, actualJsonText, JSONCompareMode.STRICT);
       return result.passed();

sdks/java/extensions/google-cloud-platform-core/build.gradle

@@ -39,7 +39,7 @@ dependencies {
   implementation library.java.vendored_guava_32_1_2_jre
   implementation project(path: ":sdks:java:core", configuration: "shadow")
   implementation project(path: ":runners:core-java")
-  implementation library.java.google_http_client_jackson2
+  implementation library.java.google_http_client_gson
   implementation library.java.google_auth_library_oauth2_http
   implementation library.java.google_api_client
   implementation library.java.bigdataoss_gcsio

sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/Transport.java

@@ -23,7 +23,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 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.services.storage.Storage;
 import com.google.auth.Credentials;
 import com.google.auth.http.HttpCredentialsAdapter;
@@ -53,7 +53,7 @@ private static class SingletonHelper {
 
     static {
       try {
-        JSON_FACTORY = JacksonFactory.getDefaultInstance();
+        JSON_FACTORY = GsonFactory.getDefaultInstance();
         HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
       } catch (GeneralSecurityException | IOException e) {
         throw new RuntimeException(e);

sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/GcsUtilTest.java

@@ -49,7 +49,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.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -474,7 +474,7 @@ public void testRetryFileSizeNonBatch() throws IOException {
 
   @Test
   public void testGetSizeBytesWhenFileNotFoundBatch() throws Exception {
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     String contentBoundary = "batch_foobarbaz";
     String contentBoundaryLine = "--" + contentBoundary;
@@ -545,7 +545,7 @@ public void testGetSizeBytesWhenFileNotFoundNoBatch() throws Exception {
 
   @Test
   public void testGetSizeBytesWhenFileNotFoundBatchRetry() throws Exception {
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     String contentBoundary = "batch_foobarbaz";
     String contentBoundaryLine = "--" + contentBoundary;
@@ -657,7 +657,7 @@ public LowLevelHttpResponse execute() throws IOException {
 
   @Test
   public void testRemoveWhenFileNotFound() throws Exception {
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     String contentBoundary = "batch_foobarbaz";
     String contentBoundaryLine = "--" + contentBoundary;
@@ -1045,7 +1045,7 @@ private void verifyMetricWasSet(
   /** Builds a fake GoogleJsonResponseException for testing API error handling. */
   private static GoogleJsonResponseException googleJsonResponseException(
       final int status, final String reason, final String message) throws IOException {
-    final JsonFactory jsonFactory = new JacksonFactory();
+    final JsonFactory jsonFactory = new GsonFactory();
     HttpTransport transport =
         new MockHttpTransport() {
           @Override

sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/LatencyRecordingHttpRequestInitializerTest.java

@@ -34,7 +34,7 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 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.services.storage.Storage;
 import java.io.IOException;
 import org.apache.beam.sdk.metrics.Histogram;
@@ -61,7 +61,7 @@ public class LatencyRecordingHttpRequestInitializerTest {
   @Mock private LowLevelHttpResponse mockLowLevelResponse;
   @Mock private Histogram mockHistogram;
 
-  private final JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+  private final JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
   private Storage storage;
 
   @Before

sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/RetryHttpRequestInitializerTest.java

@@ -39,7 +39,7 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 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;
@@ -79,7 +79,7 @@ public class RetryHttpRequestInitializerTest {
   @Mock private LowLevelHttpResponse mockLowLevelResponse;
   @Mock private HttpResponseInterceptor mockHttpResponseInterceptor;
 
-  private final JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+  private final JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
   private Storage storage;
 
   // Used to test retrying a request more than the default 10 times.

sdks/java/io/google-cloud-platform/build.gradle

@@ -84,7 +84,7 @@ dependencies {
   implementation library.java.google_cloud_spanner
   implementation library.java.google_code_gson
   implementation library.java.google_http_client
-  implementation library.java.google_http_client_jackson2
+  implementation library.java.google_http_client_gson
   // bigdataoss_util declares old google_oauth_client version that does not have
   // IdTokenVerifier.verifyPayload method. Let's declare the newer one.
   implementation library.java.google_oauth_client

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java

@@ -24,7 +24,6 @@
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.gson.GsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1.CloudHealthcare;
 import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets.FhirStores.Fhir.PatientEverything;
 import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets.Hl7V2Stores.Messages;
@@ -735,8 +734,7 @@ private void initClient() throws IOException {
                 CloudHealthcareScopes.CLOUD_PLATFORM, StorageScopes.CLOUD_PLATFORM_READ_ONLY));
 
     client =
-        new CloudHealthcare.Builder(
-                new NetHttpTransport(), new JacksonFactory(), requestInitializer)
+        new CloudHealthcare.Builder(new NetHttpTransport(), new GsonFactory(), requestInitializer)
             .setApplicationName("apache-beam-hl7v2-io")
             .build();
     httpClient =

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServicesImplTest.java

@@ -45,7 +45,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.Json;
-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.util.MockSleeper;
@@ -1597,12 +1597,12 @@ public void testSkipInvalidRowsIgnoreUnknownIgnoreInsertIdsValuesStreaming()
   /** A helper to convert a string response back to a {@link GenericJson} subclass. */
   private static <T extends GenericJson> T fromString(String content, Class<T> clazz)
       throws IOException {
-    return JacksonFactory.getDefaultInstance().fromString(content, clazz);
+    return GsonFactory.getDefaultInstance().fromString(content, clazz);
   }
 
   /** A helper to wrap a {@link GenericJson} object in a content stream. */
   private static InputStream toStream(GenericJson content) throws IOException {
-    return new ByteArrayInputStream(JacksonFactory.getDefaultInstance().toByteArray(content));
+    return new ByteArrayInputStream(GsonFactory.getDefaultInstance().toByteArray(content));
   }
 
   /** A helper that generates the error JSON payload that Google APIs produce. */

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIOTestUtil.java

@@ -20,7 +20,7 @@
 import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.healthcare.v1.model.HttpBody;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.model.StorageObject;
@@ -136,8 +136,7 @@ public static void tearDownTempBucket() throws IOException {
           request.setReadTimeout(60000); // 1 minute read timeout
         };
     Storage storage =
-        new Storage.Builder(new NetHttpTransport(), new JacksonFactory(), requestInitializer)
-            .build();
+        new Storage.Builder(new NetHttpTransport(), new GsonFactory(), requestInitializer).build();
     List<StorageObject> blobs = storage.objects().list(DEFAULT_TEMP_BUCKET).execute().getItems();
     if (blobs != null) {
       for (StorageObject blob : blobs) {