chore: Update gax-grpc's testlib refrences to use Message

lqiu96 · lqiu96 · commit b7790c7fc4c0 · 2025-04-01T17:30:02.000-04:00
diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java
@@ -32,6 +32,7 @@
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
 import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.List;
 
@@ -45,12 +46,12 @@ public MockOperationsEx() {
   }
 
   @Override
-  public List<AbstractMessage> getRequests() {
+  public List<Message> getRequests() {
     return serviceImpl.getRequests();
   }
 
   @Override
-  public void addResponse(AbstractMessage response) {
+  public void addResponse(Message response) {
     serviceImpl.addGetOperationResponse(response);
   }
 
diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java
@@ -39,6 +39,7 @@
 import com.google.longrunning.OperationsGrpc.OperationsImplBase;
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -48,19 +49,19 @@
 /** A custom mock Operations service implementation which only mocks responses for GetOperation. */
 @BetaApi
 public class MockOperationsExImpl extends OperationsImplBase {
-  private List<AbstractMessage> requests;
+  private List<Message> requests;
   private Queue<Object> getOperationResponses;
 
   public MockOperationsExImpl() {
     requests = new ArrayList<>();
     getOperationResponses = new LinkedList<>();
   }
 
-  public List<AbstractMessage> getRequests() {
+  public List<Message> getRequests() {
     return requests;
   }
 
-  public void addGetOperationResponse(AbstractMessage response) {
+  public void addGetOperationResponse(Message response) {
     this.getOperationResponses.add(response);
   }
 
diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java
@@ -30,18 +30,18 @@
 package com.google.api.gax.grpc.testing;
 
 import com.google.api.core.BetaApi;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.List;
 
 /** An interface of mock gRPC service. */
 @BetaApi
 public interface MockGrpcService {
   /** Returns all the requests received. */
-  List<AbstractMessage> getRequests();
+  List<Message> getRequests();
 
   /** Adds the response to the response queue. */
-  void addResponse(AbstractMessage response);
+  void addResponse(Message response);
 
   /** Adds the exception to the response queue. */
   void addException(Exception exception);
diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java
@@ -32,6 +32,7 @@
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
 import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.List;
 
@@ -44,12 +45,12 @@ public MockOperations() {
   }
 
   @Override
-  public List<AbstractMessage> getRequests() {
+  public List<Message> getRequests() {
     return serviceImpl.getRequests();
   }
 
   @Override
-  public void addResponse(AbstractMessage response) {
+  public void addResponse(Message response) {
     serviceImpl.addResponse(response);
   }
 
diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java
@@ -33,6 +33,7 @@
 import com.google.longrunning.OperationsGrpc.OperationsImplBase;
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -41,23 +42,23 @@
 
 @BetaApi
 public class MockOperationsImpl extends OperationsImplBase {
-  private List<AbstractMessage> requests;
+  private List<Message> requests;
   private Queue<Object> responses;
 
   public MockOperationsImpl() {
     requests = new ArrayList<>();
     responses = new LinkedList<>();
   }
 
-  public List<AbstractMessage> getRequests() {
+  public List<Message> getRequests() {
     return requests;
   }
 
-  public void addResponse(AbstractMessage response) {
+  public void addResponse(Message response) {
     responses.add(response);
   }
 
-  public void setResponses(List<AbstractMessage> responses) {
+  public void setResponses(List<Message> responses) {
     this.responses = new LinkedList<Object>(responses);
   }
 
diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java
@@ -42,6 +42,7 @@
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Duration;
 import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -102,7 +103,7 @@ void getOperationTest() {
     Operation actualResponse = client.getOperation(name);
     assertEquals(expectedResponse, actualResponse);
 
-    List<AbstractMessage> actualRequests = mockOperations.getRequests();
+    List<Message> actualRequests = mockOperations.getRequests();
     assertEquals(1, actualRequests.size());
     GetOperationRequest actualRequest = (GetOperationRequest) actualRequests.get(0);
 
@@ -145,7 +146,7 @@ void listOperationsTest() {
     assertEquals(1, resources.size());
     assertEquals(expectedResponse.getOperationsList().get(0), resources.get(0));
 
-    List<AbstractMessage> actualRequests = mockOperations.getRequests();
+    List<Message> actualRequests = mockOperations.getRequests();
     assertEquals(1, actualRequests.size());
     ListOperationsRequest actualRequest = (ListOperationsRequest) actualRequests.get(0);
 
@@ -178,7 +179,7 @@ void cancelOperationTest() {
 
     client.cancelOperation(name);
 
-    List<AbstractMessage> actualRequests = mockOperations.getRequests();
+    List<Message> actualRequests = mockOperations.getRequests();
     assertEquals(1, actualRequests.size());
     CancelOperationRequest actualRequest = (CancelOperationRequest) actualRequests.get(0);
 
@@ -209,7 +210,7 @@ void deleteOperationTest() {
 
     client.deleteOperation(name);
 
-    List<AbstractMessage> actualRequests = mockOperations.getRequests();
+    List<Message> actualRequests = mockOperations.getRequests();
     assertEquals(1, actualRequests.size());
     DeleteOperationRequest actualRequest = (DeleteOperationRequest) actualRequests.get(0);
 
@@ -246,7 +247,7 @@ void waitOperationTest() {
     Operation actualResponse = client.waitOperation(request);
     assertEquals(expectedResponse, actualResponse);
 
-    List<AbstractMessage> actualRequests = mockOperations.getRequests();
+    List<Message> actualRequests = mockOperations.getRequests();
     assertEquals(1, actualRequests.size());
     WaitOperationRequest actualRequest = (WaitOperationRequest) actualRequests.get(0);
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`import com.google.api.core.BetaApi;`
`33`	`33`	`import com.google.api.gax.grpc.testing.MockGrpcService;`
`34`	`34`	`import com.google.protobuf.AbstractMessage;`
	`35`	`+import com.google.protobuf.Message;`
`35`	`36`	`import io.grpc.ServerServiceDefinition;`
`36`	`37`	`import java.util.List;`
`37`	`38`
`@@ -45,12 +46,12 @@ public MockOperationsEx() {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`@Override`
`48`		`- public List<AbstractMessage> getRequests() {`
	`49`	`+ public List<Message> getRequests() {`
`49`	`50`	`return serviceImpl.getRequests();`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`@Override`
`53`		`- public void addResponse(AbstractMessage response) {`
	`54`	`+ public void addResponse(Message response) {`
`54`	`55`	`serviceImpl.addGetOperationResponse(response);`
`55`	`56`	`}`
`56`	`57`