chore: Update generator to generate Message

Author: lqiu96

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java

@@ -36,7 +36,7 @@
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.Service;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.Arrays;
 import java.util.List;
@@ -130,7 +130,7 @@ private static MethodDefinition createGetRequestsMethod(
         TypeNode.withReference(
             ConcreteReference.builder()
                 .setClazz(List.class)
-                .setGenerics(Arrays.asList(typeStore.get("AbstractMessage").reference()))
+                .setGenerics(Arrays.asList(typeStore.get("Message").reference()))
                 .build());
     String methodName = "getRequests";
     Expr returnExpr =
@@ -153,10 +153,7 @@ private static MethodDefinition createAddResponseMethod(
     String methodName = "addResponse";
     VariableExpr responseArgExpr =
         VariableExpr.withVariable(
-            Variable.builder()
-                .setName("response")
-                .setType(typeStore.get("AbstractMessage"))
-                .build());
+            Variable.builder().setName("response").setType(typeStore.get("Message")).build());
 
     Expr methodInvocationExpr =
         MethodInvocationExpr.builder()
@@ -235,8 +232,7 @@ private static MethodDefinition createResetMethod(VariableExpr serviceImplVarExp
 
   private static TypeStore createTypes(Service service) {
     List<Class<?>> concreteClazzes =
-        Arrays.asList(
-            AbstractMessage.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
+        Arrays.asList(Message.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
     TypeStore typeStore = new TypeStore(concreteClazzes);
 
     typeStore.put("com.google.api.gax.grpc.testing", "MockGrpcService");

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java

@@ -51,7 +51,7 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -75,8 +75,7 @@ public class MockServiceImplClassComposer implements ClassComposer {
                   TypeNode.withReference(
                       ConcreteReference.builder()
                           .setClazz(List.class)
-                          .setGenerics(
-                              Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+                          .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
                           .build()))
               .build());
 
@@ -179,10 +178,7 @@ private static MethodDefinition createGetRequestsMethod() {
   private static MethodDefinition createAddResponseMethod() {
     VariableExpr responseArgExpr =
         VariableExpr.withVariable(
-            Variable.builder()
-                .setName("response")
-                .setType(FIXED_TYPESTORE.get("AbstractMessage"))
-                .build());
+            Variable.builder().setName("response").setType(FIXED_TYPESTORE.get("Message")).build());
     Expr methodInvocationExpr =
         MethodInvocationExpr.builder()
             .setMethodName("add")
@@ -207,8 +203,7 @@ private static MethodDefinition createSetResponsesMethod(Service service) {
                     TypeNode.withReference(
                         ConcreteReference.builder()
                             .setClazz(List.class)
-                            .setGenerics(
-                                Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+                            .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
                             .build()))
                 .build());
     Expr responseAssignExpr =
@@ -597,7 +592,7 @@ private static Statement createHandleObjectStatement(
   private static TypeStore createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
-            AbstractMessage.class,
+            Message.class,
             ArrayList.class,
             BetaApi.class,
             Generated.class,

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden

@@ -2,7 +2,7 @@ package com.google.testdata.v1;
 
 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;
 import javax.annotation.Generated;
@@ -17,12 +17,12 @@ public class MockDeprecatedService implements MockGrpcService {
   }
 
   @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);
   }
 

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden

@@ -1,8 +1,8 @@
 package com.google.testdata.v1;
 
 import com.google.api.core.BetaApi;
-import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
 import com.google.testdata.v1.DeprecatedServiceGrpc.DeprecatedServiceImplBase;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -14,23 +14,23 @@ import javax.annotation.Generated;
 @BetaApi
 @Generated("by gapic-generator-java")
 public class MockDeprecatedServiceImpl extends DeprecatedServiceImplBase {
-  private List<AbstractMessage> requests;
+  private List<Message> requests;
   private Queue<java.lang.Object> responses;
 
   public MockDeprecatedServiceImpl() {
     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<java.lang.Object>(responses);
   }
 

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden

@@ -2,7 +2,7 @@ package com.google.showcase.v1beta1;
 
 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;
 import javax.annotation.Generated;
@@ -17,12 +17,12 @@ public class MockEcho implements MockGrpcService {
   }
 
   @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);
   }
 

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden

@@ -2,7 +2,7 @@ package com.google.showcase.v1beta1;
 
 import com.google.api.core.BetaApi;
 import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import com.google.showcase.v1beta1.EchoGrpc.EchoImplBase;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -14,23 +14,23 @@ import javax.annotation.Generated;
 @BetaApi
 @Generated("by gapic-generator-java")
 public class MockEchoImpl extends EchoImplBase {
-  private List<AbstractMessage> requests;
+  private List<Message> requests;
   private Queue<java.lang.Object> responses;
 
   public MockEchoImpl() {
     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<java.lang.Object>(responses);
   }