fix: Migrate off GeneratedMessageV3 (#1692)

lqiu96 · web-flow · commit 44c26e978d01 · 2024-05-21T10:27:42.000-04:00
* fix: Migrate off GeneratedMessageV3

* chore: Fix lint issues
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/BulkWriterTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/BulkWriterTest.java
@@ -42,7 +42,7 @@
 import com.google.firestore.v1.BatchWriteResponse;
 import com.google.firestore.v1.Value;
 import com.google.firestore.v1.Write;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.AbstractMessage;
 import com.google.rpc.Code;
 import io.grpc.Status;
 import java.util.ArrayList;
@@ -74,21 +74,21 @@
 @RunWith(MockitoJUnitRunner.class)
 public class BulkWriterTest {
 
-  public static final ApiFuture<GeneratedMessageV3> FAILED_FUTURE =
+  public static final ApiFuture<AbstractMessage> FAILED_FUTURE =
       ApiFutures.immediateFailedFuture(
           new ApiException(
               new IllegalStateException("Mock batchWrite failed in test"),
               GrpcStatusCode.of(Status.Code.UNKNOWN),
               false));
 
-  private static final ApiFuture<GeneratedMessageV3> RETRYABLE_FAILED_FUTURE =
+  private static final ApiFuture<AbstractMessage> RETRYABLE_FAILED_FUTURE =
       ApiFutures.immediateFailedFuture(
           new ApiException(
               new IllegalStateException("Mock batchWrite failed in test"),
               GrpcStatusCode.of(Status.Code.ABORTED),
               true));
 
-  private static final ApiFuture<GeneratedMessageV3> RESOURCE_EXHAUSTED_FAILED_FUTURE =
+  private static final ApiFuture<AbstractMessage> RESOURCE_EXHAUSTED_FAILED_FUTURE =
       ApiFutures.immediateFailedFuture(
           new ApiException(
               new IllegalStateException("Mock batchWrite failed in test"),
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
@@ -63,9 +63,9 @@
 import com.google.firestore.v1.Write;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Empty;
-import com.google.protobuf.GeneratedMessageV3;
 import com.google.protobuf.Message;
 import com.google.protobuf.NullValue;
 import com.google.type.LatLng;
@@ -1200,11 +1200,11 @@ public static String fullPath(DocumentReference ref, FirestoreOptions options) {
   }
 
   static class RequestResponsePair {
-    GeneratedMessageV3 request;
-    ApiFuture<? extends GeneratedMessageV3> response;
+    AbstractMessage request;
+    ApiFuture<? extends AbstractMessage> response;
 
     public RequestResponsePair(
-        GeneratedMessageV3 request, ApiFuture<? extends GeneratedMessageV3> response) {
+        AbstractMessage request, ApiFuture<? extends AbstractMessage> response) {
       this.request = request;
       this.response = response;
     }
@@ -1218,15 +1218,15 @@ static class ResponseStubber {
 
     List<Object> actualRequestList = new CopyOnWriteArrayList<>();
 
-    void put(GeneratedMessageV3 request, ApiFuture<? extends GeneratedMessageV3> response) {
+    void put(AbstractMessage request, ApiFuture<? extends AbstractMessage> response) {
       operationList.add(new RequestResponsePair(request, response));
     }
 
     void initializeStub(
         ArgumentCaptor<? extends Message> argumentCaptor, FirestoreImpl firestoreMock) {
       Stubber stubber = null;
       for (final RequestResponsePair entry : operationList) {
-        Answer<ApiFuture<? extends GeneratedMessageV3>> answer =
+        Answer<ApiFuture<? extends AbstractMessage>> answer =
             invocationOnMock -> {
               actualRequestList.add(invocationOnMock.getArguments()[0]);
               return entry.response;
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java
@@ -64,7 +64,7 @@
 import com.google.firestore.v1.BatchGetDocumentsRequest;
 import com.google.firestore.v1.DocumentMask;
 import com.google.firestore.v1.Write;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Message;
 import io.grpc.Status;
 import java.util.ArrayList;
@@ -88,7 +88,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionTest {
 
-  private final ApiFuture<GeneratedMessageV3> RETRYABLE_API_EXCEPTION =
+  private final ApiFuture<AbstractMessage> RETRYABLE_API_EXCEPTION =
       immediateFailedFuture(
           new ApiException(
               new Exception("Test exception"), GrpcStatusCode.of(Status.Code.UNKNOWN), true));
