From cdf4ed00c75d1d31d8b32d368612926c1fcd6b08 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Mon, 24 Oct 2022 17:02:11 -0700 Subject: [PATCH 01/42] Proposed changes to introduce interfaces in generated code. --- .../testing/integration/TestServiceGrpc.java | 569 ++++++++++++------ 1 file changed, 393 insertions(+), 176 deletions(-) diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index a380a5b6303..c462a96e745 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -2,6 +2,12 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; +import com.google.common.util.concurrent.ListenableFuture; +import io.grpc.MethodDescriptor.MethodType; +import io.grpc.stub.StreamObserver; +import sun.reflect.generics.reflectiveObjects.NotImplementedException; + + /** * 
  * A simple service to test the various types of RPCs and experiment with
@@ -19,29 +25,29 @@ private TestServiceGrpc() {}
   public static final String SERVICE_NAME = "grpc.testing.TestService";
 
   // Static method descriptors that strictly reflect the proto.
-  private static volatile io.grpc.MethodDescriptor getEmptyCallMethod;
+  private static volatile io.grpc.MethodDescriptor getEmptyCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "EmptyCall",
-      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      responseType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor getEmptyCallMethod() {
-    io.grpc.MethodDescriptor getEmptyCallMethod;
+      requestType = EmptyProtos.Empty.class,
+      responseType = EmptyProtos.Empty.class,
+      methodType = MethodType.UNARY)
+  public static io.grpc.MethodDescriptor getEmptyCallMethod() {
+    io.grpc.MethodDescriptor getEmptyCallMethod;
     if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) {
           TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EmptyCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
+                  EmptyProtos.Empty.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
+                  EmptyProtos.Empty.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall"))
               .build();
         }
@@ -50,29 +56,29 @@ io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethod() {
     return getEmptyCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getUnaryCallMethod;
+  private static volatile io.grpc.MethodDescriptor getUnaryCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "UnaryCall",
-      requestType = io.grpc.testing.integration.Messages.SimpleRequest.class,
-      responseType = io.grpc.testing.integration.Messages.SimpleResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor getUnaryCallMethod() {
-    io.grpc.MethodDescriptor getUnaryCallMethod;
+      requestType = Messages.SimpleRequest.class,
+      responseType = Messages.SimpleResponse.class,
+      methodType = MethodType.UNARY)
+  public static io.grpc.MethodDescriptor getUnaryCallMethod() {
+    io.grpc.MethodDescriptor getUnaryCallMethod;
     if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) {
           TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance()))
+                  Messages.SimpleRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance()))
+                  Messages.SimpleResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall"))
               .build();
         }
@@ -81,29 +87,29 @@ io.grpc.testing.integration.Messages.SimpleResponse> getUnaryCallMethod() {
     return getUnaryCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getCacheableUnaryCallMethod;
+  private static volatile io.grpc.MethodDescriptor getCacheableUnaryCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "CacheableUnaryCall",
-      requestType = io.grpc.testing.integration.Messages.SimpleRequest.class,
-      responseType = io.grpc.testing.integration.Messages.SimpleResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor getCacheableUnaryCallMethod() {
-    io.grpc.MethodDescriptor getCacheableUnaryCallMethod;
+      requestType = Messages.SimpleRequest.class,
+      responseType = Messages.SimpleResponse.class,
+      methodType = MethodType.UNARY)
+  public static io.grpc.MethodDescriptor getCacheableUnaryCallMethod() {
+    io.grpc.MethodDescriptor getCacheableUnaryCallMethod;
     if ((getCacheableUnaryCallMethod = TestServiceGrpc.getCacheableUnaryCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getCacheableUnaryCallMethod = TestServiceGrpc.getCacheableUnaryCallMethod) == null) {
           TestServiceGrpc.getCacheableUnaryCallMethod = getCacheableUnaryCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CacheableUnaryCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance()))
+                  Messages.SimpleRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance()))
+                  Messages.SimpleResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("CacheableUnaryCall"))
               .build();
         }
@@ -112,29 +118,29 @@ io.grpc.testing.integration.Messages.SimpleResponse> getCacheableUnaryCallMethod
     return getCacheableUnaryCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getStreamingOutputCallMethod;
+  private static volatile io.grpc.MethodDescriptor getStreamingOutputCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "StreamingOutputCall",
-      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
-  public static io.grpc.MethodDescriptor getStreamingOutputCallMethod() {
-    io.grpc.MethodDescriptor getStreamingOutputCallMethod;
+      requestType = Messages.StreamingOutputCallRequest.class,
+      responseType = Messages.StreamingOutputCallResponse.class,
+      methodType = MethodType.SERVER_STREAMING)
+  public static io.grpc.MethodDescriptor getStreamingOutputCallMethod() {
+    io.grpc.MethodDescriptor getStreamingOutputCallMethod;
     if ((getStreamingOutputCallMethod = TestServiceGrpc.getStreamingOutputCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getStreamingOutputCallMethod = TestServiceGrpc.getStreamingOutputCallMethod) == null) {
           TestServiceGrpc.getStreamingOutputCallMethod = getStreamingOutputCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.SERVER_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
+                  Messages.StreamingOutputCallRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
+                  Messages.StreamingOutputCallResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall"))
               .build();
         }
@@ -143,29 +149,29 @@ io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getStreamingOu
     return getStreamingOutputCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getStreamingInputCallMethod;
+  private static volatile io.grpc.MethodDescriptor getStreamingInputCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "StreamingInputCall",
-      requestType = io.grpc.testing.integration.Messages.StreamingInputCallRequest.class,
-      responseType = io.grpc.testing.integration.Messages.StreamingInputCallResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
-  public static io.grpc.MethodDescriptor getStreamingInputCallMethod() {
-    io.grpc.MethodDescriptor getStreamingInputCallMethod;
+      requestType = Messages.StreamingInputCallRequest.class,
+      responseType = Messages.StreamingInputCallResponse.class,
+      methodType = MethodType.CLIENT_STREAMING)
+  public static io.grpc.MethodDescriptor getStreamingInputCallMethod() {
+    io.grpc.MethodDescriptor getStreamingInputCallMethod;
     if ((getStreamingInputCallMethod = TestServiceGrpc.getStreamingInputCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getStreamingInputCallMethod = TestServiceGrpc.getStreamingInputCallMethod) == null) {
           TestServiceGrpc.getStreamingInputCallMethod = getStreamingInputCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.CLIENT_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingInputCallRequest.getDefaultInstance()))
+                  Messages.StreamingInputCallRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingInputCallResponse.getDefaultInstance()))
+                  Messages.StreamingInputCallResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall"))
               .build();
         }
@@ -174,29 +180,29 @@ io.grpc.testing.integration.Messages.StreamingInputCallResponse> getStreamingInp
     return getStreamingInputCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getFullDuplexCallMethod;
+  private static volatile io.grpc.MethodDescriptor getFullDuplexCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "FullDuplexCall",
-      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
-  public static io.grpc.MethodDescriptor getFullDuplexCallMethod() {
-    io.grpc.MethodDescriptor getFullDuplexCallMethod;
+      requestType = Messages.StreamingOutputCallRequest.class,
+      responseType = Messages.StreamingOutputCallResponse.class,
+      methodType = MethodType.BIDI_STREAMING)
+  public static io.grpc.MethodDescriptor getFullDuplexCallMethod() {
+    io.grpc.MethodDescriptor getFullDuplexCallMethod;
     if ((getFullDuplexCallMethod = TestServiceGrpc.getFullDuplexCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getFullDuplexCallMethod = TestServiceGrpc.getFullDuplexCallMethod) == null) {
           TestServiceGrpc.getFullDuplexCallMethod = getFullDuplexCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.BIDI_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullDuplexCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
+                  Messages.StreamingOutputCallRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
+                  Messages.StreamingOutputCallResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullDuplexCall"))
               .build();
         }
@@ -205,29 +211,29 @@ io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getFullDuplexC
     return getFullDuplexCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getHalfDuplexCallMethod;
+  private static volatile io.grpc.MethodDescriptor getHalfDuplexCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "HalfDuplexCall",
-      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
-  public static io.grpc.MethodDescriptor getHalfDuplexCallMethod() {
-    io.grpc.MethodDescriptor getHalfDuplexCallMethod;
+      requestType = Messages.StreamingOutputCallRequest.class,
+      responseType = Messages.StreamingOutputCallResponse.class,
+      methodType = MethodType.BIDI_STREAMING)
+  public static io.grpc.MethodDescriptor getHalfDuplexCallMethod() {
+    io.grpc.MethodDescriptor getHalfDuplexCallMethod;
     if ((getHalfDuplexCallMethod = TestServiceGrpc.getHalfDuplexCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getHalfDuplexCallMethod = TestServiceGrpc.getHalfDuplexCallMethod) == null) {
           TestServiceGrpc.getHalfDuplexCallMethod = getHalfDuplexCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.BIDI_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfDuplexCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
+                  Messages.StreamingOutputCallRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
+                  Messages.StreamingOutputCallResponse.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfDuplexCall"))
               .build();
         }
@@ -236,29 +242,29 @@ io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getHalfDuplexC
     return getHalfDuplexCallMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor getUnimplementedCallMethod;
+  private static volatile io.grpc.MethodDescriptor getUnimplementedCallMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "UnimplementedCall",
-      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      responseType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor getUnimplementedCallMethod() {
-    io.grpc.MethodDescriptor getUnimplementedCallMethod;
+      requestType = EmptyProtos.Empty.class,
+      responseType = EmptyProtos.Empty.class,
+      methodType = MethodType.UNARY)
+  public static io.grpc.MethodDescriptor getUnimplementedCallMethod() {
+    io.grpc.MethodDescriptor getUnimplementedCallMethod;
     if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) {
       synchronized (TestServiceGrpc.class) {
         if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) {
           TestServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod =
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnimplementedCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
+                  EmptyProtos.Empty.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
+                  EmptyProtos.Empty.getDefaultInstance()))
               .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall"))
               .build();
         }
@@ -311,21 +317,114 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
     return TestServiceFutureStub.newStub(factory, channel);
   }
 
+  public interface TestService {
+    /**
+     * 
+     * One empty request followed by one empty response.
+     * 

+     */
+    default void emptyCall(EmptyProtos.Empty request,
+                           StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * One request followed by one response.
+     * 

+     */
+    default void unaryCall(Messages.SimpleRequest request,
+                           StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * One request followed by one response. Response has cache control
+     * headers set such that a caching HTTP proxy (such as GFE) can
+     * satisfy subsequent requests.
+     * 

+     */
+    default void cacheableUnaryCall(Messages.SimpleRequest request,
+                                    StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     * 

+     */
+    default void streamingOutputCall(Messages.StreamingOutputCallRequest request,
+                                     StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * A sequence of requests followed by one response (streamed upload).
+     * The server returns the aggregated size of client payload as the result.
+     * 

+     */
+    default StreamObserver streamingInputCall(
+        StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * A sequence of requests with each request served by the server immediately.
+     * As one request could lead to multiple responses, this interface
+     * demonstrates the idea of full duplexing.
+     * 

+     */
+    default StreamObserver fullDuplexCall(
+        StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * A sequence of requests followed by a sequence of responses.
+     * The server buffers all the client requests and then serves them in order. A
+     * stream of responses are returned to the client when the server starts with
+     * first request.
+     * 

+     */
+    default StreamObserver halfDuplexCall(
+        StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+
+    /**
+     * 
+     * The test server will not implement this method. It will be used
+     * to test the behavior when clients call unimplemented methods.
+     * 

+     */
+    default void unimplementedCall(EmptyProtos.Empty request,
+                                   StreamObserver responseObserver) {
+      throw new NotImplementedException();
+    }
+  }
+
   /**
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    * 

    */
-  public static abstract class TestServiceImplBase implements io.grpc.BindableService {
+  public static abstract class TestServiceImplBase implements io.grpc.BindableService, TestService {
 
     /**
      * 
      * One empty request followed by one empty response.
      * 

      */
-    public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request,
-        io.grpc.stub.StreamObserver responseObserver) {
+    @Override
+    public void emptyCall(EmptyProtos.Empty request,
+                          io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver);
     }
 
@@ -334,8 +433,9 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request,
      * One request followed by one response.
      *
*/ - public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + @Override + public void unaryCall(Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -346,8 +446,9 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + @Override + public void cacheableUnaryCall(Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -357,8 +458,9 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + @Override + public void streamingOutputCall(Messages.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -368,8 +470,9 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { + @Override + public io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } @@ -380,8 +483,9 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + @Override + public io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } @@ -393,8 +497,9 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + @Override + public io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } @@ -404,8 +509,9 @@ public io.grpc.stub.StreamObserver */ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + @Override + public void unimplementedCall(EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } @@ -415,57 +521,57 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ getEmptyCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( + EmptyProtos.Empty, + EmptyProtos.Empty>( this, METHODID_EMPTY_CALL))) .addMethod( getUnaryCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( + Messages.SimpleRequest, + Messages.SimpleResponse>( this, METHODID_UNARY_CALL))) .addMethod( getCacheableUnaryCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( + Messages.SimpleRequest, + Messages.SimpleResponse>( this, METHODID_CACHEABLE_UNARY_CALL))) .addMethod( getStreamingOutputCallMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + Messages.StreamingOutputCallRequest, + Messages.StreamingOutputCallResponse>( this, METHODID_STREAMING_OUTPUT_CALL))) .addMethod( getStreamingInputCallMethod(), io.grpc.stub.ServerCalls.asyncClientStreamingCall( new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingInputCallRequest, - io.grpc.testing.integration.Messages.StreamingInputCallResponse>( + Messages.StreamingInputCallRequest, + Messages.StreamingInputCallResponse>( this, METHODID_STREAMING_INPUT_CALL))) .addMethod( getFullDuplexCallMethod(), io.grpc.stub.ServerCalls.asyncBidiStreamingCall( new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + Messages.StreamingOutputCallRequest, + Messages.StreamingOutputCallResponse>( this, METHODID_FULL_DUPLEX_CALL))) .addMethod( getHalfDuplexCallMethod(), io.grpc.stub.ServerCalls.asyncBidiStreamingCall( new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + Messages.StreamingOutputCallRequest, + Messages.StreamingOutputCallResponse>( this, METHODID_HALF_DUPLEX_CALL))) .addMethod( getUnimplementedCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( + EmptyProtos.Empty, + EmptyProtos.Empty>( this, METHODID_UNIMPLEMENTED_CALL))) .build(); } @@ -477,7 +583,8 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * performance with various types of payload. * */ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub + implements TestService { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -494,8 +601,8 @@ protected TestServiceStub build( * One empty request followed by one empty response. * */ - public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void emptyCall(EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getEmptyCallMethod(), getCallOptions()), request, responseObserver); } @@ -505,8 +612,8 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ - public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void unaryCall(Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -518,8 +625,8 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void cacheableUnaryCall(Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCacheableUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -530,8 +637,8 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void streamingOutputCall(Messages.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( getChannel().newCall(getStreamingOutputCallMethod(), getCallOptions()), request, responseObserver); } @@ -542,8 +649,8 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( getChannel().newCall(getStreamingInputCallMethod(), getCallOptions()), responseObserver); } @@ -555,8 +662,8 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( getChannel().newCall(getFullDuplexCallMethod(), getCallOptions()), responseObserver); } @@ -569,8 +676,8 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( getChannel().newCall(getHalfDuplexCallMethod(), getCallOptions()), responseObserver); } @@ -581,20 +688,74 @@ public io.grpc.stub.StreamObserver */ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void unimplementedCall(EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUnimplementedCallMethod(), getCallOptions()), request, responseObserver); } } + public interface TestServiceBlocking { + /** + * 
+     * One empty request followed by one empty response.
+     *
+ */ + default EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { + throw new NotImplementedException(); + } + + /** + * 
+     * One request followed by one response.
+     *
+ */ + default Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { + throw new NotImplementedException(); + } + + /** + * 
+     * One request followed by one response. Response has cache control
+     * headers set such that a caching HTTP proxy (such as GFE) can
+     * satisfy subsequent requests.
+     *
+ */ + default Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request) { + throw new NotImplementedException(); + } + + /** + * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     *
+ */ + default java.util.Iterator streamingOutputCall( + Messages.StreamingOutputCallRequest request) { + throw new NotImplementedException(); + } + + /** + * 
+     * The test server will not implement this method. It will be used
+     * to test the behavior when clients call unimplemented methods.
+     *
+ */ + default EmptyProtos.Empty unimplementedCall(EmptyProtos.Empty request) { + throw new NotImplementedException(); + } + } + /** * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class TestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements TestServiceBlocking { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -611,7 +772,8 @@ protected TestServiceBlockingStub build( * One empty request followed by one empty response. * */ - public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { + @Override + public EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getEmptyCallMethod(), getCallOptions(), request); } @@ -621,7 +783,8 @@ public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.i * One request followed by one response. * */ - public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { + @Override + public Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); } @@ -633,7 +796,8 @@ public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.tes * satisfy subsequent requests. * */ - public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { + @Override + public Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCacheableUnaryCallMethod(), getCallOptions(), request); } @@ -644,8 +808,9 @@ public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io * The server returns the payload with client desired type and sizes. * */ - public java.util.Iterator streamingOutputCall( - io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { + @Override + public java.util.Iterator streamingOutputCall( + Messages.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( getChannel(), getStreamingOutputCallMethod(), getCallOptions(), request); } @@ -656,19 +821,67 @@ public java.util.Iterator */ - public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { + @Override + public EmptyProtos.Empty unimplementedCall(EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); } } + public interface TestServiceFuture { + /** + * 
+     * One empty request followed by one empty response.
+     *
+ */ + default ListenableFuture emptyCall( + EmptyProtos.Empty request) { + throw new NotImplementedException(); + } + + /** + * 
+     * One request followed by one response.
+     *
+ */ + default ListenableFuture unaryCall( + Messages.SimpleRequest request) { + throw new NotImplementedException(); + } + + /** + * 
+     * One request followed by one response. Response has cache control
+     * headers set such that a caching HTTP proxy (such as GFE) can
+     * satisfy subsequent requests.
+     *
+ */ + default ListenableFuture cacheableUnaryCall( + Messages.SimpleRequest request) { + throw new NotImplementedException(); + } + + /** + * 
+     * The test server will not implement this method. It will be used
+     * to test the behavior when clients call unimplemented methods.
+     *
+ */ + default ListenableFuture unimplementedCall( + EmptyProtos.Empty request) { + throw new NotImplementedException(); + } + } + /** * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class TestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements TestServiceFuture { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -685,8 +898,9 @@ protected TestServiceFutureStub build( * One empty request followed by one empty response. * */ - public com.google.common.util.concurrent.ListenableFuture emptyCall( - io.grpc.testing.integration.EmptyProtos.Empty request) { + @Override + public com.google.common.util.concurrent.ListenableFuture emptyCall( + EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getEmptyCallMethod(), getCallOptions()), request); } @@ -696,8 +910,9 @@ public com.google.common.util.concurrent.ListenableFuture */ - public com.google.common.util.concurrent.ListenableFuture unaryCall( - io.grpc.testing.integration.Messages.SimpleRequest request) { + @Override + public com.google.common.util.concurrent.ListenableFuture unaryCall( + Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getUnaryCallMethod(), getCallOptions()), request); } @@ -709,8 +924,9 @@ public com.google.common.util.concurrent.ListenableFuture */ - public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( - io.grpc.testing.integration.Messages.SimpleRequest request) { + @Override + public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( + Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCacheableUnaryCallMethod(), getCallOptions()), request); } @@ -721,8 +937,9 @@ public com.google.common.util.concurrent.ListenableFuture */ - public com.google.common.util.concurrent.ListenableFuture unimplementedCall( - io.grpc.testing.integration.EmptyProtos.Empty request) { + @Override + public com.google.common.util.concurrent.ListenableFuture unimplementedCall( + EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getUnimplementedCallMethod(), getCallOptions()), request); } @@ -755,24 +972,24 @@ private static final class MethodHandlers implements public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { case METHODID_EMPTY_CALL: - serviceImpl.emptyCall((io.grpc.testing.integration.EmptyProtos.Empty) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.emptyCall((EmptyProtos.Empty) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_UNARY_CALL: - serviceImpl.unaryCall((io.grpc.testing.integration.Messages.SimpleRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.unaryCall((Messages.SimpleRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_CACHEABLE_UNARY_CALL: - serviceImpl.cacheableUnaryCall((io.grpc.testing.integration.Messages.SimpleRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.cacheableUnaryCall((Messages.SimpleRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_STREAMING_OUTPUT_CALL: - serviceImpl.streamingOutputCall((io.grpc.testing.integration.Messages.StreamingOutputCallRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.streamingOutputCall((Messages.StreamingOutputCallRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_UNIMPLEMENTED_CALL: - serviceImpl.unimplementedCall((io.grpc.testing.integration.EmptyProtos.Empty) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.unimplementedCall((EmptyProtos.Empty) request, + (io.grpc.stub.StreamObserver) responseObserver); break; default: throw new AssertionError(); @@ -786,13 +1003,13 @@ public io.grpc.stub.StreamObserver invoke( switch (methodId) { case METHODID_STREAMING_INPUT_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.streamingInputCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); case METHODID_FULL_DUPLEX_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.fullDuplexCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); case METHODID_HALF_DUPLEX_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.halfDuplexCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); default: throw new AssertionError(); } @@ -805,7 +1022,7 @@ private static abstract class TestServiceBaseDescriptorSupplier @java.lang.Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return io.grpc.testing.integration.Test.getDescriptor(); + return Test.getDescriptor(); } @java.lang.Override From 2dce4a5a63d0e48ea87e535537a9d259a1fc236f Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 25 Oct 2022 15:46:03 -0700 Subject: [PATCH 02/42] Eliminate all added imports from generated file. Rename TestService to TestServiceAsync Change TestServiceAsync default implementations to be copies of TestServiceImplBase's Change exception type thrown by default implementations of Blocking and Future interaces to UnsupportedOperationException --- .../testing/integration/TestServiceGrpc.java | 109 +++++++++--------- 1 file changed, 52 insertions(+), 57 deletions(-) diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index c462a96e745..4db97c6f673 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -2,12 +2,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; -import com.google.common.util.concurrent.ListenableFuture; -import io.grpc.MethodDescriptor.MethodType; -import io.grpc.stub.StreamObserver; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - - /** * 
  * A simple service to test the various types of RPCs and experiment with
@@ -32,7 +26,7 @@ private TestServiceGrpc() {}
       fullMethodName = SERVICE_NAME + '/' + "EmptyCall",
       requestType = EmptyProtos.Empty.class,
       responseType = EmptyProtos.Empty.class,
-      methodType = MethodType.UNARY)
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor getEmptyCallMethod() {
     io.grpc.MethodDescriptor getEmptyCallMethod;
@@ -41,7 +35,7 @@ EmptyProtos.Empty> getEmptyCallMethod() {
         if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) {
           TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.UNARY)
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EmptyCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -63,7 +57,7 @@ EmptyProtos.Empty> getEmptyCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "UnaryCall",
       requestType = Messages.SimpleRequest.class,
       responseType = Messages.SimpleResponse.class,
-      methodType = MethodType.UNARY)
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor getUnaryCallMethod() {
     io.grpc.MethodDescriptor getUnaryCallMethod;
@@ -72,7 +66,7 @@ Messages.SimpleResponse> getUnaryCallMethod() {
         if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) {
           TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.UNARY)
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -94,7 +88,7 @@ Messages.SimpleResponse> getUnaryCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "CacheableUnaryCall",
       requestType = Messages.SimpleRequest.class,
       responseType = Messages.SimpleResponse.class,
-      methodType = MethodType.UNARY)
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor getCacheableUnaryCallMethod() {
     io.grpc.MethodDescriptor getCacheableUnaryCallMethod;
@@ -103,7 +97,7 @@ Messages.SimpleResponse> getCacheableUnaryCallMethod() {
         if ((getCacheableUnaryCallMethod = TestServiceGrpc.getCacheableUnaryCallMethod) == null) {
           TestServiceGrpc.getCacheableUnaryCallMethod = getCacheableUnaryCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.UNARY)
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CacheableUnaryCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -125,7 +119,7 @@ Messages.SimpleResponse> getCacheableUnaryCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "StreamingOutputCall",
       requestType = Messages.StreamingOutputCallRequest.class,
       responseType = Messages.StreamingOutputCallResponse.class,
-      methodType = MethodType.SERVER_STREAMING)
+      methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor getStreamingOutputCallMethod() {
     io.grpc.MethodDescriptor getStreamingOutputCallMethod;
@@ -134,7 +128,7 @@ Messages.StreamingOutputCallResponse> getStreamingOutputCallMethod() {
         if ((getStreamingOutputCallMethod = TestServiceGrpc.getStreamingOutputCallMethod) == null) {
           TestServiceGrpc.getStreamingOutputCallMethod = getStreamingOutputCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.SERVER_STREAMING)
+              .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -156,7 +150,7 @@ Messages.StreamingOutputCallResponse> getStreamingOutputCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "StreamingInputCall",
       requestType = Messages.StreamingInputCallRequest.class,
       responseType = Messages.StreamingInputCallResponse.class,
-      methodType = MethodType.CLIENT_STREAMING)
+      methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor getStreamingInputCallMethod() {
     io.grpc.MethodDescriptor getStreamingInputCallMethod;
@@ -165,7 +159,7 @@ Messages.StreamingInputCallResponse> getStreamingInputCallMethod() {
         if ((getStreamingInputCallMethod = TestServiceGrpc.getStreamingInputCallMethod) == null) {
           TestServiceGrpc.getStreamingInputCallMethod = getStreamingInputCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.CLIENT_STREAMING)
+              .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -187,7 +181,7 @@ Messages.StreamingInputCallResponse> getStreamingInputCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "FullDuplexCall",
       requestType = Messages.StreamingOutputCallRequest.class,
       responseType = Messages.StreamingOutputCallResponse.class,
-      methodType = MethodType.BIDI_STREAMING)
+      methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor getFullDuplexCallMethod() {
     io.grpc.MethodDescriptor getFullDuplexCallMethod;
@@ -196,7 +190,7 @@ Messages.StreamingOutputCallResponse> getFullDuplexCallMethod() {
         if ((getFullDuplexCallMethod = TestServiceGrpc.getFullDuplexCallMethod) == null) {
           TestServiceGrpc.getFullDuplexCallMethod = getFullDuplexCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.BIDI_STREAMING)
+              .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullDuplexCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -218,7 +212,7 @@ Messages.StreamingOutputCallResponse> getFullDuplexCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "HalfDuplexCall",
       requestType = Messages.StreamingOutputCallRequest.class,
       responseType = Messages.StreamingOutputCallResponse.class,
-      methodType = MethodType.BIDI_STREAMING)
+      methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor getHalfDuplexCallMethod() {
     io.grpc.MethodDescriptor getHalfDuplexCallMethod;
@@ -227,7 +221,7 @@ Messages.StreamingOutputCallResponse> getHalfDuplexCallMethod() {
         if ((getHalfDuplexCallMethod = TestServiceGrpc.getHalfDuplexCallMethod) == null) {
           TestServiceGrpc.getHalfDuplexCallMethod = getHalfDuplexCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.BIDI_STREAMING)
+              .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfDuplexCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -249,7 +243,7 @@ Messages.StreamingOutputCallResponse> getHalfDuplexCallMethod() {
       fullMethodName = SERVICE_NAME + '/' + "UnimplementedCall",
       requestType = EmptyProtos.Empty.class,
       responseType = EmptyProtos.Empty.class,
-      methodType = MethodType.UNARY)
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor getUnimplementedCallMethod() {
     io.grpc.MethodDescriptor getUnimplementedCallMethod;
@@ -258,7 +252,7 @@ EmptyProtos.Empty> getUnimplementedCallMethod() {
         if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) {
           TestServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod =
               io.grpc.MethodDescriptor.newBuilder()
-              .setType(MethodType.UNARY)
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnimplementedCall"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -317,15 +311,15 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
     return TestServiceFutureStub.newStub(factory, channel);
   }
 
-  public interface TestService {
+  public interface TestServiceAsync {
     /**
      * 
      * One empty request followed by one empty response.
      * 

      */
     default void emptyCall(EmptyProtos.Empty request,
-                           StreamObserver responseObserver) {
-      throw new NotImplementedException();
+                           io.grpc.stub.StreamObserver responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver);
     }
 
     /**
@@ -334,8 +328,8 @@ default void emptyCall(EmptyProtos.Empty request,
      *
*/ default void unaryCall(Messages.SimpleRequest request, - StreamObserver responseObserver) { - throw new NotImplementedException(); + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } /** @@ -346,8 +340,8 @@ default void unaryCall(Messages.SimpleRequest request, * */ default void cacheableUnaryCall(Messages.SimpleRequest request, - StreamObserver responseObserver) { - throw new NotImplementedException(); + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } /** @@ -357,8 +351,8 @@ default void cacheableUnaryCall(Messages.SimpleRequest request, * */ default void streamingOutputCall(Messages.StreamingOutputCallRequest request, - StreamObserver responseObserver) { - throw new NotImplementedException(); + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } /** @@ -367,9 +361,9 @@ default void streamingOutputCall(Messages.StreamingOutputCallRequest request, * The server returns the aggregated size of client payload as the result. * */ - default StreamObserver streamingInputCall( - StreamObserver responseObserver) { - throw new NotImplementedException(); + default io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } /** @@ -379,9 +373,9 @@ default StreamObserver streamingInputCall( * demonstrates the idea of full duplexing. * */ - default StreamObserver fullDuplexCall( - StreamObserver responseObserver) { - throw new NotImplementedException(); + default io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } /** @@ -392,9 +386,9 @@ default StreamObserver fullDuplexCall( * first request. * */ - default StreamObserver halfDuplexCall( - StreamObserver responseObserver) { - throw new NotImplementedException(); + default io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } /** @@ -404,8 +398,8 @@ default StreamObserver halfDuplexCall( * */ default void unimplementedCall(EmptyProtos.Empty request, - StreamObserver responseObserver) { - throw new NotImplementedException(); + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } } @@ -415,7 +409,8 @@ default void unimplementedCall(EmptyProtos.Empty request, * performance with various types of payload. * */ - public static abstract class TestServiceImplBase implements io.grpc.BindableService, TestService { + public static abstract class TestServiceImplBase + implements io.grpc.BindableService, TestServiceAsync { /** * 
@@ -584,7 +579,7 @@ public void unimplementedCall(EmptyProtos.Empty request,
    *
*/ public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub - implements TestService { + implements TestServiceAsync { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -702,7 +697,7 @@ public interface TestServiceBlocking { * */ default EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -711,7 +706,7 @@ default EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { * */ default Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -722,7 +717,7 @@ default Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { * */ default Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -733,7 +728,7 @@ default Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest reques */ default java.util.Iterator streamingOutputCall( Messages.StreamingOutputCallRequest request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -743,7 +738,7 @@ default java.util.Iterator streamingOutput * */ default EmptyProtos.Empty unimplementedCall(EmptyProtos.Empty request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } } @@ -834,9 +829,9 @@ public interface TestServiceFuture { * One empty request followed by one empty response. * */ - default ListenableFuture emptyCall( + default com.google.common.util.concurrent.ListenableFuture emptyCall( EmptyProtos.Empty request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -844,9 +839,9 @@ default ListenableFuture emptyCall( * One request followed by one response. * */ - default ListenableFuture unaryCall( + default com.google.common.util.concurrent.ListenableFuture unaryCall( Messages.SimpleRequest request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -856,9 +851,9 @@ default ListenableFuture unaryCall( * satisfy subsequent requests. * */ - default ListenableFuture cacheableUnaryCall( + default com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( Messages.SimpleRequest request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } /** @@ -867,9 +862,9 @@ default ListenableFuture cacheableUnaryCall( * to test the behavior when clients call unimplemented methods. * */ - default ListenableFuture unimplementedCall( + default com.google.common.util.concurrent.ListenableFuture unimplementedCall( EmptyProtos.Empty request) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } } From 93fa7e790966735f6e707a05960c8ed05ae0d99c Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 26 Oct 2022 14:58:50 -0700 Subject: [PATCH 03/42] compiler: Checkpoint --- .../src/java_plugin/cpp/java_generator.cpp | 129 +++++++++--------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 3bb56ae12ee..8269941a9d8 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -534,73 +534,80 @@ static void PrintStub( Printer* p, StubType type) { const std::string service_name = service->name(); (*vars)["service_name"] = service_name; - (*vars)["abstract_name"] = service_name + "ImplBase"; std::string stub_name = service_name; - std::string client_name = service_name; std::string stub_base_class_name = "AbstractStub"; + std::string interface_name = service_name; CallType call_type; bool impl_base = false; bool interface = false; switch (type) { + case ASYNC_INTERFACE: + call_type = ASYNC_CALL; + interface = true; + impl_base = true; + stub_name += "Async"; + break; case ABSTRACT_CLASS: call_type = ASYNC_CALL; impl_base = true; + interface_name += "Async" + (*vars)["abstract_name"] = service_name + "ImplBase"; break; case ASYNC_CLIENT_IMPL: call_type = ASYNC_CALL; stub_name += "Stub"; stub_base_class_name = "AbstractAsyncStub"; + interface_name += "Async" break; case BLOCKING_CLIENT_INTERFACE: interface = true; - FALLTHROUGH; + call_type = BLOCKING_CALL; + stub_name += "Blocking" case BLOCKING_CLIENT_IMPL: call_type = BLOCKING_CALL; stub_name += "BlockingStub"; - client_name += "BlockingClient"; stub_base_class_name = "AbstractBlockingStub"; + interface_name += "Blocking" break; case FUTURE_CLIENT_INTERFACE: interface = true; - FALLTHROUGH; + call_type = FUTURE_CALL; + stub_name += "Future"; case FUTURE_CLIENT_IMPL: call_type = FUTURE_CALL; stub_name += "FutureStub"; - client_name += "FutureClient"; stub_base_class_name = "AbstractFutureStub"; - break; - case ASYNC_INTERFACE: - call_type = ASYNC_CALL; - interface = true; - stub_name += "Stub"; - stub_base_class_name = "AbstractAsyncStub"; + interface_name += "Future" break; default: GRPC_CODEGEN_FAIL << "Cannot determine class name for StubType: " << type; } (*vars)["stub_name"] = stub_name; - (*vars)["client_name"] = client_name; (*vars)["stub_base_class_name"] = (*vars)[stub_base_class_name]; + (*vars)["interface_name"] = interface_name; // Class head - if (!interface) { GrpcWriteServiceDocComment(p, service); - } if (service->options().deprecated()) { p->Print(*vars, "@$Deprecated$\n"); } - if (impl_base) { + if (interface) { + p->Print( + *vars, + "public interface $stub_name$ {\n"); + } else if (impl_base){ p->Print( *vars, "public static abstract class $abstract_name$" - " implements $BindableService$ {\n"); + " implements $BindableService$, $interface_name$ {\n"); } else { p->Print( *vars, "public static final class $stub_name$" - " extends $stub_base_class_name$<$stub_name$> {\n"); + " extends $stub_base_class_name$<$stub_name$>\n" + " implements $interface_name$ {\n"); } p->Indent(); @@ -631,36 +638,38 @@ static void PrintStub( // RPC methods for (int i = 0; i < service->method_count(); ++i) { - const MethodDescriptor* method = service->method(i); - (*vars)["input_type"] = MessageFullJavaName(method->input_type()); - (*vars)["output_type"] = MessageFullJavaName(method->output_type()); - (*vars)["lower_method_name"] = LowerMethodName(method); - (*vars)["method_method_name"] = MethodPropertiesGetterName(method); - bool client_streaming = method->client_streaming(); - bool server_streaming = method->server_streaming(); - - if (call_type == BLOCKING_CALL && client_streaming) { - // Blocking client interface with client streaming is not available - continue; - } + const MethodDescriptor *method = service->method(i); + (*vars)["input_type"] = MessageFullJavaName(method->input_type()); + (*vars)["output_type"] = MessageFullJavaName(method->output_type()); + (*vars)["lower_method_name"] = LowerMethodName(method); + (*vars)["method_method_name"] = MethodPropertiesGetterName(method); + bool client_streaming = method->client_streaming(); + bool server_streaming = method->server_streaming(); + + if (call_type == BLOCKING_CALL && client_streaming) { + // Blocking client interface with client streaming is not available + continue; + } - if (call_type == FUTURE_CALL && (client_streaming || server_streaming)) { - // Future interface doesn't support streaming. - continue; - } + if (call_type == FUTURE_CALL && (client_streaming || server_streaming)) { + // Future interface doesn't support streaming. + continue; + } - // Method signature - p->Print("\n"); - // TODO(nmittler): Replace with WriteMethodDocComment once included by the protobuf distro. - if (!interface) { + // Method signature + p->Print("\n"); + // TODO(nmittler): Replace with WriteMethodDocComment once included by the protobuf distro. GrpcWriteMethodDocComment(p, method); - } - if (method->options().deprecated()) { - p->Print(*vars, "@$Deprecated$\n"); - } + if (method->options().deprecated()) { + p->Print(*vars, "@$Deprecated$\n"); + } - p->Print("public "); + if (!interface) { + p->Print("public "); + } else { + p->Print("default "); + } switch (call_type) { case BLOCKING_CALL: GRPC_CODEGEN_CHECK(!client_streaming) @@ -705,32 +714,22 @@ static void PrintStub( break; } - if (interface) { - p->Print(";\n"); - continue; - } // Method body. p->Print(" {\n"); p->Indent(); if (impl_base) { - switch (call_type) { // NB: Skipping validation of service methods. If something is wrong, we wouldn't get to // this point as compiler would return errors when generating service interface. - case ASYNC_CALL: - if (client_streaming) { - p->Print( - *vars, - "return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(" - "$method_method_name$(), responseObserver);\n"); - } else { - p->Print( - *vars, - "io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(" - "$method_method_name$(), responseObserver);\n"); - } - break; - default: - break; + if (client_streaming) { + p->Print( + *vars, + "return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(" + "$method_method_name$(), responseObserver);\n"); + } else { + p->Print( + *vars, + "io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(" + "$method_method_name$(), responseObserver);\n"); } } else if (!interface) { switch (call_type) { @@ -785,12 +784,14 @@ static void PrintStub( " getChannel().newCall($method_method_name$(), getCallOptions()), request);\n"); break; } + } else { + p->Print("throw new UnsupportedOperationException();\n") } p->Outdent(); p->Print("}\n"); } - if (impl_base) { + if (impl_base && !interface) { p->Print("\n"); p->Print( *vars, From e1a8c5a9435cbb21b031bf29401a24a4a88a8036 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 26 Oct 2022 15:03:06 -0700 Subject: [PATCH 04/42] compiler: Checkpoint --- compiler/src/java_plugin/cpp/java_generator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 8269941a9d8..dfc335be9f8 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -550,14 +550,14 @@ static void PrintStub( case ABSTRACT_CLASS: call_type = ASYNC_CALL; impl_base = true; - interface_name += "Async" + interface_name += "Async"; (*vars)["abstract_name"] = service_name + "ImplBase"; break; case ASYNC_CLIENT_IMPL: call_type = ASYNC_CALL; stub_name += "Stub"; stub_base_class_name = "AbstractAsyncStub"; - interface_name += "Async" + interface_name += "Async"; break; case BLOCKING_CLIENT_INTERFACE: interface = true; @@ -567,7 +567,7 @@ static void PrintStub( call_type = BLOCKING_CALL; stub_name += "BlockingStub"; stub_base_class_name = "AbstractBlockingStub"; - interface_name += "Blocking" + interface_name += "Blocking"; break; case FUTURE_CLIENT_INTERFACE: interface = true; @@ -577,7 +577,7 @@ static void PrintStub( call_type = FUTURE_CALL; stub_name += "FutureStub"; stub_base_class_name = "AbstractFutureStub"; - interface_name += "Future" + interface_name += "Future"; break; default: GRPC_CODEGEN_FAIL << "Cannot determine class name for StubType: " << type; From a217114e1b30bc85a4be048f48874ea8b37b3205 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 26 Oct 2022 15:05:44 -0700 Subject: [PATCH 05/42] compiler: Checkpoint --- compiler/src/java_plugin/cpp/java_generator.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index dfc335be9f8..dabb806396e 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -562,7 +562,8 @@ static void PrintStub( case BLOCKING_CLIENT_INTERFACE: interface = true; call_type = BLOCKING_CALL; - stub_name += "Blocking" + stub_name += "Blocking"; + break; case BLOCKING_CLIENT_IMPL: call_type = BLOCKING_CALL; stub_name += "BlockingStub"; @@ -573,6 +574,7 @@ static void PrintStub( interface = true; call_type = FUTURE_CALL; stub_name += "Future"; + break; case FUTURE_CLIENT_IMPL: call_type = FUTURE_CALL; stub_name += "FutureStub"; @@ -785,7 +787,7 @@ static void PrintStub( break; } } else { - p->Print("throw new UnsupportedOperationException();\n") + p->Print("throw new UnsupportedOperationException();\n"); } p->Outdent(); p->Print("}\n"); From cf5f1e2d5a0970dd1d6f3cf636ddae0dceed1717 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 26 Oct 2022 15:11:45 -0700 Subject: [PATCH 06/42] compiler: Checkpoint --- compiler/src/java_plugin/cpp/java_generator.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index dabb806396e..35cc70be849 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -1159,9 +1159,12 @@ static void PrintService(const ServiceDescriptor* service, p->Outdent(); p->Print("}\n\n"); + PrintStub(service, vars, p, ASYNC_INTERFACE); PrintStub(service, vars, p, ABSTRACT_CLASS); PrintStub(service, vars, p, ASYNC_CLIENT_IMPL); + PrintStub(service, vars, p, BLOCKING_CLIENT_INTERFACE); PrintStub(service, vars, p, BLOCKING_CLIENT_IMPL); + PrintStub(service, vars, p, FUTURE_CLIENT_INTERFACE); PrintStub(service, vars, p, FUTURE_CLIENT_IMPL); PrintMethodHandlerClass(service, vars, p); From 9b425fe68ad8bb5f77032aaf47b1f2a892dbb63d Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 9 Nov 2022 15:04:52 -0800 Subject: [PATCH 07/42] Use fully qualified class names, even for the current package. --- .../testing/integration/TestServiceGrpc.java | 376 +++++++++--------- 1 file changed, 190 insertions(+), 186 deletions(-) diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 4db97c6f673..d3139ad294a 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -19,29 +19,29 @@ private TestServiceGrpc() {} public static final String SERVICE_NAME = "grpc.testing.TestService"; // Static method descriptors that strictly reflect the proto. - private static volatile io.grpc.MethodDescriptor getEmptyCallMethod; + private static volatile io.grpc.MethodDescriptor getEmptyCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "EmptyCall", - requestType = EmptyProtos.Empty.class, - responseType = EmptyProtos.Empty.class, + requestType = io.grpc.testing.integration.EmptyProtos.Empty.class, + responseType = io.grpc.testing.integration.EmptyProtos.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getEmptyCallMethod() { - io.grpc.MethodDescriptor getEmptyCallMethod; + public static io.grpc.MethodDescriptor getEmptyCallMethod() { + io.grpc.MethodDescriptor getEmptyCallMethod; if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) { TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EmptyCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - EmptyProtos.Empty.getDefaultInstance())) + io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - EmptyProtos.Empty.getDefaultInstance())) + io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall")) .build(); } @@ -50,29 +50,29 @@ EmptyProtos.Empty> getEmptyCallMethod() { return getEmptyCallMethod; } - private static volatile io.grpc.MethodDescriptor getUnaryCallMethod; + private static volatile io.grpc.MethodDescriptor getUnaryCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "UnaryCall", - requestType = Messages.SimpleRequest.class, - responseType = Messages.SimpleResponse.class, + requestType = io.grpc.testing.integration.Messages.SimpleRequest.class, + responseType = io.grpc.testing.integration.Messages.SimpleResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getUnaryCallMethod() { - io.grpc.MethodDescriptor getUnaryCallMethod; + public static io.grpc.MethodDescriptor getUnaryCallMethod() { + io.grpc.MethodDescriptor getUnaryCallMethod; if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.SimpleRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.SimpleResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall")) .build(); } @@ -81,29 +81,29 @@ Messages.SimpleResponse> getUnaryCallMethod() { return getUnaryCallMethod; } - private static volatile io.grpc.MethodDescriptor getCacheableUnaryCallMethod; + private static volatile io.grpc.MethodDescriptor getCacheableUnaryCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "CacheableUnaryCall", - requestType = Messages.SimpleRequest.class, - responseType = Messages.SimpleResponse.class, + requestType = io.grpc.testing.integration.Messages.SimpleRequest.class, + responseType = io.grpc.testing.integration.Messages.SimpleResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getCacheableUnaryCallMethod() { - io.grpc.MethodDescriptor getCacheableUnaryCallMethod; + public static io.grpc.MethodDescriptor getCacheableUnaryCallMethod() { + io.grpc.MethodDescriptor getCacheableUnaryCallMethod; if ((getCacheableUnaryCallMethod = TestServiceGrpc.getCacheableUnaryCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getCacheableUnaryCallMethod = TestServiceGrpc.getCacheableUnaryCallMethod) == null) { TestServiceGrpc.getCacheableUnaryCallMethod = getCacheableUnaryCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CacheableUnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.SimpleRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.SimpleResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("CacheableUnaryCall")) .build(); } @@ -112,29 +112,29 @@ Messages.SimpleResponse> getCacheableUnaryCallMethod() { return getCacheableUnaryCallMethod; } - private static volatile io.grpc.MethodDescriptor getStreamingOutputCallMethod; + private static volatile io.grpc.MethodDescriptor getStreamingOutputCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "StreamingOutputCall", - requestType = Messages.StreamingOutputCallRequest.class, - responseType = Messages.StreamingOutputCallResponse.class, + requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class, + responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - public static io.grpc.MethodDescriptor getStreamingOutputCallMethod() { - io.grpc.MethodDescriptor getStreamingOutputCallMethod; + public static io.grpc.MethodDescriptor getStreamingOutputCallMethod() { + io.grpc.MethodDescriptor getStreamingOutputCallMethod; if ((getStreamingOutputCallMethod = TestServiceGrpc.getStreamingOutputCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getStreamingOutputCallMethod = TestServiceGrpc.getStreamingOutputCallMethod) == null) { TestServiceGrpc.getStreamingOutputCallMethod = getStreamingOutputCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall")) .build(); } @@ -143,29 +143,29 @@ Messages.StreamingOutputCallResponse> getStreamingOutputCallMethod() { return getStreamingOutputCallMethod; } - private static volatile io.grpc.MethodDescriptor getStreamingInputCallMethod; + private static volatile io.grpc.MethodDescriptor getStreamingInputCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "StreamingInputCall", - requestType = Messages.StreamingInputCallRequest.class, - responseType = Messages.StreamingInputCallResponse.class, + requestType = io.grpc.testing.integration.Messages.StreamingInputCallRequest.class, + responseType = io.grpc.testing.integration.Messages.StreamingInputCallResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - public static io.grpc.MethodDescriptor getStreamingInputCallMethod() { - io.grpc.MethodDescriptor getStreamingInputCallMethod; + public static io.grpc.MethodDescriptor getStreamingInputCallMethod() { + io.grpc.MethodDescriptor getStreamingInputCallMethod; if ((getStreamingInputCallMethod = TestServiceGrpc.getStreamingInputCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getStreamingInputCallMethod = TestServiceGrpc.getStreamingInputCallMethod) == null) { TestServiceGrpc.getStreamingInputCallMethod = getStreamingInputCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingInputCallRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingInputCallResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingInputCallResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall")) .build(); } @@ -174,29 +174,29 @@ Messages.StreamingInputCallResponse> getStreamingInputCallMethod() { return getStreamingInputCallMethod; } - private static volatile io.grpc.MethodDescriptor getFullDuplexCallMethod; + private static volatile io.grpc.MethodDescriptor getFullDuplexCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "FullDuplexCall", - requestType = Messages.StreamingOutputCallRequest.class, - responseType = Messages.StreamingOutputCallResponse.class, + requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class, + responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - public static io.grpc.MethodDescriptor getFullDuplexCallMethod() { - io.grpc.MethodDescriptor getFullDuplexCallMethod; + public static io.grpc.MethodDescriptor getFullDuplexCallMethod() { + io.grpc.MethodDescriptor getFullDuplexCallMethod; if ((getFullDuplexCallMethod = TestServiceGrpc.getFullDuplexCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getFullDuplexCallMethod = TestServiceGrpc.getFullDuplexCallMethod) == null) { TestServiceGrpc.getFullDuplexCallMethod = getFullDuplexCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullDuplexCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullDuplexCall")) .build(); } @@ -205,29 +205,29 @@ Messages.StreamingOutputCallResponse> getFullDuplexCallMethod() { return getFullDuplexCallMethod; } - private static volatile io.grpc.MethodDescriptor getHalfDuplexCallMethod; + private static volatile io.grpc.MethodDescriptor getHalfDuplexCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "HalfDuplexCall", - requestType = Messages.StreamingOutputCallRequest.class, - responseType = Messages.StreamingOutputCallResponse.class, + requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class, + responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - public static io.grpc.MethodDescriptor getHalfDuplexCallMethod() { - io.grpc.MethodDescriptor getHalfDuplexCallMethod; + public static io.grpc.MethodDescriptor getHalfDuplexCallMethod() { + io.grpc.MethodDescriptor getHalfDuplexCallMethod; if ((getHalfDuplexCallMethod = TestServiceGrpc.getHalfDuplexCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getHalfDuplexCallMethod = TestServiceGrpc.getHalfDuplexCallMethod) == null) { TestServiceGrpc.getHalfDuplexCallMethod = getHalfDuplexCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfDuplexCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallRequest.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Messages.StreamingOutputCallResponse.getDefaultInstance())) + io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfDuplexCall")) .build(); } @@ -236,29 +236,29 @@ Messages.StreamingOutputCallResponse> getHalfDuplexCallMethod() { return getHalfDuplexCallMethod; } - private static volatile io.grpc.MethodDescriptor getUnimplementedCallMethod; + private static volatile io.grpc.MethodDescriptor getUnimplementedCallMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "UnimplementedCall", - requestType = EmptyProtos.Empty.class, - responseType = EmptyProtos.Empty.class, + requestType = io.grpc.testing.integration.EmptyProtos.Empty.class, + responseType = io.grpc.testing.integration.EmptyProtos.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getUnimplementedCallMethod() { - io.grpc.MethodDescriptor getUnimplementedCallMethod; + public static io.grpc.MethodDescriptor getUnimplementedCallMethod() { + io.grpc.MethodDescriptor getUnimplementedCallMethod; if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) { TestServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnimplementedCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - EmptyProtos.Empty.getDefaultInstance())) + io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - EmptyProtos.Empty.getDefaultInstance())) + io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall")) .build(); } @@ -317,8 +317,8 @@ public interface TestServiceAsync { * One empty request followed by one empty response. * */ - default void emptyCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + default void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -327,8 +327,8 @@ default void emptyCall(EmptyProtos.Empty request, * One request followed by one response. * */ - default void unaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -339,8 +339,8 @@ default void unaryCall(Messages.SimpleRequest request, * satisfy subsequent requests. * */ - default void cacheableUnaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -350,8 +350,8 @@ default void cacheableUnaryCall(Messages.SimpleRequest request, * The server returns the payload with client desired type and sizes. * */ - default void streamingOutputCall(Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -361,8 +361,8 @@ default void streamingOutputCall(Messages.StreamingOutputCallRequest request, * The server returns the aggregated size of client payload as the result. * */ - default io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { + default io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } @@ -373,8 +373,8 @@ default io.grpc.stub.StreamObserver streamin * demonstrates the idea of full duplexing. * */ - default io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + default io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } @@ -386,8 +386,8 @@ default io.grpc.stub.StreamObserver fullDup * first request. * */ - default io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + default io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } @@ -397,13 +397,14 @@ default io.grpc.stub.StreamObserver halfDup * to test the behavior when clients call unimplemented methods. * */ - default void unimplementedCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } } /** + * Base class for the server implementation of the service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -418,8 +419,8 @@ public static abstract class TestServiceImplBase
      *
*/ @Override - public void emptyCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -429,8 +430,8 @@ public void emptyCall(EmptyProtos.Empty request, * */ @Override - public void unaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -442,8 +443,8 @@ public void unaryCall(Messages.SimpleRequest request, * */ @Override - public void cacheableUnaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -454,8 +455,8 @@ public void cacheableUnaryCall(Messages.SimpleRequest request, * */ @Override - public void streamingOutputCall(Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -466,8 +467,8 @@ public void streamingOutputCall(Messages.StreamingOutputCallRequest request, * */ @Override - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } @@ -479,8 +480,8 @@ public io.grpc.stub.StreamObserver streaming * */ @Override - public io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } @@ -493,8 +494,8 @@ public io.grpc.stub.StreamObserver fullDupl * */ @Override - public io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } @@ -505,8 +506,8 @@ public io.grpc.stub.StreamObserver halfDupl * */ @Override - public void unimplementedCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } @@ -516,63 +517,64 @@ public void unimplementedCall(EmptyProtos.Empty request, getEmptyCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - EmptyProtos.Empty, - EmptyProtos.Empty>( + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( this, METHODID_EMPTY_CALL))) .addMethod( getUnaryCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - Messages.SimpleRequest, - Messages.SimpleResponse>( + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( this, METHODID_UNARY_CALL))) .addMethod( getCacheableUnaryCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - Messages.SimpleRequest, - Messages.SimpleResponse>( + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( this, METHODID_CACHEABLE_UNARY_CALL))) .addMethod( getStreamingOutputCallMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< - Messages.StreamingOutputCallRequest, - Messages.StreamingOutputCallResponse>( + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( this, METHODID_STREAMING_OUTPUT_CALL))) .addMethod( getStreamingInputCallMethod(), io.grpc.stub.ServerCalls.asyncClientStreamingCall( new MethodHandlers< - Messages.StreamingInputCallRequest, - Messages.StreamingInputCallResponse>( + io.grpc.testing.integration.Messages.StreamingInputCallRequest, + io.grpc.testing.integration.Messages.StreamingInputCallResponse>( this, METHODID_STREAMING_INPUT_CALL))) .addMethod( getFullDuplexCallMethod(), io.grpc.stub.ServerCalls.asyncBidiStreamingCall( new MethodHandlers< - Messages.StreamingOutputCallRequest, - Messages.StreamingOutputCallResponse>( + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( this, METHODID_FULL_DUPLEX_CALL))) .addMethod( getHalfDuplexCallMethod(), io.grpc.stub.ServerCalls.asyncBidiStreamingCall( new MethodHandlers< - Messages.StreamingOutputCallRequest, - Messages.StreamingOutputCallResponse>( + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( this, METHODID_HALF_DUPLEX_CALL))) .addMethod( getUnimplementedCallMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - EmptyProtos.Empty, - EmptyProtos.Empty>( + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( this, METHODID_UNIMPLEMENTED_CALL))) .build(); } } /** + * A stub to allow clients to do asynchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -596,8 +598,8 @@ protected TestServiceStub build(
      * One empty request followed by one empty response.
      *
*/ - public void emptyCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getEmptyCallMethod(), getCallOptions()), request, responseObserver); } @@ -607,8 +609,8 @@ public void emptyCall(EmptyProtos.Empty request, * One request followed by one response. * */ - public void unaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -620,8 +622,8 @@ public void unaryCall(Messages.SimpleRequest request, * satisfy subsequent requests. * */ - public void cacheableUnaryCall(Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCacheableUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -632,8 +634,8 @@ public void cacheableUnaryCall(Messages.SimpleRequest request, * The server returns the payload with client desired type and sizes. * */ - public void streamingOutputCall(Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( getChannel().newCall(getStreamingOutputCallMethod(), getCallOptions()), request, responseObserver); } @@ -644,8 +646,8 @@ public void streamingOutputCall(Messages.StreamingOutputCallRequest request, * The server returns the aggregated size of client payload as the result. * */ - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( getChannel().newCall(getStreamingInputCallMethod(), getCallOptions()), responseObserver); } @@ -657,8 +659,8 @@ public io.grpc.stub.StreamObserver streaming * demonstrates the idea of full duplexing. * */ - public io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver fullDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( getChannel().newCall(getFullDuplexCallMethod(), getCallOptions()), responseObserver); } @@ -671,8 +673,8 @@ public io.grpc.stub.StreamObserver fullDupl * first request. * */ - public io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { + public io.grpc.stub.StreamObserver halfDuplexCall( + io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( getChannel().newCall(getHalfDuplexCallMethod(), getCallOptions()), responseObserver); } @@ -683,8 +685,8 @@ public io.grpc.stub.StreamObserver halfDupl * to test the behavior when clients call unimplemented methods. * */ - public void unimplementedCall(EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUnimplementedCallMethod(), getCallOptions()), request, responseObserver); } @@ -696,7 +698,7 @@ public interface TestServiceBlocking { * One empty request followed by one empty response. * */ - default EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { + default io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { throw new UnsupportedOperationException(); } @@ -705,7 +707,7 @@ default EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { * One request followed by one response. * */ - default Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { + default io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { throw new UnsupportedOperationException(); } @@ -716,7 +718,7 @@ default Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { * satisfy subsequent requests. * */ - default Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request) { + default io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { throw new UnsupportedOperationException(); } @@ -726,8 +728,8 @@ default Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest reques * The server returns the payload with client desired type and sizes. * */ - default java.util.Iterator streamingOutputCall( - Messages.StreamingOutputCallRequest request) { + default java.util.Iterator streamingOutputCall( + io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { throw new UnsupportedOperationException(); } @@ -737,12 +739,13 @@ default java.util.Iterator streamingOutput * to test the behavior when clients call unimplemented methods. * */ - default EmptyProtos.Empty unimplementedCall(EmptyProtos.Empty request) { + default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { throw new UnsupportedOperationException(); } } /** + * A stub to allow clients to do synchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -768,7 +771,7 @@ protected TestServiceBlockingStub build(
      *
*/ @Override - public EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { + public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getEmptyCallMethod(), getCallOptions(), request); } @@ -779,7 +782,7 @@ public EmptyProtos.Empty emptyCall(EmptyProtos.Empty request) { * */ @Override - public Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { + public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); } @@ -792,7 +795,7 @@ public Messages.SimpleResponse unaryCall(Messages.SimpleRequest request) { * */ @Override - public Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request) { + public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCacheableUnaryCallMethod(), getCallOptions(), request); } @@ -804,8 +807,8 @@ public Messages.SimpleResponse cacheableUnaryCall(Messages.SimpleRequest request * */ @Override - public java.util.Iterator streamingOutputCall( - Messages.StreamingOutputCallRequest request) { + public java.util.Iterator streamingOutputCall( + io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( getChannel(), getStreamingOutputCallMethod(), getCallOptions(), request); } @@ -817,7 +820,7 @@ public java.util.Iterator streamingOutputC * */ @Override - public EmptyProtos.Empty unimplementedCall(EmptyProtos.Empty request) { + public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); } @@ -829,8 +832,8 @@ public interface TestServiceFuture { * One empty request followed by one empty response. * */ - default com.google.common.util.concurrent.ListenableFuture emptyCall( - EmptyProtos.Empty request) { + default com.google.common.util.concurrent.ListenableFuture emptyCall( + io.grpc.testing.integration.EmptyProtos.Empty request) { throw new UnsupportedOperationException(); } @@ -839,8 +842,8 @@ default com.google.common.util.concurrent.ListenableFuture em * One request followed by one response. * */ - default com.google.common.util.concurrent.ListenableFuture unaryCall( - Messages.SimpleRequest request) { + default com.google.common.util.concurrent.ListenableFuture unaryCall( + io.grpc.testing.integration.Messages.SimpleRequest request) { throw new UnsupportedOperationException(); } @@ -851,8 +854,8 @@ default com.google.common.util.concurrent.ListenableFuture */ - default com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( - Messages.SimpleRequest request) { + default com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( + io.grpc.testing.integration.Messages.SimpleRequest request) { throw new UnsupportedOperationException(); } @@ -862,13 +865,14 @@ default com.google.common.util.concurrent.ListenableFuture */ - default com.google.common.util.concurrent.ListenableFuture unimplementedCall( - EmptyProtos.Empty request) { + default com.google.common.util.concurrent.ListenableFuture unimplementedCall( + io.grpc.testing.integration.EmptyProtos.Empty request) { throw new UnsupportedOperationException(); } } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -894,8 +898,8 @@ protected TestServiceFutureStub build(
      *
*/ @Override - public com.google.common.util.concurrent.ListenableFuture emptyCall( - EmptyProtos.Empty request) { + public com.google.common.util.concurrent.ListenableFuture emptyCall( + io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getEmptyCallMethod(), getCallOptions()), request); } @@ -906,8 +910,8 @@ public com.google.common.util.concurrent.ListenableFuture emp * */ @Override - public com.google.common.util.concurrent.ListenableFuture unaryCall( - Messages.SimpleRequest request) { + public com.google.common.util.concurrent.ListenableFuture unaryCall( + io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getUnaryCallMethod(), getCallOptions()), request); } @@ -920,8 +924,8 @@ public com.google.common.util.concurrent.ListenableFuture */ @Override - public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( - Messages.SimpleRequest request) { + public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( + io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCacheableUnaryCallMethod(), getCallOptions()), request); } @@ -933,8 +937,8 @@ public com.google.common.util.concurrent.ListenableFuture */ @Override - public com.google.common.util.concurrent.ListenableFuture unimplementedCall( - EmptyProtos.Empty request) { + public com.google.common.util.concurrent.ListenableFuture unimplementedCall( + io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getUnimplementedCallMethod(), getCallOptions()), request); } @@ -967,24 +971,24 @@ private static final class MethodHandlers implements public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { case METHODID_EMPTY_CALL: - serviceImpl.emptyCall((EmptyProtos.Empty) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.emptyCall((io.grpc.testing.integration.EmptyProtos.Empty) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_UNARY_CALL: - serviceImpl.unaryCall((Messages.SimpleRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.unaryCall((io.grpc.testing.integration.Messages.SimpleRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_CACHEABLE_UNARY_CALL: - serviceImpl.cacheableUnaryCall((Messages.SimpleRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.cacheableUnaryCall((io.grpc.testing.integration.Messages.SimpleRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_STREAMING_OUTPUT_CALL: - serviceImpl.streamingOutputCall((Messages.StreamingOutputCallRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.streamingOutputCall((io.grpc.testing.integration.Messages.StreamingOutputCallRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_UNIMPLEMENTED_CALL: - serviceImpl.unimplementedCall((EmptyProtos.Empty) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.unimplementedCall((io.grpc.testing.integration.EmptyProtos.Empty) request, + (io.grpc.stub.StreamObserver) responseObserver); break; default: throw new AssertionError(); @@ -998,13 +1002,13 @@ public io.grpc.stub.StreamObserver invoke( switch (methodId) { case METHODID_STREAMING_INPUT_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.streamingInputCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); case METHODID_FULL_DUPLEX_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.fullDuplexCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); case METHODID_HALF_DUPLEX_CALL: return (io.grpc.stub.StreamObserver) serviceImpl.halfDuplexCall( - (io.grpc.stub.StreamObserver) responseObserver); + (io.grpc.stub.StreamObserver) responseObserver); default: throw new AssertionError(); } @@ -1017,7 +1021,7 @@ private static abstract class TestServiceBaseDescriptorSupplier @java.lang.Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return Test.getDescriptor(); + return io.grpc.testing.integration.Test.getDescriptor(); } @java.lang.Override From 4d4fefca841a6813420c907c0024db3710b4e76f Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 11:06:40 -0800 Subject: [PATCH 08/42] Update generator logic to add in the interfaces and match what was hand done for TestServiceGrpc.java. --- .../src/java_plugin/cpp/java_generator.cpp | 103 +++++++++++------- 1 file changed, 63 insertions(+), 40 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 35cc70be849..24eb4db3130 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -356,12 +356,35 @@ static void GrpcWriteDocComment(Printer* printer, const std::string& comments) { printer->Print(" */\n"); } -// TODO(nmittler): Remove once protobuf includes javadoc methods in distribution. +// For the non-interface classes add a description of use before the description from proto static void GrpcWriteServiceDocComment(Printer* printer, - const ServiceDescriptor* service) { - // Deviating from protobuf to avoid extraneous docs - // (see https://github.com/google/protobuf/issues/1406); + const ServiceDescriptor* service, + StubType* type) { printer->Print("/**\n"); + + if (type != nullptr) { + switch (*type) { + case ASYNC_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do asynchronous rpc calls to service "); + printer->Print(service->name() + "\n"); + break; + case BLOCKING_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do synchronous rpc calls to service "); + printer->Print(service->name() + "\n"); + break; + case FUTURE_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service "); + printer->Print(service->name() + "\n"); + break; + case ABSTRACT_CLASS: + printer->Print(" * Base class for the server implementation of the service "); + printer->Print(service->name() + "\n") + break; + default: + // No extra description + } + } + std::vector lines = GrpcGetDocLinesForDescriptor(service); GrpcWriteDocCommentBody(printer, lines, true); printer->Print(" */\n"); @@ -589,7 +612,7 @@ static void PrintStub( (*vars)["interface_name"] = interface_name; // Class head - GrpcWriteServiceDocComment(p, service); + GrpcWriteServiceDocComment(p, service, &type); if (service->options().deprecated()) { p->Print(*vars, "@$Deprecated$\n"); @@ -599,15 +622,15 @@ static void PrintStub( p->Print( *vars, "public interface $stub_name$ {\n"); - } else if (impl_base){ + } else if (impl_base) { p->Print( *vars, - "public static abstract class $abstract_name$" + "public static abstract class $abstract_name$\m" " implements $BindableService$, $interface_name$ {\n"); } else { p->Print( *vars, - "public static final class $stub_name$" + "public static final class $stub_name$\n" " extends $stub_base_class_name$<$stub_name$>\n" " implements $interface_name$ {\n"); } @@ -640,38 +663,38 @@ static void PrintStub( // RPC methods for (int i = 0; i < service->method_count(); ++i) { - const MethodDescriptor *method = service->method(i); - (*vars)["input_type"] = MessageFullJavaName(method->input_type()); - (*vars)["output_type"] = MessageFullJavaName(method->output_type()); - (*vars)["lower_method_name"] = LowerMethodName(method); - (*vars)["method_method_name"] = MethodPropertiesGetterName(method); - bool client_streaming = method->client_streaming(); - bool server_streaming = method->server_streaming(); - - if (call_type == BLOCKING_CALL && client_streaming) { - // Blocking client interface with client streaming is not available - continue; - } + const MethodDescriptor* method = service->method(i); + (*vars)["input_type"] = MessageFullJavaName(method->input_type()); + (*vars)["output_type"] = MessageFullJavaName(method->output_type()); + (*vars)["lower_method_name"] = LowerMethodName(method); + (*vars)["method_method_name"] = MethodPropertiesGetterName(method); + bool client_streaming = method->client_streaming(); + bool server_streaming = method->server_streaming(); - if (call_type == FUTURE_CALL && (client_streaming || server_streaming)) { - // Future interface doesn't support streaming. - continue; - } + if (call_type == BLOCKING_CALL && client_streaming) { + // Blocking client interface with client streaming is not available + continue; + } + + if (call_type == FUTURE_CALL && (client_streaming || server_streaming)) { + // Future interface doesn't support streaming. + continue; + } - // Method signature - p->Print("\n"); - // TODO(nmittler): Replace with WriteMethodDocComment once included by the protobuf distro. - GrpcWriteMethodDocComment(p, method); + // Method signature + p->Print("\n"); + // TODO(nmittler): Replace with WriteMethodDocComment once included by the protobuf distro. + GrpcWriteMethodDocComment(p, method); - if (method->options().deprecated()) { - p->Print(*vars, "@$Deprecated$\n"); - } + if (method->options().deprecated()) { + p->Print(*vars, "@$Deprecated$\n"); + } - if (!interface) { - p->Print("public "); - } else { - p->Print("default "); - } + if (!interface) { + p->Print("public "); + } else { + p->Print("default "); + } switch (call_type) { case BLOCKING_CALL: GRPC_CODEGEN_CHECK(!client_streaming) @@ -720,8 +743,8 @@ static void PrintStub( p->Print(" {\n"); p->Indent(); if (impl_base) { - // NB: Skipping validation of service methods. If something is wrong, we wouldn't get to - // this point as compiler would return errors when generating service interface. + // NB: Skipping validation of service methods. If something is wrong, we wouldn't get to + // this point as compiler would return errors when generating service interface. if (client_streaming) { p->Print( *vars, @@ -787,7 +810,7 @@ static void PrintStub( break; } } else { - p->Print("throw new UnsupportedOperationException();\n"); + p->Print("throw new UnsupportedOperationException();\n"); } p->Outdent(); p->Print("}\n"); @@ -1091,7 +1114,7 @@ static void PrintService(const ServiceDescriptor* service, } #endif // TODO(nmittler): Replace with WriteServiceDocComment once included by protobuf distro. - GrpcWriteServiceDocComment(p, service); + GrpcWriteServiceDocComment(p, service, nullptr); p->Print( *vars, "@$Generated$(\n" From 564f872d70e426c0f84ca8f70b6d6c3816acc98f Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 11:36:55 -0800 Subject: [PATCH 09/42] Fix some syntax errors. --- .../src/java_plugin/cpp/java_generator.cpp | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 24eb4db3130..1057995749e 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -359,30 +359,33 @@ static void GrpcWriteDocComment(Printer* printer, const std::string& comments) { // For the non-interface classes add a description of use before the description from proto static void GrpcWriteServiceDocComment(Printer* printer, const ServiceDescriptor* service, - StubType* type) { + StubType type) { printer->Print("/**\n"); - if (type != nullptr) { - switch (*type) { - case ASYNC_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do asynchronous rpc calls to service "); - printer->Print(service->name() + "\n"); - break; - case BLOCKING_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do synchronous rpc calls to service "); - printer->Print(service->name() + "\n"); - break; - case FUTURE_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service "); - printer->Print(service->name() + "\n"); - break; - case ABSTRACT_CLASS: - printer->Print(" * Base class for the server implementation of the service "); - printer->Print(service->name() + "\n") - break; - default: - // No extra description - } + bool add_service_name = false; + switch (type) { + case ASYNC_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do asynchronous rpc calls to service "); + add_service_name = true; + break; + case BLOCKING_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do synchronous rpc calls to service "); + add_service_name = true; + break; + case FUTURE_CLIENT_IMPL: + printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service "); + add_service_name = true; + break; + case ABSTRACT_CLASS: + printer->Print(" * Base class for the server implementation of the service "); + add_service_name = true; + break; + default: + // No extra description + } + if (add_service_name) { + printer->Print(service->name()); + printer->Print("\n"); } std::vector lines = GrpcGetDocLinesForDescriptor(service); @@ -507,6 +510,7 @@ enum StubType { BLOCKING_CLIENT_IMPL = 5, FUTURE_CLIENT_IMPL = 6, ABSTRACT_CLASS = 7, + NONE = 8, }; enum CallType { @@ -612,7 +616,7 @@ static void PrintStub( (*vars)["interface_name"] = interface_name; // Class head - GrpcWriteServiceDocComment(p, service, &type); + GrpcWriteServiceDocComment(p, service, type); if (service->options().deprecated()) { p->Print(*vars, "@$Deprecated$\n"); @@ -1114,7 +1118,7 @@ static void PrintService(const ServiceDescriptor* service, } #endif // TODO(nmittler): Replace with WriteServiceDocComment once included by protobuf distro. - GrpcWriteServiceDocComment(p, service, nullptr); + GrpcWriteServiceDocComment(p, service, NONE); p->Print( *vars, "@$Generated$(\n" From 255b43657d9a56ac19477b8641dc9cc601c087c0 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 11:44:06 -0800 Subject: [PATCH 10/42] Fix some syntax errors. --- .../src/java_plugin/cpp/java_generator.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 1057995749e..77f05dc29e9 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -501,6 +501,10 @@ static void PrintMethodFields( } } +static void PrintBindServiceMethodBody(const ServiceDescriptor* service, + std::map* vars, + Printer* p); + enum StubType { ASYNC_INTERFACE = 0, BLOCKING_CLIENT_INTERFACE = 1, @@ -519,10 +523,6 @@ enum CallType { FUTURE_CALL = 2 }; -static void PrintBindServiceMethodBody(const ServiceDescriptor* service, - std::map* vars, - Printer* p); - // Prints a StubFactory for given service / stub type. static void PrintStubFactory( const ServiceDescriptor* service, @@ -564,46 +564,38 @@ static void PrintStub( std::string stub_name = service_name; std::string stub_base_class_name = "AbstractStub"; std::string interface_name = service_name; - CallType call_type; bool impl_base = false; bool interface = false; switch (type) { case ASYNC_INTERFACE: - call_type = ASYNC_CALL; interface = true; impl_base = true; stub_name += "Async"; break; case ABSTRACT_CLASS: - call_type = ASYNC_CALL; impl_base = true; interface_name += "Async"; (*vars)["abstract_name"] = service_name + "ImplBase"; break; case ASYNC_CLIENT_IMPL: - call_type = ASYNC_CALL; stub_name += "Stub"; stub_base_class_name = "AbstractAsyncStub"; interface_name += "Async"; break; case BLOCKING_CLIENT_INTERFACE: interface = true; - call_type = BLOCKING_CALL; stub_name += "Blocking"; break; case BLOCKING_CLIENT_IMPL: - call_type = BLOCKING_CALL; stub_name += "BlockingStub"; stub_base_class_name = "AbstractBlockingStub"; interface_name += "Blocking"; break; case FUTURE_CLIENT_INTERFACE: interface = true; - call_type = FUTURE_CALL; stub_name += "Future"; break; case FUTURE_CLIENT_IMPL: - call_type = FUTURE_CALL; stub_name += "FutureStub"; stub_base_class_name = "AbstractFutureStub"; interface_name += "Future"; @@ -629,7 +621,7 @@ static void PrintStub( } else if (impl_base) { p->Print( *vars, - "public static abstract class $abstract_name$\m" + "public static abstract class $abstract_name$\n" " implements $BindableService$, $interface_name$ {\n"); } else { p->Print( From e6e84e4253fe3c1164f88f40d0f2316096d9866e Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 12:53:40 -0800 Subject: [PATCH 11/42] fix syntax errors --- compiler/src/java_plugin/cpp/java_generator.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 77f05dc29e9..a9fab24ef12 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -564,38 +564,46 @@ static void PrintStub( std::string stub_name = service_name; std::string stub_base_class_name = "AbstractStub"; std::string interface_name = service_name; + CallType call_type; bool impl_base = false; bool interface = false; switch (type) { case ASYNC_INTERFACE: + call_type = ASYNC_CALL; interface = true; impl_base = true; stub_name += "Async"; break; case ABSTRACT_CLASS: + call_type = ASYNC_CALL; impl_base = true; interface_name += "Async"; (*vars)["abstract_name"] = service_name + "ImplBase"; break; case ASYNC_CLIENT_IMPL: + call_type = ASYNC_CALL; stub_name += "Stub"; stub_base_class_name = "AbstractAsyncStub"; interface_name += "Async"; break; case BLOCKING_CLIENT_INTERFACE: interface = true; + call_type = BLOCKING_CALL; stub_name += "Blocking"; break; case BLOCKING_CLIENT_IMPL: + call_type = BLOCKING_CALL; stub_name += "BlockingStub"; stub_base_class_name = "AbstractBlockingStub"; interface_name += "Blocking"; break; case FUTURE_CLIENT_INTERFACE: interface = true; + call_type = FUTURE_CALL; stub_name += "Future"; break; case FUTURE_CLIENT_IMPL: + call_type = FUTURE_CALL; stub_name += "FutureStub"; stub_base_class_name = "AbstractFutureStub"; interface_name += "Future"; From e701d2dbe2d65fc8d54846a2465988f838b95d33 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 12:56:26 -0800 Subject: [PATCH 12/42] Fix some syntax errors. --- .../src/java_plugin/cpp/java_generator.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index a9fab24ef12..04fc45359e6 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -322,6 +322,24 @@ static std::vector GrpcGetDocLinesForDescriptor(const DescriptorTyp return GrpcGetDocLines(GrpcGetCommentsForDescriptor(descriptor)); } +enum StubType { + ASYNC_INTERFACE = 0, + BLOCKING_CLIENT_INTERFACE = 1, + FUTURE_CLIENT_INTERFACE = 2, + BLOCKING_SERVER_INTERFACE = 3, + ASYNC_CLIENT_IMPL = 4, + BLOCKING_CLIENT_IMPL = 5, + FUTURE_CLIENT_IMPL = 6, + ABSTRACT_CLASS = 7, + NONE = 8, +}; + +enum CallType { + ASYNC_CALL = 0, + BLOCKING_CALL = 1, + FUTURE_CALL = 2 +}; + // TODO(nmittler): Remove once protobuf includes javadoc methods in distribution. static void GrpcWriteDocCommentBody(Printer* printer, const std::vector& lines, @@ -505,24 +523,6 @@ static void PrintBindServiceMethodBody(const ServiceDescriptor* service, std::map* vars, Printer* p); -enum StubType { - ASYNC_INTERFACE = 0, - BLOCKING_CLIENT_INTERFACE = 1, - FUTURE_CLIENT_INTERFACE = 2, - BLOCKING_SERVER_INTERFACE = 3, - ASYNC_CLIENT_IMPL = 4, - BLOCKING_CLIENT_IMPL = 5, - FUTURE_CLIENT_IMPL = 6, - ABSTRACT_CLASS = 7, - NONE = 8, -}; - -enum CallType { - ASYNC_CALL = 0, - BLOCKING_CALL = 1, - FUTURE_CALL = 2 -}; - // Prints a StubFactory for given service / stub type. static void PrintStubFactory( const ServiceDescriptor* service, From 0e7c7e1c115c50e641032d2e80731c7722bd3c0b Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 10 Nov 2022 16:35:58 -0800 Subject: [PATCH 13/42] Final tweaks. --- compiler/src/java_plugin/cpp/java_generator.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 04fc45359e6..29114fe20b6 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -402,7 +402,7 @@ static void GrpcWriteServiceDocComment(Printer* printer, // No extra description } if (add_service_name) { - printer->Print(service->name()); + printer->Print(service->name().c_str()); printer->Print("\n"); } @@ -695,7 +695,9 @@ static void PrintStub( } if (!interface) { - p->Print("public "); + p->Print(*vars, + "@$Override$\n" + "public "); } else { p->Print("default "); } From 32ad2599b42a1ee08def8ae52264381d0428f22f Mon Sep 17 00:00:00 2001 From: larry-safran Date: Fri, 11 Nov 2022 00:31:41 +0000 Subject: [PATCH 14/42] Final tweaks --- compiler/src/java_plugin/cpp/java_generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 29114fe20b6..f1b387c5a06 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -398,7 +398,7 @@ static void GrpcWriteServiceDocComment(Printer* printer, printer->Print(" * Base class for the server implementation of the service "); add_service_name = true; break; - default: + default: ; // No extra description } if (add_service_name) { From c48561c937d390ff8d57252f2fbc65a6a8922171 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Fri, 11 Nov 2022 00:48:49 +0000 Subject: [PATCH 15/42] update golden files to match output with interfaces --- compiler/src/test/golden/TestService.java.txt | 225 +++++++++++++++++- .../src/testLite/golden/TestService.java.txt | 225 +++++++++++++++++- 2 files changed, 442 insertions(+), 8 deletions(-) diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index d87bc631256..568fa15f578 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -317,7 +317,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static abstract class TestServiceImplBase implements io.grpc.BindableService { + public interface TestServiceAsync { /** * 
@@ -325,6 +325,106 @@ public final class TestServiceGrpc {
      * The server returns the client payload as-is.
      *
*/ + default void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); + } + + /** + * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     *
+ */ + default void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests followed by one response (streamed upload).
+     * The server returns the aggregated size of client payload as the result.
+     *
+ */ + default io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests with each request served by the server immediately.
+     * As one request could lead to multiple responses, this interface
+     * demonstrates the idea of full bidirectionality.
+     *
+ */ + default io.grpc.stub.StreamObserver fullBidiCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests followed by a sequence of responses.
+     * The server buffers all the client requests and then serves them in order. A
+     * stream of responses are returned to the client when the server starts with
+     * first request.
+     *
+ */ + default io.grpc.stub.StreamObserver halfBidiCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); + } + + /** + * 
+     * An RPC method whose Java name collides with a keyword, and whose generated
+     * method should have a '_' appended.
+     *
+ */ + default io.grpc.stub.StreamObserver import_( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static abstract class TestServiceImplBase + implements io.grpc.BindableService, TestServiceAsync { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); @@ -336,6 +436,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); @@ -347,6 +448,7 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); @@ -359,6 +461,7 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ + @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); @@ -372,6 +475,7 @@ public final class TestServiceGrpc { * first request. * */ + @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); @@ -383,6 +487,7 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ + @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); @@ -393,6 +498,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); @@ -403,6 +509,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); @@ -471,11 +578,14 @@ public final class TestServiceGrpc { } /** + * A stub to allow clients to do asynchronous rpc calls to service TestService * 
    * Test service that supports all call types.
    *
*/ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements TestServiceAsync { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -493,6 +603,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -505,6 +616,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -517,6 +629,7 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -530,6 +643,7 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ + @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -544,6 +658,7 @@ public final class TestServiceGrpc { * first request. * */ + @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -556,6 +671,7 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ + @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -567,6 +683,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -578,6 +695,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -590,7 +708,57 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static final class TestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface TestServiceBlocking { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     *
+ */ + default java.util.Iterator streamingOutputCall( + io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static final class TestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements TestServiceBlocking { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -608,6 +776,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -619,6 +788,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -630,6 +800,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSafeCallMethod(), getCallOptions(), request); @@ -640,6 +811,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getIdempotentCallMethod(), getCallOptions(), request); @@ -651,7 +823,49 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static final class TestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface TestServiceFuture { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture unaryCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture safeCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture idempotentCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static final class TestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements TestServiceFuture { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -669,6 +883,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -680,6 +895,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture safeCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -691,6 +907,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture idempotentCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index fdf75a9bf9a..db36d8f4c74 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -309,7 +309,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static abstract class TestServiceImplBase implements io.grpc.BindableService { + public interface TestServiceAsync { /** * 
@@ -317,6 +317,106 @@ public final class TestServiceGrpc {
      * The server returns the client payload as-is.
      *
*/ + default void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); + } + + /** + * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     *
+ */ + default void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests followed by one response (streamed upload).
+     * The server returns the aggregated size of client payload as the result.
+     *
+ */ + default io.grpc.stub.StreamObserver streamingInputCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests with each request served by the server immediately.
+     * As one request could lead to multiple responses, this interface
+     * demonstrates the idea of full bidirectionality.
+     *
+ */ + default io.grpc.stub.StreamObserver fullBidiCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); + } + + /** + * 
+     * A sequence of requests followed by a sequence of responses.
+     * The server buffers all the client requests and then serves them in order. A
+     * stream of responses are returned to the client when the server starts with
+     * first request.
+     *
+ */ + default io.grpc.stub.StreamObserver halfBidiCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); + } + + /** + * 
+     * An RPC method whose Java name collides with a keyword, and whose generated
+     * method should have a '_' appended.
+     *
+ */ + default io.grpc.stub.StreamObserver import_( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static abstract class TestServiceImplBase + implements io.grpc.BindableService, TestServiceAsync { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); @@ -328,6 +428,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); @@ -339,6 +440,7 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); @@ -351,6 +453,7 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ + @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); @@ -364,6 +467,7 @@ public final class TestServiceGrpc { * first request. * */ + @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); @@ -375,6 +479,7 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ + @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); @@ -385,6 +490,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); @@ -395,6 +501,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); @@ -463,11 +570,14 @@ public final class TestServiceGrpc { } /** + * A stub to allow clients to do asynchronous rpc calls to service TestService * 
    * Test service that supports all call types.
    *
*/ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements TestServiceAsync { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -485,6 +595,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -497,6 +608,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -509,6 +621,7 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -522,6 +635,7 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ + @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -536,6 +650,7 @@ public final class TestServiceGrpc { * first request. * */ + @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -548,6 +663,7 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ + @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -559,6 +675,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -570,6 +687,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -582,7 +700,57 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static final class TestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface TestServiceBlocking { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * One request followed by a sequence of responses (streamed download).
+     * The server returns the payload with client desired type and sizes.
+     *
+ */ + default java.util.Iterator streamingOutputCall( + io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static final class TestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements TestServiceBlocking { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -600,6 +768,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -611,6 +780,7 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -622,6 +792,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSafeCallMethod(), getCallOptions(), request); @@ -632,6 +803,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getIdempotentCallMethod(), getCallOptions(), request); @@ -643,7 +815,49 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public static final class TestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface TestServiceFuture { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture unaryCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Safe.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture safeCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * A unary call that is Idempotent.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture idempotentCall( + io.grpc.testing.compiler.Test.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService + * 
+   * Test service that supports all call types.
+   *
+ */ + public static final class TestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements TestServiceFuture { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -661,6 +875,7 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -672,6 +887,7 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture safeCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -683,6 +899,7 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture idempotentCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( From 611c1aed895e891341fa1661a1fd2853c2d47d8b Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 12 Nov 2022 01:49:12 +0000 Subject: [PATCH 16/42] Update all generated service files (*Grpc.java) --- .../alts/internal/HandshakerServiceGrpc.java | 51 +++- .../grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 46 ++- .../lookup/v1/RouteLookupServiceGrpc.java | 67 ++++- .../io/grpc/channelz/v1/ChannelzGrpc.java | 280 +++++++++++++++++- .../grpc/io/grpc/health/v1/HealthGrpc.java | 117 +++++++- .../v1alpha/ServerReflectionGrpc.java | 47 ++- .../testing/AnotherDynamicServiceGrpc.java | 76 ++++- .../AnotherReflectableServiceGrpc.java | 58 +++- .../testing/DynamicServiceGrpc.java | 76 ++++- .../testing/ReflectableServiceGrpc.java | 58 +++- .../testing/protobuf/SimpleServiceGrpc.java | 123 +++++++- .../service/orca/v3/OpenRcaServiceGrpc.java | 81 ++++- .../api/v2/ClusterDiscoveryServiceGrpc.java | 85 +++++- .../api/v2/EndpointDiscoveryServiceGrpc.java | 80 ++++- .../api/v2/ListenerDiscoveryServiceGrpc.java | 94 +++++- .../api/v2/RouteDiscoveryServiceGrpc.java | 97 +++++- .../v2/ScopedRoutesDiscoveryServiceGrpc.java | 103 ++++++- .../v2/VirtualHostDiscoveryServiceGrpc.java | 79 ++++- .../v2/AggregatedDiscoveryServiceGrpc.java | 79 ++++- .../v2/SecretDiscoveryServiceGrpc.java | 76 ++++- .../v3/AggregatedDiscoveryServiceGrpc.java | 79 ++++- .../v2/LoadReportingServiceGrpc.java | 72 ++++- .../v3/LoadReportingServiceGrpc.java | 72 ++++- .../v3/ClientStatusDiscoveryServiceGrpc.java | 82 ++++- 24 files changed, 1982 insertions(+), 96 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 662b6ff3e0c..1863ea1d7b8 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -92,7 +92,7 @@ public HandshakerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Call /** */ - public static abstract class HandshakerServiceImplBase implements io.grpc.BindableService { + public interface HandshakerServiceAsync { /** * 
@@ -104,6 +104,29 @@ public static abstract class HandshakerServiceImplBase implements io.grpc.Bindab
      * response before sending next request.
      *
*/ + default io.grpc.stub.StreamObserver doHandshake( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDoHandshakeMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service HandshakerService + */ + public static abstract class HandshakerServiceImplBase + implements io.grpc.BindableService, HandshakerServiceAsync { + + /** + * 
+     * Handshaker service accepts a stream of handshaker request, returning a
+     * stream of handshaker response. Client is expected to send exactly one
+     * message with either client_start or server_start followed by one or more
+     * messages with next. Each time client sends a request, the handshaker
+     * service expects to respond. Client does not have to wait for service's
+     * response before sending next request.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver doHandshake( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDoHandshakeMethod(), responseObserver); @@ -123,8 +146,11 @@ public io.grpc.stub.StreamObserver doHandsh } /** + * A stub to allow clients to do asynchronous rpc calls to service HandshakerService */ - public static final class HandshakerServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class HandshakerServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements HandshakerServiceAsync { private HandshakerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -146,6 +172,7 @@ protected HandshakerServiceStub build( * response before sending next request. * */ + @java.lang.Override public io.grpc.stub.StreamObserver doHandshake( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -155,7 +182,15 @@ public io.grpc.stub.StreamObserver doHandsh /** */ - public static final class HandshakerServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface HandshakerServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service HandshakerService + */ + public static final class HandshakerServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements HandshakerServiceBlocking { private HandshakerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -170,7 +205,15 @@ protected HandshakerServiceBlockingStub build( /** */ - public static final class HandshakerServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface HandshakerServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService + */ + public static final class HandshakerServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements HandshakerServiceFuture { private HandshakerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index ec56d9b6bfe..77babb3d493 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -92,13 +92,31 @@ public LoadBalancerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptio /** */ - public static abstract class LoadBalancerImplBase implements io.grpc.BindableService { + public interface LoadBalancerAsync { /** * 
      * Bidirectional rpc to get a list of servers.
      *
*/ + default io.grpc.stub.StreamObserver balanceLoad( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBalanceLoadMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service LoadBalancer + */ + public static abstract class LoadBalancerImplBase + implements io.grpc.BindableService, LoadBalancerAsync { + + /** + * 
+     * Bidirectional rpc to get a list of servers.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver balanceLoad( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBalanceLoadMethod(), responseObserver); @@ -118,8 +136,11 @@ public io.grpc.stub.StreamObserver balanceLoad } /** + * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer */ - public static final class LoadBalancerStub extends io.grpc.stub.AbstractAsyncStub { + public static final class LoadBalancerStub + extends io.grpc.stub.AbstractAsyncStub + implements LoadBalancerAsync { private LoadBalancerStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -136,6 +157,7 @@ protected LoadBalancerStub build( * Bidirectional rpc to get a list of servers. * */ + @java.lang.Override public io.grpc.stub.StreamObserver balanceLoad( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -145,7 +167,15 @@ public io.grpc.stub.StreamObserver balanceLoad /** */ - public static final class LoadBalancerBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface LoadBalancerBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service LoadBalancer + */ + public static final class LoadBalancerBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements LoadBalancerBlocking { private LoadBalancerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -160,7 +190,15 @@ protected LoadBalancerBlockingStub build( /** */ - public static final class LoadBalancerFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface LoadBalancerFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer + */ + public static final class LoadBalancerFutureStub + extends io.grpc.stub.AbstractFutureStub + implements LoadBalancerFuture { private LoadBalancerFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index f1d8ce817a3..de10d8d135e 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -92,13 +92,31 @@ public RouteLookupServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ - public static abstract class RouteLookupServiceImplBase implements io.grpc.BindableService { + public interface RouteLookupServiceAsync { /** * 
      * Lookup returns a target for a single key.
      *
*/ + default void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRouteLookupMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service RouteLookupService + */ + public static abstract class RouteLookupServiceImplBase + implements io.grpc.BindableService, RouteLookupServiceAsync { + + /** + * 
+     * Lookup returns a target for a single key.
+     *
+ */ + @java.lang.Override public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRouteLookupMethod(), responseObserver); @@ -118,8 +136,11 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService */ - public static final class RouteLookupServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class RouteLookupServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements RouteLookupServiceAsync { private RouteLookupServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -136,6 +157,7 @@ protected RouteLookupServiceStub build( * Lookup returns a target for a single key. * */ + @java.lang.Override public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -145,7 +167,24 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, /** */ - public static final class RouteLookupServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface RouteLookupServiceBlocking { + + /** + * 
+     * Lookup returns a target for a single key.
+     *
+ */ + default io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.RouteLookupRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service RouteLookupService + */ + public static final class RouteLookupServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements RouteLookupServiceBlocking { private RouteLookupServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -162,6 +201,7 @@ protected RouteLookupServiceBlockingStub build( * Lookup returns a target for a single key. * */ + @java.lang.Override public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.RouteLookupRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getRouteLookupMethod(), getCallOptions(), request); @@ -170,7 +210,25 @@ public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.Route /** */ - public static final class RouteLookupServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface RouteLookupServiceFuture { + + /** + * 
+     * Lookup returns a target for a single key.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture routeLookup( + io.grpc.lookup.v1.RouteLookupRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService + */ + public static final class RouteLookupServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements RouteLookupServiceFuture { private RouteLookupServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -187,6 +245,7 @@ protected RouteLookupServiceFutureStub build( * Lookup returns a target for a single key. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture routeLookup( io.grpc.lookup.v1.RouteLookupRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index e9753907e63..20da73e8d5b 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -286,7 +286,7 @@ public ChannelzFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions c * information. * */ - public static abstract class ChannelzImplBase implements io.grpc.BindableService { + public interface ChannelzAsync { /** * 
@@ -294,6 +294,89 @@ public static abstract class ChannelzImplBase implements io.grpc.BindableService
      * created). This does not include subchannels nor non-top level channels.
      *
*/ + default void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetTopChannelsMethod(), responseObserver); + } + + /** + * 
+     * Gets all servers that exist in the process.
+     *
+ */ + default void getServers(io.grpc.channelz.v1.GetServersRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServersMethod(), responseObserver); + } + + /** + * 
+     * Returns a single Server, or else a NOT_FOUND code.
+     *
+ */ + default void getServer(io.grpc.channelz.v1.GetServerRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerMethod(), responseObserver); + } + + /** + * 
+     * Gets all server sockets that exist in the process.
+     *
+ */ + default void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerSocketsMethod(), responseObserver); + } + + /** + * 
+     * Returns a single Channel, or else a NOT_FOUND code.
+     *
+ */ + default void getChannel(io.grpc.channelz.v1.GetChannelRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetChannelMethod(), responseObserver); + } + + /** + * 
+     * Returns a single Subchannel, or else a NOT_FOUND code.
+     *
+ */ + default void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSubchannelMethod(), responseObserver); + } + + /** + * 
+     * Returns a single Socket or else a NOT_FOUND code.
+     *
+ */ + default void getSocket(io.grpc.channelz.v1.GetSocketRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSocketMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service Channelz + * 
+   * Channelz is a service exposed by gRPC servers that provides detailed debug
+   * information.
+   *
+ */ + public static abstract class ChannelzImplBase + implements io.grpc.BindableService, ChannelzAsync { + + /** + * 
+     * Gets all root channels (i.e. channels the application has directly
+     * created). This does not include subchannels nor non-top level channels.
+     *
+ */ + @java.lang.Override public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetTopChannelsMethod(), responseObserver); @@ -304,6 +387,7 @@ public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, * Gets all servers that exist in the process. * */ + @java.lang.Override public void getServers(io.grpc.channelz.v1.GetServersRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServersMethod(), responseObserver); @@ -314,6 +398,7 @@ public void getServers(io.grpc.channelz.v1.GetServersRequest request, * Returns a single Server, or else a NOT_FOUND code. * */ + @java.lang.Override public void getServer(io.grpc.channelz.v1.GetServerRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerMethod(), responseObserver); @@ -324,6 +409,7 @@ public void getServer(io.grpc.channelz.v1.GetServerRequest request, * Gets all server sockets that exist in the process. * */ + @java.lang.Override public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerSocketsMethod(), responseObserver); @@ -334,6 +420,7 @@ public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request * Returns a single Channel, or else a NOT_FOUND code. * */ + @java.lang.Override public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetChannelMethod(), responseObserver); @@ -344,6 +431,7 @@ public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, * Returns a single Subchannel, or else a NOT_FOUND code. * */ + @java.lang.Override public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSubchannelMethod(), responseObserver); @@ -354,6 +442,7 @@ public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, * Returns a single Socket or else a NOT_FOUND code. * */ + @java.lang.Override public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSocketMethod(), responseObserver); @@ -415,12 +504,15 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service Channelz * 
    * Channelz is a service exposed by gRPC servers that provides detailed debug
    * information.
    *
*/ - public static final class ChannelzStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ChannelzStub + extends io.grpc.stub.AbstractAsyncStub + implements ChannelzAsync { private ChannelzStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -438,6 +530,7 @@ protected ChannelzStub build( * created). This does not include subchannels nor non-top level channels. * */ + @java.lang.Override public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -449,6 +542,7 @@ public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, * Gets all servers that exist in the process. * */ + @java.lang.Override public void getServers(io.grpc.channelz.v1.GetServersRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -460,6 +554,7 @@ public void getServers(io.grpc.channelz.v1.GetServersRequest request, * Returns a single Server, or else a NOT_FOUND code. * */ + @java.lang.Override public void getServer(io.grpc.channelz.v1.GetServerRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -471,6 +566,7 @@ public void getServer(io.grpc.channelz.v1.GetServerRequest request, * Gets all server sockets that exist in the process. * */ + @java.lang.Override public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -482,6 +578,7 @@ public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request * Returns a single Channel, or else a NOT_FOUND code. * */ + @java.lang.Override public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -493,6 +590,7 @@ public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, * Returns a single Subchannel, or else a NOT_FOUND code. * */ + @java.lang.Override public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -504,6 +602,7 @@ public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, * Returns a single Socket or else a NOT_FOUND code. * */ + @java.lang.Override public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -517,7 +616,83 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * information. * */ - public static final class ChannelzBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ChannelzBlocking { + + /** + * 
+     * Gets all root channels (i.e. channels the application has directly
+     * created). This does not include subchannels nor non-top level channels.
+     *
+ */ + default io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets all servers that exist in the process.
+     *
+ */ + default io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.GetServersRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Server, or else a NOT_FOUND code.
+     *
+ */ + default io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetServerRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets all server sockets that exist in the process.
+     *
+ */ + default io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Channel, or else a NOT_FOUND code.
+     *
+ */ + default io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.GetChannelRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Subchannel, or else a NOT_FOUND code.
+     *
+ */ + default io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Socket or else a NOT_FOUND code.
+     *
+ */ + default io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSocketRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service Channelz + * 
+   * Channelz is a service exposed by gRPC servers that provides detailed debug
+   * information.
+   *
+ */ + public static final class ChannelzBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ChannelzBlocking { private ChannelzBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -535,6 +710,7 @@ protected ChannelzBlockingStub build( * created). This does not include subchannels nor non-top level channels. * */ + @java.lang.Override public io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetTopChannelsMethod(), getCallOptions(), request); @@ -545,6 +721,7 @@ public io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channel * Gets all servers that exist in the process. * */ + @java.lang.Override public io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.GetServersRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServersMethod(), getCallOptions(), request); @@ -555,6 +732,7 @@ public io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.Get * Returns a single Server, or else a NOT_FOUND code. * */ + @java.lang.Override public io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetServerRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServerMethod(), getCallOptions(), request); @@ -565,6 +743,7 @@ public io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetSe * Gets all server sockets that exist in the process. * */ + @java.lang.Override public io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServerSocketsMethod(), getCallOptions(), request); @@ -575,6 +754,7 @@ public io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.cha * Returns a single Channel, or else a NOT_FOUND code. * */ + @java.lang.Override public io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.GetChannelRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetChannelMethod(), getCallOptions(), request); @@ -585,6 +765,7 @@ public io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.Get * Returns a single Subchannel, or else a NOT_FOUND code. * */ + @java.lang.Override public io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetSubchannelMethod(), getCallOptions(), request); @@ -595,6 +776,7 @@ public io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz. * Returns a single Socket or else a NOT_FOUND code. * */ + @java.lang.Override public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSocketRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetSocketMethod(), getCallOptions(), request); @@ -607,7 +789,90 @@ public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSo * information. * */ - public static final class ChannelzFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ChannelzFuture { + + /** + * 
+     * Gets all root channels (i.e. channels the application has directly
+     * created). This does not include subchannels nor non-top level channels.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getTopChannels( + io.grpc.channelz.v1.GetTopChannelsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets all servers that exist in the process.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getServers( + io.grpc.channelz.v1.GetServersRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Server, or else a NOT_FOUND code.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getServer( + io.grpc.channelz.v1.GetServerRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets all server sockets that exist in the process.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getServerSockets( + io.grpc.channelz.v1.GetServerSocketsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Channel, or else a NOT_FOUND code.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getChannel( + io.grpc.channelz.v1.GetChannelRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Subchannel, or else a NOT_FOUND code.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getSubchannel( + io.grpc.channelz.v1.GetSubchannelRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns a single Socket or else a NOT_FOUND code.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getSocket( + io.grpc.channelz.v1.GetSocketRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service Channelz + * 
+   * Channelz is a service exposed by gRPC servers that provides detailed debug
+   * information.
+   *
+ */ + public static final class ChannelzFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ChannelzFuture { private ChannelzFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -625,6 +890,7 @@ protected ChannelzFutureStub build( * created). This does not include subchannels nor non-top level channels. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getTopChannels( io.grpc.channelz.v1.GetTopChannelsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -636,6 +902,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServers( io.grpc.channelz.v1.GetServersRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -647,6 +914,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServer( io.grpc.channelz.v1.GetServerRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -658,6 +926,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServerSockets( io.grpc.channelz.v1.GetServerSocketsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -669,6 +938,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getChannel( io.grpc.channelz.v1.GetChannelRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -680,6 +950,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getSubchannel( io.grpc.channelz.v1.GetSubchannelRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -691,6 +962,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getSocket( io.grpc.channelz.v1.GetSocketRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index 7943efb4672..9cb6b27c68b 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -123,7 +123,7 @@ public HealthFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions cal /** */ - public static abstract class HealthImplBase implements io.grpc.BindableService { + public interface HealthAsync { /** * 
@@ -131,6 +131,47 @@ public static abstract class HealthImplBase implements io.grpc.BindableService {
      * NOT_FOUND.
      *
*/ + default void check(io.grpc.health.v1.HealthCheckRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCheckMethod(), responseObserver); + } + + /** + * 
+     * Performs a watch for the serving status of the requested service.
+     * The server will immediately send back a message indicating the current
+     * serving status.  It will then subsequently send a new message whenever
+     * the service's serving status changes.
+     * If the requested service is unknown when the call is received, the
+     * server will send a message setting the serving status to
+     * SERVICE_UNKNOWN but will *not* terminate the call.  If at some
+     * future point, the serving status of the service becomes known, the
+     * server will send a new message with the service's serving status.
+     * If the call terminates with status UNIMPLEMENTED, then clients
+     * should assume this method is not supported and should not retry the
+     * call.  If the call terminates with any other status (including OK),
+     * clients should retry the call with appropriate exponential backoff.
+     *
+ */ + default void watch(io.grpc.health.v1.HealthCheckRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getWatchMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service Health + */ + public static abstract class HealthImplBase + implements io.grpc.BindableService, HealthAsync { + + /** + * 
+     * If the requested service is unknown, the call will fail with status
+     * NOT_FOUND.
+     *
+ */ + @java.lang.Override public void check(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCheckMethod(), responseObserver); @@ -153,6 +194,7 @@ public void check(io.grpc.health.v1.HealthCheckRequest request, * clients should retry the call with appropriate exponential backoff. * */ + @java.lang.Override public void watch(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getWatchMethod(), responseObserver); @@ -179,8 +221,11 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service Health */ - public static final class HealthStub extends io.grpc.stub.AbstractAsyncStub { + public static final class HealthStub + extends io.grpc.stub.AbstractAsyncStub + implements HealthAsync { private HealthStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,6 +243,7 @@ protected HealthStub build( * NOT_FOUND. * */ + @java.lang.Override public void check(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -221,6 +267,7 @@ public void check(io.grpc.health.v1.HealthCheckRequest request, * clients should retry the call with appropriate exponential backoff. * */ + @java.lang.Override public void watch(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -230,7 +277,47 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, /** */ - public static final class HealthBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface HealthBlocking { + + /** + * 
+     * If the requested service is unknown, the call will fail with status
+     * NOT_FOUND.
+     *
+ */ + default io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheckRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Performs a watch for the serving status of the requested service.
+     * The server will immediately send back a message indicating the current
+     * serving status.  It will then subsequently send a new message whenever
+     * the service's serving status changes.
+     * If the requested service is unknown when the call is received, the
+     * server will send a message setting the serving status to
+     * SERVICE_UNKNOWN but will *not* terminate the call.  If at some
+     * future point, the serving status of the service becomes known, the
+     * server will send a new message with the service's serving status.
+     * If the call terminates with status UNIMPLEMENTED, then clients
+     * should assume this method is not supported and should not retry the
+     * call.  If the call terminates with any other status (including OK),
+     * clients should retry the call with appropriate exponential backoff.
+     *
+ */ + default java.util.Iterator watch( + io.grpc.health.v1.HealthCheckRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service Health + */ + public static final class HealthBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements HealthBlocking { private HealthBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -248,6 +335,7 @@ protected HealthBlockingStub build( * NOT_FOUND. * */ + @java.lang.Override public io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCheckMethod(), getCallOptions(), request); @@ -270,6 +358,7 @@ public io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheck * clients should retry the call with appropriate exponential backoff. * */ + @java.lang.Override public java.util.Iterator watch( io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -279,7 +368,26 @@ public java.util.Iterator watch( /** */ - public static final class HealthFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface HealthFuture { + + /** + * 
+     * If the requested service is unknown, the call will fail with status
+     * NOT_FOUND.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture check( + io.grpc.health.v1.HealthCheckRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service Health + */ + public static final class HealthFutureStub + extends io.grpc.stub.AbstractFutureStub + implements HealthFuture { private HealthFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -297,6 +405,7 @@ protected HealthFutureStub build( * NOT_FOUND. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture check( io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index be933313bb0..a8ad845c5ef 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -92,7 +92,7 @@ public ServerReflectionFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO /** */ - public static abstract class ServerReflectionImplBase implements io.grpc.BindableService { + public interface ServerReflectionAsync { /** * 
@@ -100,6 +100,25 @@ public static abstract class ServerReflectionImplBase implements io.grpc.Bindabl
      * all related requests go to a single server.
      *
*/ + default io.grpc.stub.StreamObserver serverReflectionInfo( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getServerReflectionInfoMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ServerReflection + */ + public static abstract class ServerReflectionImplBase + implements io.grpc.BindableService, ServerReflectionAsync { + + /** + * 
+     * The reflection service is structured as a bidirectional stream, ensuring
+     * all related requests go to a single server.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver serverReflectionInfo( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getServerReflectionInfoMethod(), responseObserver); @@ -119,8 +138,11 @@ public io.grpc.stub.StreamObserver { + public static final class ServerReflectionStub + extends io.grpc.stub.AbstractAsyncStub + implements ServerReflectionAsync { private ServerReflectionStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -138,6 +160,7 @@ protected ServerReflectionStub build( * all related requests go to a single server. * */ + @java.lang.Override public io.grpc.stub.StreamObserver serverReflectionInfo( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -147,7 +170,15 @@ public io.grpc.stub.StreamObserver { + public interface ServerReflectionBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ServerReflection + */ + public static final class ServerReflectionBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ServerReflectionBlocking { private ServerReflectionBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -162,7 +193,15 @@ protected ServerReflectionBlockingStub build( /** */ - public static final class ServerReflectionFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ServerReflectionFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection + */ + public static final class ServerReflectionFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ServerReflectionFuture { private ServerReflectionFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index d4e910fd1a4..b5a1798ac65 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -98,13 +98,34 @@ public AnotherDynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc. * AnotherDynamicService * */ - public static abstract class AnotherDynamicServiceImplBase implements io.grpc.BindableService { + public interface AnotherDynamicServiceAsync { /** * 
      * A method
      *
*/ + default void method(io.grpc.reflection.testing.DynamicRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service AnotherDynamicService + * 
+   * AnotherDynamicService
+   *
+ */ + public static abstract class AnotherDynamicServiceImplBase + implements io.grpc.BindableService, AnotherDynamicServiceAsync { + + /** + * 
+     * A method
+     *
+ */ + @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); @@ -124,11 +145,14 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service AnotherDynamicService * 
    * AnotherDynamicService
    *
*/ - public static final class AnotherDynamicServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class AnotherDynamicServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements AnotherDynamicServiceAsync { private AnotherDynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -145,6 +169,7 @@ protected AnotherDynamicServiceStub build( * A method * */ + @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -157,7 +182,27 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * AnotherDynamicService * */ - public static final class AnotherDynamicServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface AnotherDynamicServiceBlocking { + + /** + * 
+     * A method
+     *
+ */ + default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service AnotherDynamicService + * 
+   * AnotherDynamicService
+   *
+ */ + public static final class AnotherDynamicServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements AnotherDynamicServiceBlocking { private AnotherDynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -174,6 +219,7 @@ protected AnotherDynamicServiceBlockingStub build( * A method * */ + @java.lang.Override public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); @@ -185,7 +231,28 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * AnotherDynamicService * */ - public static final class AnotherDynamicServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface AnotherDynamicServiceFuture { + + /** + * 
+     * A method
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture method( + io.grpc.reflection.testing.DynamicRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherDynamicService + * 
+   * AnotherDynamicService
+   *
+ */ + public static final class AnotherDynamicServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements AnotherDynamicServiceFuture { private AnotherDynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,6 +269,7 @@ protected AnotherDynamicServiceFutureStub build( * A method * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index 6aee82f01ec..0c8f47c2800 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -92,10 +92,25 @@ public AnotherReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.g /** */ - public static abstract class AnotherReflectableServiceImplBase implements io.grpc.BindableService { + public interface AnotherReflectableServiceAsync { /** */ + default void method(io.grpc.reflection.testing.Request request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service AnotherReflectableService + */ + public static abstract class AnotherReflectableServiceImplBase + implements io.grpc.BindableService, AnotherReflectableServiceAsync { + + /** + */ + @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); @@ -115,8 +130,11 @@ public void method(io.grpc.reflection.testing.Request request, } /** + * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService */ - public static final class AnotherReflectableServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class AnotherReflectableServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements AnotherReflectableServiceAsync { private AnotherReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -130,6 +148,7 @@ protected AnotherReflectableServiceStub build( /** */ + @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -139,7 +158,21 @@ public void method(io.grpc.reflection.testing.Request request, /** */ - public static final class AnotherReflectableServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface AnotherReflectableServiceBlocking { + + /** + */ + default io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService + */ + public static final class AnotherReflectableServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements AnotherReflectableServiceBlocking { private AnotherReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -153,6 +186,7 @@ protected AnotherReflectableServiceBlockingStub build( /** */ + @java.lang.Override public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); @@ -161,7 +195,22 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques /** */ - public static final class AnotherReflectableServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface AnotherReflectableServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture method( + io.grpc.reflection.testing.Request request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService + */ + public static final class AnotherReflectableServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements AnotherReflectableServiceFuture { private AnotherReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -175,6 +224,7 @@ protected AnotherReflectableServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index f53cf02de1c..cb4295506fe 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -98,13 +98,34 @@ public DynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt * A DynamicService * */ - public static abstract class DynamicServiceImplBase implements io.grpc.BindableService { + public interface DynamicServiceAsync { /** * 
      * A method
      *
*/ + default void method(io.grpc.reflection.testing.DynamicRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service DynamicService + * 
+   * A DynamicService
+   *
+ */ + public static abstract class DynamicServiceImplBase + implements io.grpc.BindableService, DynamicServiceAsync { + + /** + * 
+     * A method
+     *
+ */ + @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); @@ -124,11 +145,14 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service DynamicService * 
    * A DynamicService
    *
*/ - public static final class DynamicServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class DynamicServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements DynamicServiceAsync { private DynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -145,6 +169,7 @@ protected DynamicServiceStub build( * A method * */ + @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -157,7 +182,27 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * A DynamicService * */ - public static final class DynamicServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface DynamicServiceBlocking { + + /** + * 
+     * A method
+     *
+ */ + default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service DynamicService + * 
+   * A DynamicService
+   *
+ */ + public static final class DynamicServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements DynamicServiceBlocking { private DynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -174,6 +219,7 @@ protected DynamicServiceBlockingStub build( * A method * */ + @java.lang.Override public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); @@ -185,7 +231,28 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * A DynamicService * */ - public static final class DynamicServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface DynamicServiceFuture { + + /** + * 
+     * A method
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture method( + io.grpc.reflection.testing.DynamicRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service DynamicService + * 
+   * A DynamicService
+   *
+ */ + public static final class DynamicServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements DynamicServiceFuture { private DynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,6 +269,7 @@ protected DynamicServiceFutureStub build( * A method * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index 9bdff6205f6..d62e0ae3b61 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -92,10 +92,25 @@ public ReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ - public static abstract class ReflectableServiceImplBase implements io.grpc.BindableService { + public interface ReflectableServiceAsync { /** */ + default void method(io.grpc.reflection.testing.Request request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ReflectableService + */ + public static abstract class ReflectableServiceImplBase + implements io.grpc.BindableService, ReflectableServiceAsync { + + /** + */ + @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); @@ -115,8 +130,11 @@ public void method(io.grpc.reflection.testing.Request request, } /** + * A stub to allow clients to do asynchronous rpc calls to service ReflectableService */ - public static final class ReflectableServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ReflectableServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ReflectableServiceAsync { private ReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -130,6 +148,7 @@ protected ReflectableServiceStub build( /** */ + @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -139,7 +158,21 @@ public void method(io.grpc.reflection.testing.Request request, /** */ - public static final class ReflectableServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ReflectableServiceBlocking { + + /** + */ + default io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ReflectableService + */ + public static final class ReflectableServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ReflectableServiceBlocking { private ReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -153,6 +186,7 @@ protected ReflectableServiceBlockingStub build( /** */ + @java.lang.Override public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); @@ -161,7 +195,22 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques /** */ - public static final class ReflectableServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ReflectableServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture method( + io.grpc.reflection.testing.Request request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService + */ + public static final class ReflectableServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ReflectableServiceFuture { private ReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -175,6 +224,7 @@ protected ReflectableServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index e0aa8936e7b..53ceb65e2c7 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -191,13 +191,64 @@ public SimpleServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti * A simple service for test. * */ - public static abstract class SimpleServiceImplBase implements io.grpc.BindableService { + public interface SimpleServiceAsync { /** * 
      * Simple unary RPC.
      *
*/ + default void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryRpcMethod(), responseObserver); + } + + /** + * 
+     * Simple client-to-server streaming RPC.
+     *
+ */ + default io.grpc.stub.StreamObserver clientStreamingRpc( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getClientStreamingRpcMethod(), responseObserver); + } + + /** + * 
+     * Simple server-to-client streaming RPC.
+     *
+ */ + default void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getServerStreamingRpcMethod(), responseObserver); + } + + /** + * 
+     * Simple bidirectional streaming RPC.
+     *
+ */ + default io.grpc.stub.StreamObserver bidiStreamingRpc( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBidiStreamingRpcMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service SimpleService + * 
+   * A simple service for test.
+   *
+ */ + public static abstract class SimpleServiceImplBase + implements io.grpc.BindableService, SimpleServiceAsync { + + /** + * 
+     * Simple unary RPC.
+     *
+ */ + @java.lang.Override public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryRpcMethod(), responseObserver); @@ -208,6 +259,7 @@ public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple client-to-server streaming RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver clientStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getClientStreamingRpcMethod(), responseObserver); @@ -218,6 +270,7 @@ public io.grpc.stub.StreamObserver clien * Simple server-to-client streaming RPC. * */ + @java.lang.Override public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getServerStreamingRpcMethod(), responseObserver); @@ -228,6 +281,7 @@ public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple bidirectional streaming RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver bidiStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBidiStreamingRpcMethod(), responseObserver); @@ -268,11 +322,14 @@ public io.grpc.stub.StreamObserver bidiS } /** + * A stub to allow clients to do asynchronous rpc calls to service SimpleService * 
    * A simple service for test.
    *
*/ - public static final class SimpleServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class SimpleServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements SimpleServiceAsync { private SimpleServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -289,6 +346,7 @@ protected SimpleServiceStub build( * Simple unary RPC. * */ + @java.lang.Override public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -300,6 +358,7 @@ public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple client-to-server streaming RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver clientStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -311,6 +370,7 @@ public io.grpc.stub.StreamObserver clien * Simple server-to-client streaming RPC. * */ + @java.lang.Override public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -322,6 +382,7 @@ public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple bidirectional streaming RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver bidiStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -334,7 +395,37 @@ public io.grpc.stub.StreamObserver bidiS * A simple service for test. * */ - public static final class SimpleServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface SimpleServiceBlocking { + + /** + * 
+     * Simple unary RPC.
+     *
+ */ + default io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Simple server-to-client streaming RPC.
+     *
+ */ + default java.util.Iterator serverStreamingRpc( + io.grpc.testing.protobuf.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service SimpleService + * 
+   * A simple service for test.
+   *
+ */ + public static final class SimpleServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements SimpleServiceBlocking { private SimpleServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -351,6 +442,7 @@ protected SimpleServiceBlockingStub build( * Simple unary RPC. * */ + @java.lang.Override public io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryRpcMethod(), getCallOptions(), request); @@ -361,6 +453,7 @@ public io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf * Simple server-to-client streaming RPC. * */ + @java.lang.Override public java.util.Iterator serverStreamingRpc( io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -373,7 +466,28 @@ public java.util.Iterator serverStreami * A simple service for test. * */ - public static final class SimpleServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface SimpleServiceFuture { + + /** + * 
+     * Simple unary RPC.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture unaryRpc( + io.grpc.testing.protobuf.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service SimpleService + * 
+   * A simple service for test.
+   *
+ */ + public static final class SimpleServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements SimpleServiceFuture { private SimpleServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -390,6 +504,7 @@ protected SimpleServiceFutureStub build( * Simple unary RPC. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryRpc( io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index 52ec6898808..fab38a05781 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -112,10 +112,35 @@ public OpenRcaServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt * a new call to change backend reporting frequency. * */ - public static abstract class OpenRcaServiceImplBase implements io.grpc.BindableService { + public interface OpenRcaServiceAsync { /** */ + default void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamCoreMetricsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service OpenRcaService + * 
+   * Out-of-band (OOB) load reporting service for the additional load reporting
+   * agent that does not sit in the request path. Reports are periodically sampled
+   * with sufficient frequency to provide temporal association with requests.
+   * OOB reporting compensates the limitation of in-band reporting in revealing
+   * costs for backends that do not provide a steady stream of telemetry such as
+   * long running stream operations and zero QPS services. This is a server
+   * streaming service, client needs to terminate current RPC and initiate
+   * a new call to change backend reporting frequency.
+   *
+ */ + public static abstract class OpenRcaServiceImplBase + implements io.grpc.BindableService, OpenRcaServiceAsync { + + /** + */ + @java.lang.Override public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamCoreMetricsMethod(), responseObserver); @@ -135,6 +160,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque } /** + * A stub to allow clients to do asynchronous rpc calls to service OpenRcaService * 
    * Out-of-band (OOB) load reporting service for the additional load reporting
    * agent that does not sit in the request path. Reports are periodically sampled
@@ -146,7 +172,9 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque
    * a new call to change backend reporting frequency.
    *
*/ - public static final class OpenRcaServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class OpenRcaServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements OpenRcaServiceAsync { private OpenRcaServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -160,6 +188,7 @@ protected OpenRcaServiceStub build( /** */ + @java.lang.Override public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -179,7 +208,32 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque * a new call to change backend reporting frequency. * */ - public static final class OpenRcaServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface OpenRcaServiceBlocking { + + /** + */ + default java.util.Iterator streamCoreMetrics( + com.github.xds.service.orca.v3.OrcaLoadReportRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service OpenRcaService + * 
+   * Out-of-band (OOB) load reporting service for the additional load reporting
+   * agent that does not sit in the request path. Reports are periodically sampled
+   * with sufficient frequency to provide temporal association with requests.
+   * OOB reporting compensates the limitation of in-band reporting in revealing
+   * costs for backends that do not provide a steady stream of telemetry such as
+   * long running stream operations and zero QPS services. This is a server
+   * streaming service, client needs to terminate current RPC and initiate
+   * a new call to change backend reporting frequency.
+   *
+ */ + public static final class OpenRcaServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements OpenRcaServiceBlocking { private OpenRcaServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -193,6 +247,7 @@ protected OpenRcaServiceBlockingStub build( /** */ + @java.lang.Override public java.util.Iterator streamCoreMetrics( com.github.xds.service.orca.v3.OrcaLoadReportRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -212,7 +267,25 @@ public java.util.Iterator streamCore * a new call to change backend reporting frequency. * */ - public static final class OpenRcaServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface OpenRcaServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service OpenRcaService + * 
+   * Out-of-band (OOB) load reporting service for the additional load reporting
+   * agent that does not sit in the request path. Reports are periodically sampled
+   * with sufficient frequency to provide temporal association with requests.
+   * OOB reporting compensates the limitation of in-band reporting in revealing
+   * costs for backends that do not provide a steady stream of telemetry such as
+   * long running stream operations and zero QPS services. This is a server
+   * streaming service, client needs to terminate current RPC and initiate
+   * a new call to change backend reporting frequency.
+   *
+ */ + public static final class OpenRcaServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements OpenRcaServiceFuture { private OpenRcaServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index fbf9034a2b0..15d65286887 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -160,10 +160,42 @@ public ClusterDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grp * Return list of all clusters this proxy will load balance to. * */ - public static abstract class ClusterDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface ClusterDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver streamClusters( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClustersMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaClusters( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaClustersMethod(), responseObserver); + } + + /** + */ + default void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClustersMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ClusterDiscoveryService + * 
+   * Return list of all clusters this proxy will load balance to.
+   *
+ */ + public static abstract class ClusterDiscoveryServiceImplBase + implements io.grpc.BindableService, ClusterDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver streamClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClustersMethod(), responseObserver); @@ -171,6 +203,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaClustersMethod(), responseObserver); @@ -178,6 +211,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClustersMethod(), responseObserver); @@ -211,11 +245,14 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service ClusterDiscoveryService * 
    * Return list of all clusters this proxy will load balance to.
    *
*/ - public static final class ClusterDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ClusterDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ClusterDiscoveryServiceAsync { private ClusterDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -229,6 +266,7 @@ protected ClusterDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver streamClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -237,6 +275,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -245,6 +284,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -257,7 +297,24 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * Return list of all clusters this proxy will load balance to. * */ - public static final class ClusterDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ClusterDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ClusterDiscoveryService + * 
+   * Return list of all clusters this proxy will load balance to.
+   *
+ */ + public static final class ClusterDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ClusterDiscoveryServiceBlocking { private ClusterDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,6 +328,7 @@ protected ClusterDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchClustersMethod(), getCallOptions(), request); @@ -282,7 +340,25 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy. * Return list of all clusters this proxy will load balance to. * */ - public static final class ClusterDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ClusterDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchClusters( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ClusterDiscoveryService + * 
+   * Return list of all clusters this proxy will load balance to.
+   *
+ */ + public static final class ClusterDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ClusterDiscoveryServiceFuture { private ClusterDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -296,6 +372,7 @@ protected ClusterDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchClusters( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index ef31f860220..36f1e5b45ef 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -154,7 +154,7 @@ public EndpointDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr /** */ - public static abstract class EndpointDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface EndpointDiscoveryServiceAsync { /** * 
@@ -162,6 +162,39 @@ public static abstract class EndpointDiscoveryServiceImplBase implements io.grpc
      * to subscribe to updates for.
      *
*/ + default io.grpc.stub.StreamObserver streamEndpoints( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamEndpointsMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaEndpoints( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaEndpointsMethod(), responseObserver); + } + + /** + */ + default void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchEndpointsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service EndpointDiscoveryService + */ + public static abstract class EndpointDiscoveryServiceImplBase + implements io.grpc.BindableService, EndpointDiscoveryServiceAsync { + + /** + * 
+     * The resource_names field in DiscoveryRequest specifies a list of clusters
+     * to subscribe to updates for.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver streamEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamEndpointsMethod(), responseObserver); @@ -169,6 +202,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaEndpointsMethod(), responseObserver); @@ -176,6 +210,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchEndpointsMethod(), responseObserver); @@ -209,8 +244,11 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService */ - public static final class EndpointDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class EndpointDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements EndpointDiscoveryServiceAsync { private EndpointDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -228,6 +266,7 @@ protected EndpointDiscoveryServiceStub build( * to subscribe to updates for. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -236,6 +275,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -244,6 +284,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -253,7 +294,21 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, /** */ - public static final class EndpointDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface EndpointDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService + */ + public static final class EndpointDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements EndpointDiscoveryServiceBlocking { private EndpointDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -267,6 +322,7 @@ protected EndpointDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchEndpointsMethod(), getCallOptions(), request); @@ -275,7 +331,22 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy /** */ - public static final class EndpointDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface EndpointDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchEndpoints( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService + */ + public static final class EndpointDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements EndpointDiscoveryServiceFuture { private EndpointDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -289,6 +360,7 @@ protected EndpointDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchEndpoints( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index 1f68672c4d2..15bcf298dd8 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -166,10 +166,45 @@ public ListenerDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr * allowed to drain from listeners that are no longer present. * */ - public static abstract class ListenerDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface ListenerDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver deltaListeners( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaListenersMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver streamListeners( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamListenersMethod(), responseObserver); + } + + /** + */ + default void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchListenersMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ListenerDiscoveryService + * 
+   * The Envoy instance initiates an RPC at startup to discover a list of
+   * listeners. Updates are delivered via streaming from the LDS server and
+   * consist of a complete update of all listeners. Existing connections will be
+   * allowed to drain from listeners that are no longer present.
+   *
+ */ + public static abstract class ListenerDiscoveryServiceImplBase + implements io.grpc.BindableService, ListenerDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaListenersMethod(), responseObserver); @@ -177,6 +212,7 @@ public io.grpc.stub.StreamObserver streamListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamListenersMethod(), responseObserver); @@ -184,6 +220,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchListenersMethod(), responseObserver); @@ -217,6 +254,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service ListenerDiscoveryService * 
    * The Envoy instance initiates an RPC at startup to discover a list of
    * listeners. Updates are delivered via streaming from the LDS server and
@@ -224,7 +262,9 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    * allowed to drain from listeners that are no longer present.
    *
*/ - public static final class ListenerDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ListenerDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ListenerDiscoveryServiceAsync { private ListenerDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -238,6 +278,7 @@ protected ListenerDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -246,6 +287,7 @@ public io.grpc.stub.StreamObserver streamListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -254,6 +296,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -269,7 +312,27 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * allowed to drain from listeners that are no longer present. * */ - public static final class ListenerDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ListenerDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ListenerDiscoveryService + * 
+   * The Envoy instance initiates an RPC at startup to discover a list of
+   * listeners. Updates are delivered via streaming from the LDS server and
+   * consist of a complete update of all listeners. Existing connections will be
+   * allowed to drain from listeners that are no longer present.
+   *
+ */ + public static final class ListenerDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ListenerDiscoveryServiceBlocking { private ListenerDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -283,6 +346,7 @@ protected ListenerDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchListenersMethod(), getCallOptions(), request); @@ -297,7 +361,28 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy * allowed to drain from listeners that are no longer present. * */ - public static final class ListenerDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ListenerDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchListeners( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ListenerDiscoveryService + * 
+   * The Envoy instance initiates an RPC at startup to discover a list of
+   * listeners. Updates are delivered via streaming from the LDS server and
+   * consist of a complete update of all listeners. Existing connections will be
+   * allowed to drain from listeners that are no longer present.
+   *
+ */ + public static final class ListenerDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ListenerDiscoveryServiceFuture { private ListenerDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -311,6 +396,7 @@ protected ListenerDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchListeners( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index 9f83d7862a5..c719125eba5 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -168,10 +168,46 @@ public RouteDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc. * a route table via this identifier. * */ - public static abstract class RouteDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface RouteDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver streamRoutes( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamRoutesMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaRoutes( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaRoutesMethod(), responseObserver); + } + + /** + */ + default void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchRoutesMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service RouteDiscoveryService + * 
+   * The resource_names field in DiscoveryRequest specifies a route configuration.
+   * This allows an Envoy configuration with multiple HTTP listeners (and
+   * associated HTTP connection manager filters) to use different route
+   * configurations. Each listener will bind its HTTP connection manager filter to
+   * a route table via this identifier.
+   *
+ */ + public static abstract class RouteDiscoveryServiceImplBase + implements io.grpc.BindableService, RouteDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver streamRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamRoutesMethod(), responseObserver); @@ -179,6 +215,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaRoutesMethod(), responseObserver); @@ -186,6 +223,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchRoutesMethod(), responseObserver); @@ -219,6 +257,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service RouteDiscoveryService * 
    * The resource_names field in DiscoveryRequest specifies a route configuration.
    * This allows an Envoy configuration with multiple HTTP listeners (and
@@ -227,7 +266,9 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    * a route table via this identifier.
    *
*/ - public static final class RouteDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class RouteDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements RouteDiscoveryServiceAsync { private RouteDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -241,6 +282,7 @@ protected RouteDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver streamRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -249,6 +291,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -257,6 +300,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -273,7 +317,28 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * a route table via this identifier. * */ - public static final class RouteDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface RouteDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service RouteDiscoveryService + * 
+   * The resource_names field in DiscoveryRequest specifies a route configuration.
+   * This allows an Envoy configuration with multiple HTTP listeners (and
+   * associated HTTP connection manager filters) to use different route
+   * configurations. Each listener will bind its HTTP connection manager filter to
+   * a route table via this identifier.
+   *
+ */ + public static final class RouteDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements RouteDiscoveryServiceBlocking { private RouteDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -287,6 +352,7 @@ protected RouteDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchRoutesMethod(), getCallOptions(), request); @@ -302,7 +368,29 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.en * a route table via this identifier. * */ - public static final class RouteDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface RouteDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchRoutes( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteDiscoveryService + * 
+   * The resource_names field in DiscoveryRequest specifies a route configuration.
+   * This allows an Envoy configuration with multiple HTTP listeners (and
+   * associated HTTP connection manager filters) to use different route
+   * configurations. Each listener will bind its HTTP connection manager filter to
+   * a route table via this identifier.
+   *
+ */ + public static final class RouteDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements RouteDiscoveryServiceFuture { private RouteDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -316,6 +404,7 @@ protected RouteDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchRoutes( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index 5c3b36407c7..54759c7e5cb 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -172,10 +172,48 @@ public ScopedRoutesDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i * HTTP request. * */ - public static abstract class ScopedRoutesDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface ScopedRoutesDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver streamScopedRoutes( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamScopedRoutesMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaScopedRoutes( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaScopedRoutesMethod(), responseObserver); + } + + /** + */ + default void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchScopedRoutesMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ScopedRoutesDiscoveryService + * 
+   * The Scoped Routes Discovery Service (SRDS) API distributes
+   * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
+   * resources. Each ScopedRouteConfiguration resource represents a "routing
+   * scope" containing a mapping that allows the HTTP connection manager to
+   * dynamically assign a routing table (specified via a
+   * :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
+   * HTTP request.
+   *
+ */ + public static abstract class ScopedRoutesDiscoveryServiceImplBase + implements io.grpc.BindableService, ScopedRoutesDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver streamScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamScopedRoutesMethod(), responseObserver); @@ -183,6 +221,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaScopedRoutesMethod(), responseObserver); @@ -190,6 +229,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchScopedRoutesMethod(), responseObserver); @@ -223,6 +263,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques } /** + * A stub to allow clients to do asynchronous rpc calls to service ScopedRoutesDiscoveryService * 
    * The Scoped Routes Discovery Service (SRDS) API distributes
    * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
@@ -233,7 +274,9 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques
    * HTTP request.
    *
*/ - public static final class ScopedRoutesDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ScopedRoutesDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ScopedRoutesDiscoveryServiceAsync { private ScopedRoutesDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -247,6 +290,7 @@ protected ScopedRoutesDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver streamScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -255,6 +299,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -263,6 +308,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -281,7 +327,30 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques * HTTP request. * */ - public static final class ScopedRoutesDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ScopedRoutesDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ScopedRoutesDiscoveryService + * 
+   * The Scoped Routes Discovery Service (SRDS) API distributes
+   * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
+   * resources. Each ScopedRouteConfiguration resource represents a "routing
+   * scope" containing a mapping that allows the HTTP connection manager to
+   * dynamically assign a routing table (specified via a
+   * :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
+   * HTTP request.
+   *
+ */ + public static final class ScopedRoutesDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ScopedRoutesDiscoveryServiceBlocking { private ScopedRoutesDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -295,6 +364,7 @@ protected ScopedRoutesDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchScopedRoutesMethod(), getCallOptions(), request); @@ -312,7 +382,31 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoypr * HTTP request. * */ - public static final class ScopedRoutesDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ScopedRoutesDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchScopedRoutes( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ScopedRoutesDiscoveryService + * 
+   * The Scoped Routes Discovery Service (SRDS) API distributes
+   * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
+   * resources. Each ScopedRouteConfiguration resource represents a "routing
+   * scope" containing a mapping that allows the HTTP connection manager to
+   * dynamically assign a routing table (specified via a
+   * :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
+   * HTTP request.
+   *
+ */ + public static final class ScopedRoutesDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ScopedRoutesDiscoveryServiceFuture { private ScopedRoutesDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -326,6 +420,7 @@ protected ScopedRoutesDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchScopedRoutes( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index 02ce1c0735a..4876bd55314 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -116,10 +116,37 @@ public VirtualHostDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration. * */ - public static abstract class VirtualHostDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface VirtualHostDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver deltaVirtualHosts( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaVirtualHostsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service VirtualHostDiscoveryService + * 
+   * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
+   * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
+   * during the processing of an HTTP request if a route for the request cannot be resolved. The
+   * :ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>`
+   * field contains a list of virtual host names or aliases to track. The contents of an alias would
+   * be the contents of a *host* or *authority* header used to make an http request. An xDS server
+   * will match an alias to a virtual host based on the content of :ref:`domains'
+   * <envoy_api_field_route.VirtualHost.domains>` field. The *resource_names_unsubscribe* field
+   * contains a list of virtual host names that have been :ref:`unsubscribed
+   * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
+   *
+ */ + public static abstract class VirtualHostDiscoveryServiceImplBase + implements io.grpc.BindableService, VirtualHostDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaVirtualHosts( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaVirtualHostsMethod(), responseObserver); @@ -139,6 +166,7 @@ public io.grpc.stub.StreamObserver * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered @@ -152,7 +180,9 @@ public io.grpc.stub.StreamObserver */ - public static final class VirtualHostDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class VirtualHostDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements VirtualHostDiscoveryServiceAsync { private VirtualHostDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -166,6 +196,7 @@ protected VirtualHostDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaVirtualHosts( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -187,7 +218,27 @@ public io.grpc.stub.StreamObserver */ - public static final class VirtualHostDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface VirtualHostDiscoveryServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service VirtualHostDiscoveryService + * 
+   * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
+   * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
+   * during the processing of an HTTP request if a route for the request cannot be resolved. The
+   * :ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>`
+   * field contains a list of virtual host names or aliases to track. The contents of an alias would
+   * be the contents of a *host* or *authority* header used to make an http request. An xDS server
+   * will match an alias to a virtual host based on the content of :ref:`domains'
+   * <envoy_api_field_route.VirtualHost.domains>` field. The *resource_names_unsubscribe* field
+   * contains a list of virtual host names that have been :ref:`unsubscribed
+   * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
+   *
+ */ + public static final class VirtualHostDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements VirtualHostDiscoveryServiceBlocking { private VirtualHostDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -214,7 +265,27 @@ protected VirtualHostDiscoveryServiceBlockingStub build( * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration. * */ - public static final class VirtualHostDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface VirtualHostDiscoveryServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service VirtualHostDiscoveryService + * 
+   * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
+   * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
+   * during the processing of an HTTP request if a route for the request cannot be resolved. The
+   * :ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>`
+   * field contains a list of virtual host names or aliases to track. The contents of an alias would
+   * be the contents of a *host* or *authority* header used to make an http request. An xDS server
+   * will match an alias to a virtual host based on the content of :ref:`domains'
+   * <envoy_api_field_route.VirtualHost.domains>` field. The *resource_names_unsubscribe* field
+   * contains a list of virtual host names that have been :ref:`unsubscribed
+   * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
+   *
+ */ + public static final class VirtualHostDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements VirtualHostDiscoveryServiceFuture { private VirtualHostDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 971a9faf5cc..35c49ca06c1 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -139,13 +139,46 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io. * the multiplexed singleton APIs at the Envoy instance and management server. * */ - public static abstract class AggregatedDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface AggregatedDiscoveryServiceAsync { /** * 
      * This is a gRPC-only API.
      *
*/ + default io.grpc.stub.StreamObserver streamAggregatedResources( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaAggregatedResources( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static abstract class AggregatedDiscoveryServiceImplBase + implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { + + /** + * 
+     * This is a gRPC-only API.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); @@ -153,6 +186,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); @@ -179,6 +213,7 @@ public io.grpc.stub.StreamObserver * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of * ADS and how it is intended to be used by a management server. ADS requests @@ -188,7 +223,9 @@ public io.grpc.stub.StreamObserver */ - public static final class AggregatedDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class AggregatedDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements AggregatedDiscoveryServiceAsync { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -205,6 +242,7 @@ protected AggregatedDiscoveryServiceStub build( * This is a gRPC-only API. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -213,6 +251,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -230,7 +269,23 @@ public io.grpc.stub.StreamObserver */ - public static final class AggregatedDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface AggregatedDiscoveryServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static final class AggregatedDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements AggregatedDiscoveryServiceBlocking { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -253,7 +308,23 @@ protected AggregatedDiscoveryServiceBlockingStub build( * the multiplexed singleton APIs at the Envoy instance and management server. * */ - public static final class AggregatedDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface AggregatedDiscoveryServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static final class AggregatedDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements AggregatedDiscoveryServiceFuture { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index a5c41a905d8..966b9a7cb59 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -154,10 +154,39 @@ public SecretDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc /** */ - public static abstract class SecretDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface SecretDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver deltaSecrets( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaSecretsMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver streamSecrets( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamSecretsMethod(), responseObserver); + } + + /** + */ + default void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchSecretsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service SecretDiscoveryService + */ + public static abstract class SecretDiscoveryServiceImplBase + implements io.grpc.BindableService, SecretDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaSecretsMethod(), responseObserver); @@ -165,6 +194,7 @@ public io.grpc.stub.StreamObserver streamSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamSecretsMethod(), responseObserver); @@ -172,6 +202,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchSecretsMethod(), responseObserver); @@ -205,8 +236,11 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService */ - public static final class SecretDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class SecretDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements SecretDiscoveryServiceAsync { private SecretDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -220,6 +254,7 @@ protected SecretDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver deltaSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -228,6 +263,7 @@ public io.grpc.stub.StreamObserver streamSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -236,6 +272,7 @@ public io.grpc.stub.StreamObserver /** */ + @java.lang.Override public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -245,7 +282,21 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, /** */ - public static final class SecretDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface SecretDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService + */ + public static final class SecretDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements SecretDiscoveryServiceBlocking { private SecretDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -259,6 +310,7 @@ protected SecretDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchSecretsMethod(), getCallOptions(), request); @@ -267,7 +319,22 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.e /** */ - public static final class SecretDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface SecretDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchSecrets( + io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService + */ + public static final class SecretDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements SecretDiscoveryServiceFuture { private SecretDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -281,6 +348,7 @@ protected SecretDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchSecrets( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index 0cb84f8d277..4bfa6056b40 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -139,13 +139,46 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io. * the multiplexed singleton APIs at the Envoy instance and management server. * */ - public static abstract class AggregatedDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface AggregatedDiscoveryServiceAsync { /** * 
      * This is a gRPC-only API.
      *
*/ + default io.grpc.stub.StreamObserver streamAggregatedResources( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); + } + + /** + */ + default io.grpc.stub.StreamObserver deltaAggregatedResources( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static abstract class AggregatedDiscoveryServiceImplBase + implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { + + /** + * 
+     * This is a gRPC-only API.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); @@ -153,6 +186,7 @@ public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); @@ -179,6 +213,7 @@ public io.grpc.stub.StreamObserver * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of * ADS and how it is intended to be used by a management server. ADS requests @@ -188,7 +223,9 @@ public io.grpc.stub.StreamObserver */ - public static final class AggregatedDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class AggregatedDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements AggregatedDiscoveryServiceAsync { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -205,6 +242,7 @@ protected AggregatedDiscoveryServiceStub build( * This is a gRPC-only API. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -213,6 +251,7 @@ public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -230,7 +269,23 @@ public io.grpc.stub.StreamObserver */ - public static final class AggregatedDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface AggregatedDiscoveryServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static final class AggregatedDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements AggregatedDiscoveryServiceBlocking { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -253,7 +308,23 @@ protected AggregatedDiscoveryServiceBlockingStub build( * the multiplexed singleton APIs at the Envoy instance and management server. * */ - public static final class AggregatedDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface AggregatedDiscoveryServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService + * 
+   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
+   * ADS and how it is intended to be used by a management server. ADS requests
+   * have the same structure as their singleton xDS counterparts, but can
+   * multiplex many resource types on a single stream. The type_url in the
+   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
+   * the multiplexed singleton APIs at the Envoy instance and management server.
+   *
+ */ + public static final class AggregatedDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements AggregatedDiscoveryServiceFuture { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index df19f5d066a..8a33a986536 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -92,7 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C /** */ - public static abstract class LoadReportingServiceImplBase implements io.grpc.BindableService { + public interface LoadReportingServiceAsync { /** * 
@@ -125,6 +125,50 @@ public static abstract class LoadReportingServiceImplBase implements io.grpc.Bin
      *    assignment destined for each zone Envoys are located in. Goto 2.
      *
*/ + default io.grpc.stub.StreamObserver streamLoadStats( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service LoadReportingService + */ + public static abstract class LoadReportingServiceImplBase + implements io.grpc.BindableService, LoadReportingServiceAsync { + + /** + * 
+     * Advanced API to allow for multi-dimensional load balancing by remote
+     * server. For receiving LB assignments, the steps are:
+     * 1, The management server is configured with per cluster/zone/load metric
+     *    capacity configuration. The capacity configuration definition is
+     *    outside of the scope of this document.
+     * 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
+     *    to balance.
+     * Independently, Envoy will initiate a StreamLoadStats bidi stream with a
+     * management server:
+     * 1. Once a connection establishes, the management server publishes a
+     *    LoadStatsResponse for all clusters it is interested in learning load
+     *    stats about.
+     * 2. For each cluster, Envoy load balances incoming traffic to upstream hosts
+     *    based on per-zone weights and/or per-instance weights (if specified)
+     *    based on intra-zone LbPolicy. This information comes from the above
+     *    {Stream,Fetch}Endpoints.
+     * 3. When upstream hosts reply, they optionally add header <define header
+     *    name> with ASCII representation of EndpointLoadMetricStats.
+     * 4. Envoy aggregates load reports over the period of time given to it in
+     *    LoadStatsResponse.load_reporting_interval. This includes aggregation
+     *    stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
+     *    well as load metrics from upstream hosts.
+     * 5. When the timer of load_reporting_interval expires, Envoy sends new
+     *    LoadStatsRequest filled with load reports for each cluster.
+     * 6. The management server uses the load reports from all reported Envoys
+     *    from around the world, computes global assignment and prepares traffic
+     *    assignment destined for each zone Envoys are located in. Goto 2.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); @@ -144,8 +188,11 @@ public io.grpc.stub.StreamObserver { + public static final class LoadReportingServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements LoadReportingServiceAsync { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,6 +235,7 @@ protected LoadReportingServiceStub build( * assignment destined for each zone Envoys are located in. Goto 2. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -197,7 +245,15 @@ public io.grpc.stub.StreamObserver { + public interface LoadReportingServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service LoadReportingService + */ + public static final class LoadReportingServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements LoadReportingServiceBlocking { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -212,7 +268,15 @@ protected LoadReportingServiceBlockingStub build( /** */ - public static final class LoadReportingServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface LoadReportingServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService + */ + public static final class LoadReportingServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements LoadReportingServiceFuture { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index 80c7f910cee..daf7adc1362 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -92,7 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C /** */ - public static abstract class LoadReportingServiceImplBase implements io.grpc.BindableService { + public interface LoadReportingServiceAsync { /** * 
@@ -125,6 +125,50 @@ public static abstract class LoadReportingServiceImplBase implements io.grpc.Bin
      *    assignment destined for each zone Envoys are located in. Goto 2.
      *
*/ + default io.grpc.stub.StreamObserver streamLoadStats( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service LoadReportingService + */ + public static abstract class LoadReportingServiceImplBase + implements io.grpc.BindableService, LoadReportingServiceAsync { + + /** + * 
+     * Advanced API to allow for multi-dimensional load balancing by remote
+     * server. For receiving LB assignments, the steps are:
+     * 1, The management server is configured with per cluster/zone/load metric
+     *    capacity configuration. The capacity configuration definition is
+     *    outside of the scope of this document.
+     * 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
+     *    to balance.
+     * Independently, Envoy will initiate a StreamLoadStats bidi stream with a
+     * management server:
+     * 1. Once a connection establishes, the management server publishes a
+     *    LoadStatsResponse for all clusters it is interested in learning load
+     *    stats about.
+     * 2. For each cluster, Envoy load balances incoming traffic to upstream hosts
+     *    based on per-zone weights and/or per-instance weights (if specified)
+     *    based on intra-zone LbPolicy. This information comes from the above
+     *    {Stream,Fetch}Endpoints.
+     * 3. When upstream hosts reply, they optionally add header <define header
+     *    name> with ASCII representation of EndpointLoadMetricStats.
+     * 4. Envoy aggregates load reports over the period of time given to it in
+     *    LoadStatsResponse.load_reporting_interval. This includes aggregation
+     *    stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
+     *    well as load metrics from upstream hosts.
+     * 5. When the timer of load_reporting_interval expires, Envoy sends new
+     *    LoadStatsRequest filled with load reports for each cluster.
+     * 6. The management server uses the load reports from all reported Envoys
+     *    from around the world, computes global assignment and prepares traffic
+     *    assignment destined for each zone Envoys are located in. Goto 2.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); @@ -144,8 +188,11 @@ public io.grpc.stub.StreamObserver { + public static final class LoadReportingServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements LoadReportingServiceAsync { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,6 +235,7 @@ protected LoadReportingServiceStub build( * assignment destined for each zone Envoys are located in. Goto 2. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -197,7 +245,15 @@ public io.grpc.stub.StreamObserver { + public interface LoadReportingServiceBlocking { + } + + /** + * A stub to allow clients to do synchronous rpc calls to service LoadReportingService + */ + public static final class LoadReportingServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements LoadReportingServiceBlocking { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -212,7 +268,15 @@ protected LoadReportingServiceBlockingStub build( /** */ - public static final class LoadReportingServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface LoadReportingServiceFuture { + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService + */ + public static final class LoadReportingServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements LoadReportingServiceFuture { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index 2b5bc69bae7..1564ee013f8 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -133,10 +133,37 @@ public ClientStatusDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i * also be used to get the current xDS states directly from the client. * */ - public static abstract class ClientStatusDiscoveryServiceImplBase implements io.grpc.BindableService { + public interface ClientStatusDiscoveryServiceAsync { /** */ + default io.grpc.stub.StreamObserver streamClientStatus( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClientStatusMethod(), responseObserver); + } + + /** + */ + default void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClientStatusMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ClientStatusDiscoveryService + * 
+   * CSDS is Client Status Discovery Service. It can be used to get the status of
+   * an xDS-compliant client from the management server's point of view. It can
+   * also be used to get the current xDS states directly from the client.
+   *
+ */ + public static abstract class ClientStatusDiscoveryServiceImplBase + implements io.grpc.BindableService, ClientStatusDiscoveryServiceAsync { + + /** + */ + @java.lang.Override public io.grpc.stub.StreamObserver streamClientStatus( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClientStatusMethod(), responseObserver); @@ -144,6 +171,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClientStatusMethod(), responseObserver); @@ -170,13 +198,16 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus } /** + * A stub to allow clients to do asynchronous rpc calls to service ClientStatusDiscoveryService * 
    * CSDS is Client Status Discovery Service. It can be used to get the status of
    * an xDS-compliant client from the management server's point of view. It can
    * also be used to get the current xDS states directly from the client.
    *
*/ - public static final class ClientStatusDiscoveryServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ClientStatusDiscoveryServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ClientStatusDiscoveryServiceAsync { private ClientStatusDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -190,6 +221,7 @@ protected ClientStatusDiscoveryServiceStub build( /** */ + @java.lang.Override public io.grpc.stub.StreamObserver streamClientStatus( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -198,6 +230,7 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -212,7 +245,26 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus * also be used to get the current xDS states directly from the client. * */ - public static final class ClientStatusDiscoveryServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ClientStatusDiscoveryServiceBlocking { + + /** + */ + default io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ClientStatusDiscoveryService + * 
+   * CSDS is Client Status Discovery Service. It can be used to get the status of
+   * an xDS-compliant client from the management server's point of view. It can
+   * also be used to get the current xDS states directly from the client.
+   *
+ */ + public static final class ClientStatusDiscoveryServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ClientStatusDiscoveryServiceBlocking { private ClientStatusDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -226,6 +278,7 @@ protected ClientStatusDiscoveryServiceBlockingStub build( /** */ + @java.lang.Override public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchClientStatusMethod(), getCallOptions(), request); @@ -239,7 +292,27 @@ public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientSta * also be used to get the current xDS states directly from the client. * */ - public static final class ClientStatusDiscoveryServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ClientStatusDiscoveryServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture fetchClientStatus( + io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ClientStatusDiscoveryService + * 
+   * CSDS is Client Status Discovery Service. It can be used to get the status of
+   * an xDS-compliant client from the management server's point of view. It can
+   * also be used to get the current xDS states directly from the client.
+   *
+ */ + public static final class ClientStatusDiscoveryServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ClientStatusDiscoveryServiceFuture { private ClientStatusDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -253,6 +326,7 @@ protected ClientStatusDiscoveryServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchClientStatus( io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( From a47baab27c842bc2d6fde116789836b966539b84 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 12 Nov 2022 02:39:54 +0000 Subject: [PATCH 17/42] Add the generated java files from subprojects that aren't built by default. --- .gitignore | 3 + .../proto/BenchmarkServiceGrpc.java | 135 +++++++++++++++++- .../proto/ReportQpsScenarioServiceGrpc.java | 67 ++++++++- .../benchmarks/proto/WorkerServiceGrpc.java | 134 ++++++++++++++++- .../LoadBalancerStatsServiceGrpc.java | 109 +++++++++++++- .../integration/MetricsServiceGrpc.java | 92 +++++++++++- .../integration/ReconnectServiceGrpc.java | 91 +++++++++++- .../testing/integration/TestServiceGrpc.java | 104 +++++++++----- .../integration/UnimplementedServiceGrpc.java | 79 +++++++++- .../XdsUpdateClientConfigureServiceGrpc.java | 76 +++++++++- .../XdsUpdateHealthServiceGrpc.java | 91 +++++++++++- .../io/istio/test/EchoTestServiceGrpc.java | 82 ++++++++++- 12 files changed, 986 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd0d7fb574..e4e852a53e8 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ qemu-arm-static # Temporary output dir for artifacts mvn-artifacts + +# test environment +venv diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index c9a0f385ab6..09112e486e0 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -216,7 +216,7 @@ public BenchmarkServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO /** */ - public static abstract class BenchmarkServiceImplBase implements io.grpc.BindableService { + public interface BenchmarkServiceAsync { /** * 
@@ -224,6 +224,70 @@ public static abstract class BenchmarkServiceImplBase implements io.grpc.Bindabl
      * The server returns the client payload as-is.
      *
*/ + default void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); + } + + /** + * 
+     * Repeated sequence of one request followed by one response.
+     * Should be called streaming ping-pong
+     * The server returns the client payload as-is on each response
+     *
+ */ + default io.grpc.stub.StreamObserver streamingCall( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingCallMethod(), responseObserver); + } + + /** + * 
+     * Single-sided unbounded streaming from client to server
+     * The server returns the client payload as-is once the client does WritesDone
+     *
+ */ + default io.grpc.stub.StreamObserver streamingFromClient( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingFromClientMethod(), responseObserver); + } + + /** + * 
+     * Single-sided unbounded streaming from server to client
+     * The server repeatedly returns the client payload as-is
+     *
+ */ + default void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingFromServerMethod(), responseObserver); + } + + /** + * 
+     * Two-sided unbounded streaming between server to client
+     * Both sides send the content of their own choice to the other
+     *
+ */ + default io.grpc.stub.StreamObserver streamingBothWays( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingBothWaysMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service BenchmarkService + */ + public static abstract class BenchmarkServiceImplBase + implements io.grpc.BindableService, BenchmarkServiceAsync { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + @java.lang.Override public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); @@ -236,6 +300,7 @@ public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, * The server returns the client payload as-is on each response * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingCallMethod(), responseObserver); @@ -247,6 +312,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingFromClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingFromClientMethod(), responseObserver); @@ -258,6 +324,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingFromServerMethod(), responseObserver); @@ -269,6 +336,7 @@ public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest * Both sides send the content of their own choice to the other * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingBothWays( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingBothWaysMethod(), responseObserver); @@ -316,8 +384,11 @@ public io.grpc.stub.StreamObserver { + public static final class BenchmarkServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements BenchmarkServiceAsync { private BenchmarkServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -335,6 +406,7 @@ protected BenchmarkServiceStub build( * The server returns the client payload as-is. * */ + @java.lang.Override public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -348,6 +420,7 @@ public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, * The server returns the client payload as-is on each response * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -360,6 +433,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingFromClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -372,6 +446,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -384,6 +459,7 @@ public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest * Both sides send the content of their own choice to the other * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingBothWays( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -393,7 +469,36 @@ public io.grpc.stub.StreamObserver { + public interface BenchmarkServiceBlocking { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Single-sided unbounded streaming from server to client
+     * The server repeatedly returns the client payload as-is
+     *
+ */ + default java.util.Iterator streamingFromServer( + io.grpc.benchmarks.proto.Messages.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service BenchmarkService + */ + public static final class BenchmarkServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements BenchmarkServiceBlocking { private BenchmarkServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -411,6 +516,7 @@ protected BenchmarkServiceBlockingStub build( * The server returns the client payload as-is. * */ + @java.lang.Override public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -422,6 +528,7 @@ public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchm * The server repeatedly returns the client payload as-is * */ + @java.lang.Override public java.util.Iterator streamingFromServer( io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -431,7 +538,26 @@ public java.util.Iterator stre /** */ - public static final class BenchmarkServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface BenchmarkServiceFuture { + + /** + * 
+     * One request followed by one response.
+     * The server returns the client payload as-is.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture unaryCall( + io.grpc.benchmarks.proto.Messages.SimpleRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService + */ + public static final class BenchmarkServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements BenchmarkServiceFuture { private BenchmarkServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -449,6 +575,7 @@ protected BenchmarkServiceFutureStub build( * The server returns the client payload as-is. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 497d504b152..628b65c5e13 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -92,13 +92,31 @@ public ReportQpsScenarioServiceFutureStub newStub(io.grpc.Channel channel, io.gr /** */ - public static abstract class ReportQpsScenarioServiceImplBase implements io.grpc.BindableService { + public interface ReportQpsScenarioServiceAsync { /** * 
      * Report results of a QPS test benchmark scenario.
      *
*/ + default void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReportScenarioMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ReportQpsScenarioService + */ + public static abstract class ReportQpsScenarioServiceImplBase + implements io.grpc.BindableService, ReportQpsScenarioServiceAsync { + + /** + * 
+     * Report results of a QPS test benchmark scenario.
+     *
+ */ + @java.lang.Override public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReportScenarioMethod(), responseObserver); @@ -118,8 +136,11 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque } /** + * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService */ - public static final class ReportQpsScenarioServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ReportQpsScenarioServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ReportQpsScenarioServiceAsync { private ReportQpsScenarioServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -136,6 +157,7 @@ protected ReportQpsScenarioServiceStub build( * Report results of a QPS test benchmark scenario. * */ + @java.lang.Override public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -145,7 +167,24 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque /** */ - public static final class ReportQpsScenarioServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ReportQpsScenarioServiceBlocking { + + /** + * 
+     * Report results of a QPS test benchmark scenario.
+     *
+ */ + default io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService + */ + public static final class ReportQpsScenarioServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ReportQpsScenarioServiceBlocking { private ReportQpsScenarioServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -162,6 +201,7 @@ protected ReportQpsScenarioServiceBlockingStub build( * Report results of a QPS test benchmark scenario. * */ + @java.lang.Override public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getReportScenarioMethod(), getCallOptions(), request); @@ -170,7 +210,25 @@ public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.p /** */ - public static final class ReportQpsScenarioServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ReportQpsScenarioServiceFuture { + + /** + * 
+     * Report results of a QPS test benchmark scenario.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture reportScenario( + io.grpc.benchmarks.proto.Control.ScenarioResult request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService + */ + public static final class ReportQpsScenarioServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ReportQpsScenarioServiceFuture { private ReportQpsScenarioServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -187,6 +245,7 @@ protected ReportQpsScenarioServiceFutureStub build( * Report results of a QPS test benchmark scenario. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture reportScenario( io.grpc.benchmarks.proto.Control.ScenarioResult request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 253320c5240..4dab4de3be3 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -185,7 +185,7 @@ public WorkerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti /** */ - public static abstract class WorkerServiceImplBase implements io.grpc.BindableService { + public interface WorkerServiceAsync { /** * 
@@ -197,6 +197,64 @@ public static abstract class WorkerServiceImplBase implements io.grpc.BindableSe
      * this RPC.
      *
*/ + default io.grpc.stub.StreamObserver runServer( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunServerMethod(), responseObserver); + } + + /** + * 
+     * Start client with specified workload.
+     * First request sent specifies the ClientConfig followed by ClientStatus
+     * response. After that, a "Mark" can be sent anytime to request the latest
+     * stats. Closing the stream will initiate shutdown of the test client
+     * and once the shutdown has finished, the OK status is sent to terminate
+     * this RPC.
+     *
+ */ + default io.grpc.stub.StreamObserver runClient( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunClientMethod(), responseObserver); + } + + /** + * 
+     * Just return the core count - unary call
+     *
+ */ + default void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCoreCountMethod(), responseObserver); + } + + /** + * 
+     * Quit this worker
+     *
+ */ + default void quitWorker(io.grpc.benchmarks.proto.Control.Void request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getQuitWorkerMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service WorkerService + */ + public static abstract class WorkerServiceImplBase + implements io.grpc.BindableService, WorkerServiceAsync { + + /** + * 
+     * Start server with specified workload.
+     * First request sent specifies the ServerConfig followed by ServerStatus
+     * response. After that, a "Mark" can be sent anytime to request the latest
+     * stats. Closing the stream will initiate shutdown of the test server
+     * and once the shutdown has finished, the OK status is sent to terminate
+     * this RPC.
+     *
+ */ + @java.lang.Override public io.grpc.stub.StreamObserver runServer( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunServerMethod(), responseObserver); @@ -212,6 +270,7 @@ public io.grpc.stub.StreamObserver * this RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver runClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunClientMethod(), responseObserver); @@ -222,6 +281,7 @@ public io.grpc.stub.StreamObserver * Just return the core count - unary call * */ + @java.lang.Override public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCoreCountMethod(), responseObserver); @@ -232,6 +292,7 @@ public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, * Quit this worker * */ + @java.lang.Override public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getQuitWorkerMethod(), responseObserver); @@ -272,8 +333,11 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, } /** + * A stub to allow clients to do asynchronous rpc calls to service WorkerService */ - public static final class WorkerServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class WorkerServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements WorkerServiceAsync { private WorkerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -295,6 +359,7 @@ protected WorkerServiceStub build( * this RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver runServer( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -311,6 +376,7 @@ public io.grpc.stub.StreamObserver * this RPC. * */ + @java.lang.Override public io.grpc.stub.StreamObserver runClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -322,6 +388,7 @@ public io.grpc.stub.StreamObserver * Just return the core count - unary call * */ + @java.lang.Override public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -333,6 +400,7 @@ public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, * Quit this worker * */ + @java.lang.Override public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -342,7 +410,33 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, /** */ - public static final class WorkerServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface WorkerServiceBlocking { + + /** + * 
+     * Just return the core count - unary call
+     *
+ */ + default io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Quit this worker
+     *
+ */ + default io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto.Control.Void request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service WorkerService + */ + public static final class WorkerServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements WorkerServiceBlocking { private WorkerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -359,6 +453,7 @@ protected WorkerServiceBlockingStub build( * Just return the core count - unary call * */ + @java.lang.Override public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCoreCountMethod(), getCallOptions(), request); @@ -369,6 +464,7 @@ public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmark * Quit this worker * */ + @java.lang.Override public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto.Control.Void request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getQuitWorkerMethod(), getCallOptions(), request); @@ -377,7 +473,35 @@ public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto /** */ - public static final class WorkerServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface WorkerServiceFuture { + + /** + * 
+     * Just return the core count - unary call
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture coreCount( + io.grpc.benchmarks.proto.Control.CoreRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Quit this worker
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture quitWorker( + io.grpc.benchmarks.proto.Control.Void request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService + */ + public static final class WorkerServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements WorkerServiceFuture { private WorkerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -394,6 +518,7 @@ protected WorkerServiceFutureStub build( * Just return the core count - unary call * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture coreCount( io.grpc.benchmarks.proto.Control.CoreRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -405,6 +530,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture quitWorker( io.grpc.benchmarks.proto.Control.Void request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 42db108ce7e..8e9ce8d9ca3 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -129,13 +129,44 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ - public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService { + public interface LoadBalancerStatsServiceAsync { /** * 
      * Gets the backend distribution for RPCs sent by a test client.
      *
*/ + default void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientStatsMethod(), responseObserver); + } + + /** + * 
+     * Gets the accumulated stats for RPCs sent by a test client.
+     *
+ */ + default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientAccumulatedStatsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service LoadBalancerStatsService + * 
+   * A service used to obtain stats for verifying LB behavior.
+   *
+ */ + public static abstract class LoadBalancerStatsServiceImplBase + implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { + + /** + * 
+     * Gets the backend distribution for RPCs sent by a test client.
+     *
+ */ + @java.lang.Override public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientStatsMethod(), responseObserver); @@ -146,6 +177,7 @@ public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStat * Gets the accumulated stats for RPCs sent by a test client. * */ + @java.lang.Override public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientAccumulatedStatsMethod(), responseObserver); @@ -172,11 +204,14 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB } /** + * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class LoadBalancerStatsServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements LoadBalancerStatsServiceAsync { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -193,6 +228,7 @@ protected LoadBalancerStatsServiceStub build( * Gets the backend distribution for RPCs sent by a test client. * */ + @java.lang.Override public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -204,6 +240,7 @@ public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStat * Gets the accumulated stats for RPCs sent by a test client. * */ + @java.lang.Override public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -216,7 +253,36 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * A service used to obtain stats for verifying LB behavior. * */ - public static final class LoadBalancerStatsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface LoadBalancerStatsServiceBlocking { + + /** + * 
+     * Gets the backend distribution for RPCs sent by a test client.
+     *
+ */ + default io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets the accumulated stats for RPCs sent by a test client.
+     *
+ */ + default io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService + * 
+   * A service used to obtain stats for verifying LB behavior.
+   *
+ */ + public static final class LoadBalancerStatsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements LoadBalancerStatsServiceBlocking { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -233,6 +299,7 @@ protected LoadBalancerStatsServiceBlockingStub build( * Gets the backend distribution for RPCs sent by a test client. * */ + @java.lang.Override public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetClientStatsMethod(), getCallOptions(), request); @@ -243,6 +310,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientS * Gets the accumulated stats for RPCs sent by a test client. * */ + @java.lang.Override public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetClientAccumulatedStatsMethod(), getCallOptions(), request); @@ -254,7 +322,38 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse * A service used to obtain stats for verifying LB behavior. * */ - public static final class LoadBalancerStatsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface LoadBalancerStatsServiceFuture { + + /** + * 
+     * Gets the backend distribution for RPCs sent by a test client.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getClientStats( + io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Gets the accumulated stats for RPCs sent by a test client.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getClientAccumulatedStats( + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService + * 
+   * A service used to obtain stats for verifying LB behavior.
+   *
+ */ + public static final class LoadBalancerStatsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements LoadBalancerStatsServiceFuture { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,6 +370,7 @@ protected LoadBalancerStatsServiceFutureStub build( * Gets the backend distribution for RPCs sent by a test client. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getClientStats( io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -282,6 +382,7 @@ public com.google.common.util.concurrent.ListenableFuture */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getClientAccumulatedStats( io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 5cae4aa8183..16627211877 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -123,7 +123,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ - public static abstract class MetricsServiceImplBase implements io.grpc.BindableService { + public interface MetricsServiceAsync { /** * 
@@ -131,6 +131,35 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableS
      * the service
      *
*/ + default void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAllGaugesMethod(), responseObserver); + } + + /** + * 
+     * Returns the value of one gauge
+     *
+ */ + default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetGaugeMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service MetricsService + */ + public static abstract class MetricsServiceImplBase + implements io.grpc.BindableService, MetricsServiceAsync { + + /** + * 
+     * Returns the values of all the gauges that are currently being maintained by
+     * the service
+     *
+ */ + @java.lang.Override public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAllGaugesMethod(), responseObserver); @@ -141,6 +170,7 @@ public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage reques * Returns the value of one gauge * */ + @java.lang.Override public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetGaugeMethod(), responseObserver); @@ -167,8 +197,11 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ - public static final class MetricsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class MetricsServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements MetricsServiceAsync { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -186,6 +219,7 @@ protected MetricsServiceStub build( * the service * */ + @java.lang.Override public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -197,6 +231,7 @@ public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage reques * Returns the value of one gauge * */ + @java.lang.Override public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -206,7 +241,35 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, /** */ - public static final class MetricsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface MetricsServiceBlocking { + + /** + * 
+     * Returns the values of all the gauges that are currently being maintained by
+     * the service
+     *
+ */ + default java.util.Iterator getAllGauges( + io.grpc.testing.integration.Metrics.EmptyMessage request) { + throw new UnsupportedOperationException(); + } + + /** + * 
+     * Returns the value of one gauge
+     *
+ */ + default io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service MetricsService + */ + public static final class MetricsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements MetricsServiceBlocking { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -224,6 +287,7 @@ protected MetricsServiceBlockingStub build( * the service * */ + @java.lang.Override public java.util.Iterator getAllGauges( io.grpc.testing.integration.Metrics.EmptyMessage request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -235,6 +299,7 @@ public java.util.Iterator get * Returns the value of one gauge * */ + @java.lang.Override public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetGaugeMethod(), getCallOptions(), request); @@ -243,7 +308,25 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin /** */ - public static final class MetricsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface MetricsServiceFuture { + + /** + * 
+     * Returns the value of one gauge
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture getGauge( + io.grpc.testing.integration.Metrics.GaugeRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService + */ + public static final class MetricsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements MetricsServiceFuture { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -260,6 +343,7 @@ protected MetricsServiceFutureStub build( * Returns the value of one gauge * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getGauge( io.grpc.testing.integration.Metrics.GaugeRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index be88c76b2fd..77c1a622c0b 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -129,10 +129,35 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ - public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService { + public interface ReconnectServiceAsync { /** */ + default void start(io.grpc.testing.integration.Messages.ReconnectParams request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); + } + + /** + */ + default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStopMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service ReconnectService + * 
+   * A service used to control reconnect server.
+   *
+ */ + public static abstract class ReconnectServiceImplBase + implements io.grpc.BindableService, ReconnectServiceAsync { + + /** + */ + @java.lang.Override public void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); @@ -140,6 +165,7 @@ public void start(io.grpc.testing.integration.Messages.ReconnectParams request, /** */ + @java.lang.Override public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStopMethod(), responseObserver); @@ -166,11 +192,14 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do asynchronous rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ReconnectServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements ReconnectServiceAsync { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -184,6 +213,7 @@ protected ReconnectServiceStub build( /** */ + @java.lang.Override public void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -192,6 +222,7 @@ public void start(io.grpc.testing.integration.Messages.ReconnectParams request, /** */ + @java.lang.Override public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -204,7 +235,30 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * A service used to control reconnect server. * */ - public static final class ReconnectServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface ReconnectServiceBlocking { + + /** + */ + default io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service ReconnectService + * 
+   * A service used to control reconnect server.
+   *
+ */ + public static final class ReconnectServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements ReconnectServiceBlocking { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -218,6 +272,7 @@ protected ReconnectServiceBlockingStub build( /** */ + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getStartMethod(), getCallOptions(), request); @@ -225,6 +280,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integ /** */ + @java.lang.Override public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getStopMethod(), getCallOptions(), request); @@ -236,7 +292,32 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i * A service used to control reconnect server. * */ - public static final class ReconnectServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface ReconnectServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture start( + io.grpc.testing.integration.Messages.ReconnectParams request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default com.google.common.util.concurrent.ListenableFuture stop( + io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService + * 
+   * A service used to control reconnect server.
+   *
+ */ + public static final class ReconnectServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements ReconnectServiceFuture { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -250,6 +331,7 @@ protected ReconnectServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture start( io.grpc.testing.integration.Messages.ReconnectParams request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -258,6 +340,7 @@ public com.google.common.util.concurrent.ListenableFuture stop( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index d3139ad294a..8486f36c0c5 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -311,14 +311,21 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption return TestServiceFutureStub.newStub(factory, channel); } + /** + * 
+   * A simple service to test the various types of RPCs and experiment with
+   * performance with various types of payload.
+   *
+ */ public interface TestServiceAsync { + /** * 
      * One empty request followed by one empty response.
      *
*/ default void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -328,7 +335,7 @@ default void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * */ default void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -340,7 +347,7 @@ default void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest reques * */ default void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -351,7 +358,7 @@ default void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReque * */ default void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -398,7 +405,7 @@ default io.grpc.stub.StreamObserver */ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } } @@ -411,16 +418,16 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { + implements io.grpc.BindableService, TestServiceAsync { /** * 
      * One empty request followed by one empty response.
      *
*/ - @Override + @java.lang.Override public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -429,9 +436,9 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ - @Override + @java.lang.Override public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -442,9 +449,9 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - @Override + @java.lang.Override public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -454,9 +461,9 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - @Override + @java.lang.Override public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -466,7 +473,7 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - @Override + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); @@ -479,7 +486,7 @@ public io.grpc.stub.StreamObserver */ - @Override + @java.lang.Override public io.grpc.stub.StreamObserver fullDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); @@ -493,7 +500,7 @@ public io.grpc.stub.StreamObserver */ - @Override + @java.lang.Override public io.grpc.stub.StreamObserver halfDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); @@ -505,9 +512,9 @@ public io.grpc.stub.StreamObserver */ - @Override + @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } @@ -580,8 +587,9 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * performance with various types of payload. * */ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub - implements TestServiceAsync { + public static final class TestServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements TestServiceAsync { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -598,6 +606,7 @@ protected TestServiceStub build( * One empty request followed by one empty response. * */ + @java.lang.Override public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -609,8 +618,9 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ + @java.lang.Override public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -622,8 +632,9 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ + @java.lang.Override public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCacheableUnaryCallMethod(), getCallOptions()), request, responseObserver); } @@ -634,8 +645,9 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ + @java.lang.Override public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( getChannel().newCall(getStreamingOutputCallMethod(), getCallOptions()), request, responseObserver); } @@ -646,6 +658,7 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ + @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -659,6 +672,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public io.grpc.stub.StreamObserver fullDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -673,6 +687,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public io.grpc.stub.StreamObserver halfDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -685,6 +700,7 @@ public io.grpc.stub.StreamObserver */ + @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -692,7 +708,14 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } } + /** + * 
+   * A simple service to test the various types of RPCs and experiment with
+   * performance with various types of payload.
+   *
+ */ public interface TestServiceBlocking { + /** * 
      * One empty request followed by one empty response.
@@ -752,8 +775,8 @@ default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.
    *
*/ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements TestServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub + implements TestServiceBlocking { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -770,7 +793,7 @@ protected TestServiceBlockingStub build( * One empty request followed by one empty response. * */ - @Override + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getEmptyCallMethod(), getCallOptions(), request); @@ -781,7 +804,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.i * One request followed by one response. * */ - @Override + @java.lang.Override public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -794,7 +817,7 @@ public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.tes * satisfy subsequent requests. * */ - @Override + @java.lang.Override public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCacheableUnaryCallMethod(), getCallOptions(), request); @@ -806,7 +829,7 @@ public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io * The server returns the payload with client desired type and sizes. * */ - @Override + @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -819,14 +842,21 @@ public java.util.Iterator */ - @Override + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); } } + /** + * 
+   * A simple service to test the various types of RPCs and experiment with
+   * performance with various types of payload.
+   *
+ */ public interface TestServiceFuture { + /** * 
      * One empty request followed by one empty response.
@@ -879,8 +909,8 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class TestServiceFutureStub
-      extends io.grpc.stub.AbstractFutureStub
-      implements TestServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub
+   implements TestServiceFuture {
     private TestServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -897,7 +927,7 @@ protected TestServiceFutureStub build(
      * One empty request followed by one empty response.
      *
*/ - @Override + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture emptyCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -909,7 +939,7 @@ public com.google.common.util.concurrent.ListenableFuture */ - @Override + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -923,7 +953,7 @@ public com.google.common.util.concurrent.ListenableFuture */ - @Override + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -936,7 +966,7 @@ public com.google.common.util.concurrent.ListenableFuture */ - @Override + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unimplementedCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index d8e680cdf0a..2b752e34ff4 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -100,13 +100,35 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ - public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService { + public interface UnimplementedServiceAsync { /** * 
      * A call that no server should implement
      *
*/ + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service UnimplementedService + * 
+   * A simple service NOT implemented at servers so clients can test for
+   * that case.
+   *
+ */ + public static abstract class UnimplementedServiceImplBase + implements io.grpc.BindableService, UnimplementedServiceAsync { + + /** + * 
+     * A call that no server should implement
+     *
+ */ + @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); @@ -126,12 +148,15 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } /** + * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class UnimplementedServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements UnimplementedServiceAsync { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,6 +173,7 @@ protected UnimplementedServiceStub build( * A call that no server should implement * */ + @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -161,7 +187,28 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * that case. * */ - public static final class UnimplementedServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface UnimplementedServiceBlocking { + + /** + * 
+     * A call that no server should implement
+     *
+ */ + default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service UnimplementedService + * 
+   * A simple service NOT implemented at servers so clients can test for
+   * that case.
+   *
+ */ + public static final class UnimplementedServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements UnimplementedServiceBlocking { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -178,6 +225,7 @@ protected UnimplementedServiceBlockingStub build( * A call that no server should implement * */ + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); @@ -190,7 +238,29 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * that case. * */ - public static final class UnimplementedServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface UnimplementedServiceFuture { + + /** + * 
+     * A call that no server should implement
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture unimplementedCall( + io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService + * 
+   * A simple service NOT implemented at servers so clients can test for
+   * that case.
+   *
+ */ + public static final class UnimplementedServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements UnimplementedServiceFuture { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -207,6 +277,7 @@ protected UnimplementedServiceFutureStub build( * A call that no server should implement * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unimplementedCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 14e77497b64..4dcb2109e40 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -98,13 +98,34 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateClientConfigureServiceAsync { /** * 
      * Update the tes client's configuration.
      *
*/ + default void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getConfigureMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service XdsUpdateClientConfigureService + * 
+   * A service to dynamically update the configuration of an xDS test client.
+   *
+ */ + public static abstract class XdsUpdateClientConfigureServiceImplBase + implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { + + /** + * 
+     * Update the tes client's configuration.
+     *
+ */ + @java.lang.Override public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getConfigureMethod(), responseObserver); @@ -124,11 +145,14 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateClientConfigureServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements XdsUpdateClientConfigureServiceAsync { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -145,6 +169,7 @@ protected XdsUpdateClientConfigureServiceStub build( * Update the tes client's configuration. * */ + @java.lang.Override public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -157,7 +182,27 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * A service to dynamically update the configuration of an xDS test client. * */ - public static final class XdsUpdateClientConfigureServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface XdsUpdateClientConfigureServiceBlocking { + + /** + * 
+     * Update the tes client's configuration.
+     *
+ */ + default io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService + * 
+   * A service to dynamically update the configuration of an xDS test client.
+   *
+ */ + public static final class XdsUpdateClientConfigureServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements XdsUpdateClientConfigureServiceBlocking { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -174,6 +219,7 @@ protected XdsUpdateClientConfigureServiceBlockingStub build( * Update the tes client's configuration. * */ + @java.lang.Override public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getConfigureMethod(), getCallOptions(), request); @@ -185,7 +231,28 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io * A service to dynamically update the configuration of an xDS test client. * */ - public static final class XdsUpdateClientConfigureServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface XdsUpdateClientConfigureServiceFuture { + + /** + * 
+     * Update the tes client's configuration.
+     *
+ */ + default com.google.common.util.concurrent.ListenableFuture configure( + io.grpc.testing.integration.Messages.ClientConfigureRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService + * 
+   * A service to dynamically update the configuration of an xDS test client.
+   *
+ */ + public static final class XdsUpdateClientConfigureServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements XdsUpdateClientConfigureServiceFuture { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,6 +269,7 @@ protected XdsUpdateClientConfigureServiceFutureStub build( * Update the tes client's configuration. * */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture configure( io.grpc.testing.integration.Messages.ClientConfigureRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 946a3825bb1..c8a4cd7a6ed 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -129,10 +129,35 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateHealthServiceAsync { /** */ + default void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetServingMethod(), responseObserver); + } + + /** + */ + default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetNotServingMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service XdsUpdateHealthService + * 
+   * A service to remotely control health status of an xDS test server.
+   *
+ */ + public static abstract class XdsUpdateHealthServiceImplBase + implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { + + /** + */ + @java.lang.Override public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetServingMethod(), responseObserver); @@ -140,6 +165,7 @@ public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, /** */ + @java.lang.Override public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetNotServingMethod(), responseObserver); @@ -166,11 +192,14 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateHealthServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements XdsUpdateHealthServiceAsync { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -184,6 +213,7 @@ protected XdsUpdateHealthServiceStub build( /** */ + @java.lang.Override public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -192,6 +222,7 @@ public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, /** */ + @java.lang.Override public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -204,7 +235,30 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * A service to remotely control health status of an xDS test server. * */ - public static final class XdsUpdateHealthServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface XdsUpdateHealthServiceBlocking { + + /** + */ + default io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService + * 
+   * A service to remotely control health status of an xDS test server.
+   *
+ */ + public static final class XdsUpdateHealthServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements XdsUpdateHealthServiceBlocking { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -218,6 +272,7 @@ protected XdsUpdateHealthServiceBlockingStub build( /** */ + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSetServingMethod(), getCallOptions(), request); @@ -225,6 +280,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing. /** */ + @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSetNotServingMethod(), getCallOptions(), request); @@ -236,7 +292,32 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi * A service to remotely control health status of an xDS test server. * */ - public static final class XdsUpdateHealthServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface XdsUpdateHealthServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture setServing( + io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default com.google.common.util.concurrent.ListenableFuture setNotServing( + io.grpc.testing.integration.EmptyProtos.Empty request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService + * 
+   * A service to remotely control health status of an xDS test server.
+   *
+ */ + public static final class XdsUpdateHealthServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements XdsUpdateHealthServiceFuture { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -250,6 +331,7 @@ protected XdsUpdateHealthServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture setServing( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -258,6 +340,7 @@ public com.google.common.util.concurrent.ListenableFuture setNotServing( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index 1c71469e01a..2c4f21675ca 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -123,10 +123,32 @@ public EchoTestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOp /** */ - public static abstract class EchoTestServiceImplBase implements io.grpc.BindableService { + public interface EchoTestServiceAsync { /** */ + default void echo(io.istio.test.Echo.EchoRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEchoMethod(), responseObserver); + } + + /** + */ + default void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getForwardEchoMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service EchoTestService + */ + public static abstract class EchoTestServiceImplBase + implements io.grpc.BindableService, EchoTestServiceAsync { + + /** + */ + @java.lang.Override public void echo(io.istio.test.Echo.EchoRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEchoMethod(), responseObserver); @@ -134,6 +156,7 @@ public void echo(io.istio.test.Echo.EchoRequest request, /** */ + @java.lang.Override public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getForwardEchoMethod(), responseObserver); @@ -160,8 +183,11 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, } /** + * A stub to allow clients to do asynchronous rpc calls to service EchoTestService */ - public static final class EchoTestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class EchoTestServiceStub + extends io.grpc.stub.AbstractAsyncStub + implements EchoTestServiceAsync { private EchoTestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -175,6 +201,7 @@ protected EchoTestServiceStub build( /** */ + @java.lang.Override public void echo(io.istio.test.Echo.EchoRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -183,6 +210,7 @@ public void echo(io.istio.test.Echo.EchoRequest request, /** */ + @java.lang.Override public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -192,7 +220,27 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, /** */ - public static final class EchoTestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public interface EchoTestServiceBlocking { + + /** + */ + default io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.ForwardEchoRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service EchoTestService + */ + public static final class EchoTestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub + implements EchoTestServiceBlocking { private EchoTestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -206,6 +254,7 @@ protected EchoTestServiceBlockingStub build( /** */ + @java.lang.Override public io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getEchoMethod(), getCallOptions(), request); @@ -213,6 +262,7 @@ public io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest reque /** */ + @java.lang.Override public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.ForwardEchoRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getForwardEchoMethod(), getCallOptions(), request); @@ -221,7 +271,29 @@ public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.For /** */ - public static final class EchoTestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public interface EchoTestServiceFuture { + + /** + */ + default com.google.common.util.concurrent.ListenableFuture echo( + io.istio.test.Echo.EchoRequest request) { + throw new UnsupportedOperationException(); + } + + /** + */ + default com.google.common.util.concurrent.ListenableFuture forwardEcho( + io.istio.test.Echo.ForwardEchoRequest request) { + throw new UnsupportedOperationException(); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService + */ + public static final class EchoTestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub + implements EchoTestServiceFuture { private EchoTestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,6 +307,7 @@ protected EchoTestServiceFutureStub build( /** */ + @java.lang.Override public com.google.common.util.concurrent.ListenableFuture echo( io.istio.test.Echo.EchoRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -243,6 +316,7 @@ public com.google.common.util.concurrent.ListenableFuture forwardEcho( io.istio.test.Echo.ForwardEchoRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( From ab4a5a4c76d5dc19714f4d142713dbc875949518 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Mon, 14 Nov 2022 14:31:20 -0800 Subject: [PATCH 18/42] Remove interfaces from stubs (includes not creating BLOCKING and FUTURE client interfaces). --- .../src/java_plugin/cpp/java_generator.cpp | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index f1b387c5a06..889f0fca65d 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -586,28 +586,21 @@ static void PrintStub( stub_base_class_name = "AbstractAsyncStub"; interface_name += "Async"; break; - case BLOCKING_CLIENT_INTERFACE: - interface = true; - call_type = BLOCKING_CALL; - stub_name += "Blocking"; - break; case BLOCKING_CLIENT_IMPL: call_type = BLOCKING_CALL; stub_name += "BlockingStub"; stub_base_class_name = "AbstractBlockingStub"; interface_name += "Blocking"; break; - case FUTURE_CLIENT_INTERFACE: - interface = true; - call_type = FUTURE_CALL; - stub_name += "Future"; - break; case FUTURE_CLIENT_IMPL: call_type = FUTURE_CALL; stub_name += "FutureStub"; stub_base_class_name = "AbstractFutureStub"; interface_name += "Future"; break; + case BLOCKING_CLIENT_INTERFACE: + case FUTURE_CLIENT_INTERFACE: + GRPC_CODEGEN_FAIL << "Intentionally not creating StubType: " << type default: GRPC_CODEGEN_FAIL << "Cannot determine class name for StubType: " << type; } @@ -635,8 +628,7 @@ static void PrintStub( p->Print( *vars, "public static final class $stub_name$\n" - " extends $stub_base_class_name$<$stub_name$>\n" - " implements $interface_name$ {\n"); + " extends $stub_base_class_name$<$stub_name$> {\n"); } p->Indent(); @@ -695,9 +687,10 @@ static void PrintStub( } if (!interface) { - p->Print(*vars, - "@$Override$\n" - "public "); + if (impl_base) { + p->Print(*vars, "@$Override$\n"); + } + p->Print("public "); } else { p->Print("default "); } @@ -816,7 +809,7 @@ static void PrintStub( break; } } else { - p->Print("throw new UnsupportedOperationException();\n"); + GRPC_CODEGEN_FAIL << "Do not create Stub interfaces"; } p->Outdent(); p->Print("}\n"); @@ -1191,9 +1184,7 @@ static void PrintService(const ServiceDescriptor* service, PrintStub(service, vars, p, ASYNC_INTERFACE); PrintStub(service, vars, p, ABSTRACT_CLASS); PrintStub(service, vars, p, ASYNC_CLIENT_IMPL); - PrintStub(service, vars, p, BLOCKING_CLIENT_INTERFACE); PrintStub(service, vars, p, BLOCKING_CLIENT_IMPL); - PrintStub(service, vars, p, FUTURE_CLIENT_INTERFACE); PrintStub(service, vars, p, FUTURE_CLIENT_IMPL); PrintMethodHandlerClass(service, vars, p); From 995f940bc41ecd9920b8d599ff053253904ca266 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 15 Nov 2022 00:22:45 +0000 Subject: [PATCH 19/42] regenerate service files with interface only for server --- .../alts/internal/HandshakerServiceGrpc.java | 20 +- .../proto/BenchmarkServiceGrpc.java | 59 +----- .../proto/ReportQpsScenarioServiceGrpc.java | 41 +--- .../benchmarks/proto/WorkerServiceGrpc.java | 65 +------ .../src/java_plugin/cpp/java_generator.cpp | 3 +- compiler/src/test/golden/TestService.java.txt | 110 +---------- .../src/testLite/golden/TestService.java.txt | 110 +---------- .../grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 20 +- .../LoadBalancerStatsServiceGrpc.java | 69 +------ .../integration/MetricsServiceGrpc.java | 54 +----- .../integration/ReconnectServiceGrpc.java | 57 +----- .../testing/integration/TestServiceGrpc.java | 137 +------------ .../integration/UnimplementedServiceGrpc.java | 49 +---- .../XdsUpdateClientConfigureServiceGrpc.java | 47 +---- .../XdsUpdateHealthServiceGrpc.java | 57 +----- .../io/istio/test/EchoTestServiceGrpc.java | 51 +---- .../lookup/v1/RouteLookupServiceGrpc.java | 41 +--- .../io/grpc/channelz/v1/ChannelzGrpc.java | 183 +----------------- .../grpc/io/grpc/health/v1/HealthGrpc.java | 67 +------ .../v1alpha/ServerReflectionGrpc.java | 20 +- .../testing/AnotherDynamicServiceGrpc.java | 47 +---- .../AnotherReflectableServiceGrpc.java | 35 +--- .../testing/DynamicServiceGrpc.java | 47 +---- .../testing/ReflectableServiceGrpc.java | 35 +--- .../testing/protobuf/SimpleServiceGrpc.java | 61 +----- .../service/orca/v3/OpenRcaServiceGrpc.java | 48 +---- .../api/v2/ClusterDiscoveryServiceGrpc.java | 43 +--- .../api/v2/EndpointDiscoveryServiceGrpc.java | 37 +--- .../api/v2/ListenerDiscoveryServiceGrpc.java | 49 +---- .../api/v2/RouteDiscoveryServiceGrpc.java | 51 +---- .../v2/ScopedRoutesDiscoveryServiceGrpc.java | 55 +----- .../v2/VirtualHostDiscoveryServiceGrpc.java | 44 +---- .../v2/AggregatedDiscoveryServiceGrpc.java | 37 +--- .../v2/SecretDiscoveryServiceGrpc.java | 37 +--- .../v3/AggregatedDiscoveryServiceGrpc.java | 37 +--- .../v2/LoadReportingServiceGrpc.java | 20 +- .../v3/LoadReportingServiceGrpc.java | 20 +- .../v3/ClientStatusDiscoveryServiceGrpc.java | 46 +---- 38 files changed, 113 insertions(+), 1896 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 1863ea1d7b8..b15e3c5576f 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -149,8 +149,7 @@ public io.grpc.stub.StreamObserver doHandsh * A stub to allow clients to do asynchronous rpc calls to service HandshakerService */ public static final class HandshakerServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements HandshakerServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private HandshakerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -172,7 +171,6 @@ protected HandshakerServiceStub build( * response before sending next request. * */ - @java.lang.Override public io.grpc.stub.StreamObserver doHandshake( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -180,17 +178,11 @@ public io.grpc.stub.StreamObserver doHandsh } } - /** - */ - public interface HandshakerServiceBlocking { - } - /** * A stub to allow clients to do synchronous rpc calls to service HandshakerService */ public static final class HandshakerServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements HandshakerServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private HandshakerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -203,17 +195,11 @@ protected HandshakerServiceBlockingStub build( } } - /** - */ - public interface HandshakerServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService */ public static final class HandshakerServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements HandshakerServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private HandshakerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index 09112e486e0..85d2a933820 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -387,8 +387,7 @@ public io.grpc.stub.StreamObserver - implements BenchmarkServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private BenchmarkServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -406,7 +405,6 @@ protected BenchmarkServiceStub build( * The server returns the client payload as-is. * */ - @java.lang.Override public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -420,7 +418,6 @@ public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, * The server returns the client payload as-is on each response * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -433,7 +430,6 @@ public io.grpc.stub.StreamObserver */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingFromClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -446,7 +442,6 @@ public io.grpc.stub.StreamObserver */ - @java.lang.Override public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -459,7 +454,6 @@ public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest * Both sides send the content of their own choice to the other * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingBothWays( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -467,38 +461,11 @@ public io.grpc.stub.StreamObserver - * One request followed by one response. - * The server returns the client payload as-is. - * - */ - default io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Single-sided unbounded streaming from server to client
-     * The server repeatedly returns the client payload as-is
-     *
- */ - default java.util.Iterator streamingFromServer( - io.grpc.benchmarks.proto.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service BenchmarkService */ public static final class BenchmarkServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements BenchmarkServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private BenchmarkServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -516,7 +483,6 @@ protected BenchmarkServiceBlockingStub build( * The server returns the client payload as-is. * */ - @java.lang.Override public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -528,7 +494,6 @@ public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchm * The server repeatedly returns the client payload as-is * */ - @java.lang.Override public java.util.Iterator streamingFromServer( io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -536,28 +501,11 @@ public java.util.Iterator stre } } - /** - */ - public interface BenchmarkServiceFuture { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unaryCall( - io.grpc.benchmarks.proto.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService */ public static final class BenchmarkServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements BenchmarkServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private BenchmarkServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -575,7 +523,6 @@ protected BenchmarkServiceFutureStub build( * The server returns the client payload as-is. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.benchmarks.proto.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 628b65c5e13..68ede80f08a 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -139,8 +139,7 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ReportQpsScenarioServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ReportQpsScenarioServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -157,7 +156,6 @@ protected ReportQpsScenarioServiceStub build( * Report results of a QPS test benchmark scenario. * */ - @java.lang.Override public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -165,26 +163,11 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque } } - /** - */ - public interface ReportQpsScenarioServiceBlocking { - - /** - * 
-     * Report results of a QPS test benchmark scenario.
-     *
- */ - default io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ReportQpsScenarioServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ReportQpsScenarioServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,34 +184,17 @@ protected ReportQpsScenarioServiceBlockingStub build( * Report results of a QPS test benchmark scenario. * */ - @java.lang.Override public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getReportScenarioMethod(), getCallOptions(), request); } } - /** - */ - public interface ReportQpsScenarioServiceFuture { - - /** - * 
-     * Report results of a QPS test benchmark scenario.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture reportScenario( - io.grpc.benchmarks.proto.Control.ScenarioResult request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements ReportQpsScenarioServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private ReportQpsScenarioServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -245,7 +211,6 @@ protected ReportQpsScenarioServiceFutureStub build( * Report results of a QPS test benchmark scenario. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture reportScenario( io.grpc.benchmarks.proto.Control.ScenarioResult request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 4dab4de3be3..5da1f9c7c1c 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -336,8 +336,7 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * A stub to allow clients to do asynchronous rpc calls to service WorkerService */ public static final class WorkerServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements WorkerServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private WorkerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -359,7 +358,6 @@ protected WorkerServiceStub build( * this RPC. * */ - @java.lang.Override public io.grpc.stub.StreamObserver runServer( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -376,7 +374,6 @@ public io.grpc.stub.StreamObserver * this RPC. * */ - @java.lang.Override public io.grpc.stub.StreamObserver runClient( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -388,7 +385,6 @@ public io.grpc.stub.StreamObserver * Just return the core count - unary call * */ - @java.lang.Override public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -400,7 +396,6 @@ public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, * Quit this worker * */ - @java.lang.Override public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -408,35 +403,11 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, } } - /** - */ - public interface WorkerServiceBlocking { - - /** - * 
-     * Just return the core count - unary call
-     *
- */ - default io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Quit this worker
-     *
- */ - default io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto.Control.Void request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service WorkerService */ public static final class WorkerServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements WorkerServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private WorkerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -453,7 +424,6 @@ protected WorkerServiceBlockingStub build( * Just return the core count - unary call * */ - @java.lang.Override public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCoreCountMethod(), getCallOptions(), request); @@ -464,44 +434,17 @@ public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmark * Quit this worker * */ - @java.lang.Override public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto.Control.Void request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getQuitWorkerMethod(), getCallOptions(), request); } } - /** - */ - public interface WorkerServiceFuture { - - /** - * 
-     * Just return the core count - unary call
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture coreCount( - io.grpc.benchmarks.proto.Control.CoreRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Quit this worker
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture quitWorker( - io.grpc.benchmarks.proto.Control.Void request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService */ public static final class WorkerServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements WorkerServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private WorkerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -518,7 +461,6 @@ protected WorkerServiceFutureStub build( * Just return the core count - unary call * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture coreCount( io.grpc.benchmarks.proto.Control.CoreRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -530,7 +472,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture quitWorker( io.grpc.benchmarks.proto.Control.Void request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 889f0fca65d..32ee3df1f4f 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -600,7 +600,8 @@ static void PrintStub( break; case BLOCKING_CLIENT_INTERFACE: case FUTURE_CLIENT_INTERFACE: - GRPC_CODEGEN_FAIL << "Intentionally not creating StubType: " << type + GRPC_CODEGEN_FAIL << "Intentionally not creating StubType: " << type; + break; default: GRPC_CODEGEN_FAIL << "Cannot determine class name for StubType: " << type; } diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 568fa15f578..2678ba8ca6c 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -584,8 +584,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements TestServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -603,7 +602,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -616,7 +614,6 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -629,7 +626,6 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -643,7 +639,6 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ - @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -658,7 +653,6 @@ public final class TestServiceGrpc { * first request. * */ - @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -671,7 +665,6 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ - @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -683,7 +676,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -695,7 +687,6 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -703,53 +694,6 @@ public final class TestServiceGrpc { } } - /** - * 
-   * Test service that supports all call types.
-   *
- */ - public interface TestServiceBlocking { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - default java.util.Iterator streamingOutputCall( - io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service TestService * 
@@ -757,8 +701,7 @@ public final class TestServiceGrpc {
    *
*/ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements TestServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -776,7 +719,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -788,7 +730,6 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -800,7 +741,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSafeCallMethod(), getCallOptions(), request); @@ -811,52 +751,12 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getIdempotentCallMethod(), getCallOptions(), request); } } - /** - * 
-   * Test service that supports all call types.
-   *
- */ - public interface TestServiceFuture { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unaryCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture safeCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture idempotentCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
@@ -864,8 +764,7 @@ public final class TestServiceGrpc {
    *
*/ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements TestServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -883,7 +782,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -895,7 +793,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture safeCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -907,7 +804,6 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture idempotentCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index db36d8f4c74..cbb51fc4d3e 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -576,8 +576,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements TestServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -595,7 +594,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -608,7 +606,6 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -621,7 +618,6 @@ public final class TestServiceGrpc { * The server returns the aggregated size of client payload as the result. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -635,7 +631,6 @@ public final class TestServiceGrpc { * demonstrates the idea of full bidirectionality. * */ - @java.lang.Override public io.grpc.stub.StreamObserver fullBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -650,7 +645,6 @@ public final class TestServiceGrpc { * first request. * */ - @java.lang.Override public io.grpc.stub.StreamObserver halfBidiCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -663,7 +657,6 @@ public final class TestServiceGrpc { * method should have a '_' appended. * */ - @java.lang.Override public io.grpc.stub.StreamObserver import_( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -675,7 +668,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -687,7 +679,6 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -695,53 +686,6 @@ public final class TestServiceGrpc { } } - /** - * 
-   * Test service that supports all call types.
-   *
- */ - public interface TestServiceBlocking { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - default java.util.Iterator streamingOutputCall( - io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - default io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service TestService * 
@@ -749,8 +693,7 @@ public final class TestServiceGrpc {
    *
*/ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements TestServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -768,7 +711,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -780,7 +722,6 @@ public final class TestServiceGrpc { * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -792,7 +733,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse safeCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSafeCallMethod(), getCallOptions(), request); @@ -803,52 +743,12 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public io.grpc.testing.compiler.Test.SimpleResponse idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getIdempotentCallMethod(), getCallOptions(), request); } } - /** - * 
-   * Test service that supports all call types.
-   *
- */ - public interface TestServiceFuture { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unaryCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture safeCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture idempotentCall( - io.grpc.testing.compiler.Test.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
@@ -856,8 +756,7 @@ public final class TestServiceGrpc {
    *
*/ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements TestServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -875,7 +774,6 @@ public final class TestServiceGrpc { * The server returns the client payload as-is. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -887,7 +785,6 @@ public final class TestServiceGrpc { * A unary call that is Safe. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture safeCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -899,7 +796,6 @@ public final class TestServiceGrpc { * A unary call that is Idempotent. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture idempotentCall( io.grpc.testing.compiler.Test.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index 77babb3d493..8d5543c4b7a 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -139,8 +139,7 @@ public io.grpc.stub.StreamObserver balanceLoad * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerStub - extends io.grpc.stub.AbstractAsyncStub - implements LoadBalancerAsync { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -157,7 +156,6 @@ protected LoadBalancerStub build( * Bidirectional rpc to get a list of servers. * */ - @java.lang.Override public io.grpc.stub.StreamObserver balanceLoad( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -165,17 +163,11 @@ public io.grpc.stub.StreamObserver balanceLoad } } - /** - */ - public interface LoadBalancerBlocking { - } - /** * A stub to allow clients to do synchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements LoadBalancerBlocking { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,17 +180,11 @@ protected LoadBalancerBlockingStub build( } } - /** - */ - public interface LoadBalancerFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer */ public static final class LoadBalancerFutureStub - extends io.grpc.stub.AbstractFutureStub - implements LoadBalancerFuture { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 8e9ce8d9ca3..2ef89c97b3d 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -210,8 +210,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements LoadBalancerStatsServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -228,7 +227,6 @@ protected LoadBalancerStatsServiceStub build( * Gets the backend distribution for RPCs sent by a test client. * */ - @java.lang.Override public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -240,7 +238,6 @@ public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStat * Gets the accumulated stats for RPCs sent by a test client. * */ - @java.lang.Override public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -248,32 +245,6 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB } } - /** - * 
-   * A service used to obtain stats for verifying LB behavior.
-   *
- */ - public interface LoadBalancerStatsServiceBlocking { - - /** - * 
-     * Gets the backend distribution for RPCs sent by a test client.
-     *
- */ - default io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets the accumulated stats for RPCs sent by a test client.
-     *
- */ - default io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService * 
@@ -281,8 +252,7 @@ default io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRespons
    *
*/ public static final class LoadBalancerStatsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements LoadBalancerStatsServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -299,7 +269,6 @@ protected LoadBalancerStatsServiceBlockingStub build( * Gets the backend distribution for RPCs sent by a test client. * */ - @java.lang.Override public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetClientStatsMethod(), getCallOptions(), request); @@ -310,41 +279,12 @@ public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientS * Gets the accumulated stats for RPCs sent by a test client. * */ - @java.lang.Override public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetClientAccumulatedStatsMethod(), getCallOptions(), request); } } - /** - * 
-   * A service used to obtain stats for verifying LB behavior.
-   *
- */ - public interface LoadBalancerStatsServiceFuture { - - /** - * 
-     * Gets the backend distribution for RPCs sent by a test client.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getClientStats( - io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets the accumulated stats for RPCs sent by a test client.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getClientAccumulatedStats( - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService * 
@@ -352,8 +292,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class LoadBalancerStatsServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements LoadBalancerStatsServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private LoadBalancerStatsServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -370,7 +309,6 @@ protected LoadBalancerStatsServiceFutureStub build(
      * Gets the backend distribution for RPCs sent by a test client.
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getClientStats( io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -382,7 +320,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getClientAccumulatedStats( io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 16627211877..80405944c38 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -200,8 +200,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ public static final class MetricsServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements MetricsServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,7 +218,6 @@ protected MetricsServiceStub build( * the service * */ - @java.lang.Override public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -231,7 +229,6 @@ public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage reques * Returns the value of one gauge * */ - @java.lang.Override public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -239,37 +236,11 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } } - /** - */ - public interface MetricsServiceBlocking { - - /** - * 
-     * Returns the values of all the gauges that are currently being maintained by
-     * the service
-     *
- */ - default java.util.Iterator getAllGauges( - io.grpc.testing.integration.Metrics.EmptyMessage request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns the value of one gauge
-     *
- */ - default io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service MetricsService */ public static final class MetricsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements MetricsServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -287,7 +258,6 @@ protected MetricsServiceBlockingStub build( * the service * */ - @java.lang.Override public java.util.Iterator getAllGauges( io.grpc.testing.integration.Metrics.EmptyMessage request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -299,34 +269,17 @@ public java.util.Iterator get * Returns the value of one gauge * */ - @java.lang.Override public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetGaugeMethod(), getCallOptions(), request); } } - /** - */ - public interface MetricsServiceFuture { - - /** - * 
-     * Returns the value of one gauge
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getGauge( - io.grpc.testing.integration.Metrics.GaugeRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ public static final class MetricsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements MetricsServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -343,7 +296,6 @@ protected MetricsServiceFutureStub build( * Returns the value of one gauge * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getGauge( io.grpc.testing.integration.Metrics.GaugeRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 77c1a622c0b..0ce38cdba87 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -198,8 +198,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ReconnectServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -213,7 +212,6 @@ protected ReconnectServiceStub build( /** */ - @java.lang.Override public void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -222,7 +220,6 @@ public void start(io.grpc.testing.integration.Messages.ReconnectParams request, /** */ - @java.lang.Override public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -230,26 +227,6 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } } - /** - * 
-   * A service used to control reconnect server.
-   *
- */ - public interface ReconnectServiceBlocking { - - /** - */ - default io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) { - throw new UnsupportedOperationException(); - } - - /** - */ - default io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ReconnectService * 
@@ -257,8 +234,7 @@ default io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.
    *
*/ public static final class ReconnectServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ReconnectServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -272,7 +248,6 @@ protected ReconnectServiceBlockingStub build( /** */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getStartMethod(), getCallOptions(), request); @@ -280,35 +255,12 @@ public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integ /** */ - @java.lang.Override public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getStopMethod(), getCallOptions(), request); } } - /** - * 
-   * A service used to control reconnect server.
-   *
- */ - public interface ReconnectServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture start( - io.grpc.testing.integration.Messages.ReconnectParams request) { - throw new UnsupportedOperationException(); - } - - /** - */ - default com.google.common.util.concurrent.ListenableFuture stop( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService * 
@@ -316,8 +268,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ReconnectServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ReconnectServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ReconnectServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -331,7 +282,6 @@ protected ReconnectServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture start(
         io.grpc.testing.integration.Messages.ReconnectParams request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
@@ -340,7 +290,6 @@ public com.google.common.util.concurrent.ListenableFuture stop(
         io.grpc.testing.integration.EmptyProtos.Empty request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index 8486f36c0c5..dd28af67e00 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -588,8 +588,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
    *
*/ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements TestServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -606,7 +605,6 @@ protected TestServiceStub build( * One empty request followed by one empty response. * */ - @java.lang.Override public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -618,7 +616,6 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ - @java.lang.Override public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -632,7 +629,6 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - @java.lang.Override public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -645,7 +641,6 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -658,7 +653,6 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -672,7 +666,6 @@ public io.grpc.stub.StreamObserver */ - @java.lang.Override public io.grpc.stub.StreamObserver fullDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -687,7 +680,6 @@ public io.grpc.stub.StreamObserver */ - @java.lang.Override public io.grpc.stub.StreamObserver halfDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -700,7 +692,6 @@ public io.grpc.stub.StreamObserver */ - @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -708,65 +699,6 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } } - /** - * 
-   * A simple service to test the various types of RPCs and experiment with
-   * performance with various types of payload.
-   *
- */ - public interface TestServiceBlocking { - - /** - * 
-     * One empty request followed by one empty response.
-     *
- */ - default io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by one response.
-     *
- */ - default io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by one response. Response has cache control
-     * headers set such that a caching HTTP proxy (such as GFE) can
-     * satisfy subsequent requests.
-     *
- */ - default io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - default java.util.Iterator streamingOutputCall( - io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * The test server will not implement this method. It will be used
-     * to test the behavior when clients call unimplemented methods.
-     *
- */ - default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service TestService * 
@@ -775,8 +707,7 @@ default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.
    *
*/ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements TestServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -793,7 +724,6 @@ protected TestServiceBlockingStub build( * One empty request followed by one empty response. * */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getEmptyCallMethod(), getCallOptions(), request); @@ -804,7 +734,6 @@ public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.i * One request followed by one response. * */ - @java.lang.Override public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryCallMethod(), getCallOptions(), request); @@ -817,7 +746,6 @@ public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.tes * satisfy subsequent requests. * */ - @java.lang.Override public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCacheableUnaryCallMethod(), getCallOptions(), request); @@ -829,7 +757,6 @@ public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io * The server returns the payload with client desired type and sizes. * */ - @java.lang.Override public java.util.Iterator streamingOutputCall( io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -842,65 +769,12 @@ public java.util.Iterator */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); } } - /** - * 
-   * A simple service to test the various types of RPCs and experiment with
-   * performance with various types of payload.
-   *
- */ - public interface TestServiceFuture { - - /** - * 
-     * One empty request followed by one empty response.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture emptyCall( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by one response.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unaryCall( - io.grpc.testing.integration.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * One request followed by one response. Response has cache control
-     * headers set such that a caching HTTP proxy (such as GFE) can
-     * satisfy subsequent requests.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( - io.grpc.testing.integration.Messages.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * The test server will not implement this method. It will be used
-     * to test the behavior when clients call unimplemented methods.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unimplementedCall( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
@@ -909,8 +783,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class TestServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements TestServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private TestServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -927,7 +800,6 @@ protected TestServiceFutureStub build(
      * One empty request followed by one empty response.
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture emptyCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -939,7 +811,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryCall( io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -953,7 +824,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture cacheableUnaryCall( io.grpc.testing.integration.Messages.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -966,7 +836,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unimplementedCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 2b752e34ff4..83ce09c3fc1 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -155,8 +155,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements UnimplementedServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -173,7 +172,6 @@ protected UnimplementedServiceStub build( * A call that no server should implement * */ - @java.lang.Override public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -181,24 +179,6 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } } - /** - * 
-   * A simple service NOT implemented at servers so clients can test for
-   * that case.
-   *
- */ - public interface UnimplementedServiceBlocking { - - /** - * 
-     * A call that no server should implement
-     *
- */ - default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service UnimplementedService * 
@@ -207,8 +187,7 @@ default io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.
    *
*/ public static final class UnimplementedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements UnimplementedServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -225,32 +204,12 @@ protected UnimplementedServiceBlockingStub build( * A call that no server should implement * */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnimplementedCallMethod(), getCallOptions(), request); } } - /** - * 
-   * A simple service NOT implemented at servers so clients can test for
-   * that case.
-   *
- */ - public interface UnimplementedServiceFuture { - - /** - * 
-     * A call that no server should implement
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unimplementedCall( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService * 
@@ -259,8 +218,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class UnimplementedServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements UnimplementedServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private UnimplementedServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -277,7 +235,6 @@ protected UnimplementedServiceFutureStub build(
      * A call that no server should implement
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unimplementedCall( io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 4dcb2109e40..d7907c8bc5f 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -151,8 +151,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements XdsUpdateClientConfigureServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -169,7 +168,6 @@ protected XdsUpdateClientConfigureServiceStub build( * Update the tes client's configuration. * */ - @java.lang.Override public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -177,23 +175,6 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques } } - /** - * 
-   * A service to dynamically update the configuration of an xDS test client.
-   *
- */ - public interface XdsUpdateClientConfigureServiceBlocking { - - /** - * 
-     * Update the tes client's configuration.
-     *
- */ - default io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService * 
@@ -201,8 +182,7 @@ default io.grpc.testing.integration.Messages.ClientConfigureResponse configure(i
    *
*/ public static final class XdsUpdateClientConfigureServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements XdsUpdateClientConfigureServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,31 +199,12 @@ protected XdsUpdateClientConfigureServiceBlockingStub build( * Update the tes client's configuration. * */ - @java.lang.Override public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getConfigureMethod(), getCallOptions(), request); } } - /** - * 
-   * A service to dynamically update the configuration of an xDS test client.
-   *
- */ - public interface XdsUpdateClientConfigureServiceFuture { - - /** - * 
-     * Update the tes client's configuration.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture configure( - io.grpc.testing.integration.Messages.ClientConfigureRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService * 
@@ -251,8 +212,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class XdsUpdateClientConfigureServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements XdsUpdateClientConfigureServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private XdsUpdateClientConfigureServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -269,7 +229,6 @@ protected XdsUpdateClientConfigureServiceFutureStub build(
      * Update the tes client's configuration.
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture configure( io.grpc.testing.integration.Messages.ClientConfigureRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index c8a4cd7a6ed..ed0161f1e20 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -198,8 +198,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements XdsUpdateHealthServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -213,7 +212,6 @@ protected XdsUpdateHealthServiceStub build( /** */ - @java.lang.Override public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -222,7 +220,6 @@ public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, /** */ - @java.lang.Override public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -230,26 +227,6 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, } } - /** - * 
-   * A service to remotely control health status of an xDS test server.
-   *
- */ - public interface XdsUpdateHealthServiceBlocking { - - /** - */ - default io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - - /** - */ - default io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService * 
@@ -257,8 +234,7 @@ default io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.test
    *
*/ public static final class XdsUpdateHealthServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements XdsUpdateHealthServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -272,7 +248,6 @@ protected XdsUpdateHealthServiceBlockingStub build( /** */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSetServingMethod(), getCallOptions(), request); @@ -280,35 +255,12 @@ public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing. /** */ - @java.lang.Override public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getSetNotServingMethod(), getCallOptions(), request); } } - /** - * 
-   * A service to remotely control health status of an xDS test server.
-   *
- */ - public interface XdsUpdateHealthServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture setServing( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - - /** - */ - default com.google.common.util.concurrent.ListenableFuture setNotServing( - io.grpc.testing.integration.EmptyProtos.Empty request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService * 
@@ -316,8 +268,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class XdsUpdateHealthServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements XdsUpdateHealthServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private XdsUpdateHealthServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -331,7 +282,6 @@ protected XdsUpdateHealthServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture setServing(
         io.grpc.testing.integration.EmptyProtos.Empty request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
@@ -340,7 +290,6 @@ public com.google.common.util.concurrent.ListenableFuture setNotServing(
         io.grpc.testing.integration.EmptyProtos.Empty request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
index 2c4f21675ca..4e0e9ac219d 100644
--- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
+++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
@@ -186,8 +186,7 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request,
    * A stub to allow clients to do asynchronous rpc calls to service EchoTestService
    */
   public static final class EchoTestServiceStub
-   extends io.grpc.stub.AbstractAsyncStub
-   implements EchoTestServiceAsync {
+   extends io.grpc.stub.AbstractAsyncStub {
     private EchoTestServiceStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -201,7 +200,6 @@ protected EchoTestServiceStub build(
 
     /**
      */
-    @java.lang.Override
     public void echo(io.istio.test.Echo.EchoRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ClientCalls.asyncUnaryCall(
@@ -210,7 +208,6 @@ public void echo(io.istio.test.Echo.EchoRequest request,
 
     /**
      */
-    @java.lang.Override
     public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request,
         io.grpc.stub.StreamObserver responseObserver) {
       io.grpc.stub.ClientCalls.asyncUnaryCall(
@@ -218,29 +215,11 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request,
     }
   }
 
-  /**
-   */
-  public interface EchoTestServiceBlocking {
-
-    /**
-     */
-    default io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest request) {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     */
-    default io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.ForwardEchoRequest request) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
   /**
    * A stub to allow clients to do synchronous rpc calls to service EchoTestService
    */
   public static final class EchoTestServiceBlockingStub
-   extends io.grpc.stub.AbstractBlockingStub
-   implements EchoTestServiceBlocking {
+   extends io.grpc.stub.AbstractBlockingStub {
     private EchoTestServiceBlockingStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -254,7 +233,6 @@ protected EchoTestServiceBlockingStub build(
 
     /**
      */
-    @java.lang.Override
     public io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest request) {
       return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getEchoMethod(), getCallOptions(), request);
@@ -262,38 +240,17 @@ public io.istio.test.Echo.EchoResponse echo(io.istio.test.Echo.EchoRequest reque
 
     /**
      */
-    @java.lang.Override
     public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.ForwardEchoRequest request) {
       return io.grpc.stub.ClientCalls.blockingUnaryCall(
           getChannel(), getForwardEchoMethod(), getCallOptions(), request);
     }
   }
 
-  /**
-   */
-  public interface EchoTestServiceFuture {
-
-    /**
-     */
-    default com.google.common.util.concurrent.ListenableFuture echo(
-        io.istio.test.Echo.EchoRequest request) {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     */
-    default com.google.common.util.concurrent.ListenableFuture forwardEcho(
-        io.istio.test.Echo.ForwardEchoRequest request) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
   /**
    * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService
    */
   public static final class EchoTestServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements EchoTestServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private EchoTestServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -307,7 +264,6 @@ protected EchoTestServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture echo(
         io.istio.test.Echo.EchoRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
@@ -316,7 +272,6 @@ public com.google.common.util.concurrent.ListenableFuture forwardEcho(
         io.istio.test.Echo.ForwardEchoRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
index de10d8d135e..53f9d06e4cd 100644
--- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
+++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
@@ -139,8 +139,7 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request,
    * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService
    */
   public static final class RouteLookupServiceStub
-   extends io.grpc.stub.AbstractAsyncStub
-   implements RouteLookupServiceAsync {
+   extends io.grpc.stub.AbstractAsyncStub {
     private RouteLookupServiceStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -157,7 +156,6 @@ protected RouteLookupServiceStub build(
      * Lookup returns a target for a single key.
      *
*/ - @java.lang.Override public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -165,26 +163,11 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, } } - /** - */ - public interface RouteLookupServiceBlocking { - - /** - * 
-     * Lookup returns a target for a single key.
-     *
- */ - default io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.RouteLookupRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service RouteLookupService */ public static final class RouteLookupServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements RouteLookupServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private RouteLookupServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,34 +184,17 @@ protected RouteLookupServiceBlockingStub build( * Lookup returns a target for a single key. * */ - @java.lang.Override public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.RouteLookupRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getRouteLookupMethod(), getCallOptions(), request); } } - /** - */ - public interface RouteLookupServiceFuture { - - /** - * 
-     * Lookup returns a target for a single key.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture routeLookup( - io.grpc.lookup.v1.RouteLookupRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService */ public static final class RouteLookupServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements RouteLookupServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private RouteLookupServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -245,7 +211,6 @@ protected RouteLookupServiceFutureStub build( * Lookup returns a target for a single key. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture routeLookup( io.grpc.lookup.v1.RouteLookupRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index 20da73e8d5b..7442f1894b6 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -511,8 +511,7 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static final class ChannelzStub - extends io.grpc.stub.AbstractAsyncStub - implements ChannelzAsync { + extends io.grpc.stub.AbstractAsyncStub { private ChannelzStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -530,7 +529,6 @@ protected ChannelzStub build( * created). This does not include subchannels nor non-top level channels. * */ - @java.lang.Override public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -542,7 +540,6 @@ public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, * Gets all servers that exist in the process. * */ - @java.lang.Override public void getServers(io.grpc.channelz.v1.GetServersRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -554,7 +551,6 @@ public void getServers(io.grpc.channelz.v1.GetServersRequest request, * Returns a single Server, or else a NOT_FOUND code. * */ - @java.lang.Override public void getServer(io.grpc.channelz.v1.GetServerRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -566,7 +562,6 @@ public void getServer(io.grpc.channelz.v1.GetServerRequest request, * Gets all server sockets that exist in the process. * */ - @java.lang.Override public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -578,7 +573,6 @@ public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request * Returns a single Channel, or else a NOT_FOUND code. * */ - @java.lang.Override public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -590,7 +584,6 @@ public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, * Returns a single Subchannel, or else a NOT_FOUND code. * */ - @java.lang.Override public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -602,7 +595,6 @@ public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, * Returns a single Socket or else a NOT_FOUND code. * */ - @java.lang.Override public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -610,79 +602,6 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, } } - /** - * 
-   * Channelz is a service exposed by gRPC servers that provides detailed debug
-   * information.
-   *
- */ - public interface ChannelzBlocking { - - /** - * 
-     * Gets all root channels (i.e. channels the application has directly
-     * created). This does not include subchannels nor non-top level channels.
-     *
- */ - default io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets all servers that exist in the process.
-     *
- */ - default io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.GetServersRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Server, or else a NOT_FOUND code.
-     *
- */ - default io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetServerRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets all server sockets that exist in the process.
-     *
- */ - default io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Channel, or else a NOT_FOUND code.
-     *
- */ - default io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.GetChannelRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Subchannel, or else a NOT_FOUND code.
-     *
- */ - default io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Socket or else a NOT_FOUND code.
-     *
- */ - default io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSocketRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service Channelz * 
@@ -691,8 +610,7 @@ default io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetS
    *
*/ public static final class ChannelzBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ChannelzBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ChannelzBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -710,7 +628,6 @@ protected ChannelzBlockingStub build( * created). This does not include subchannels nor non-top level channels. * */ - @java.lang.Override public io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetTopChannelsMethod(), getCallOptions(), request); @@ -721,7 +638,6 @@ public io.grpc.channelz.v1.GetTopChannelsResponse getTopChannels(io.grpc.channel * Gets all servers that exist in the process. * */ - @java.lang.Override public io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.GetServersRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServersMethod(), getCallOptions(), request); @@ -732,7 +648,6 @@ public io.grpc.channelz.v1.GetServersResponse getServers(io.grpc.channelz.v1.Get * Returns a single Server, or else a NOT_FOUND code. * */ - @java.lang.Override public io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetServerRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServerMethod(), getCallOptions(), request); @@ -743,7 +658,6 @@ public io.grpc.channelz.v1.GetServerResponse getServer(io.grpc.channelz.v1.GetSe * Gets all server sockets that exist in the process. * */ - @java.lang.Override public io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetServerSocketsMethod(), getCallOptions(), request); @@ -754,7 +668,6 @@ public io.grpc.channelz.v1.GetServerSocketsResponse getServerSockets(io.grpc.cha * Returns a single Channel, or else a NOT_FOUND code. * */ - @java.lang.Override public io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.GetChannelRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetChannelMethod(), getCallOptions(), request); @@ -765,7 +678,6 @@ public io.grpc.channelz.v1.GetChannelResponse getChannel(io.grpc.channelz.v1.Get * Returns a single Subchannel, or else a NOT_FOUND code. * */ - @java.lang.Override public io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetSubchannelMethod(), getCallOptions(), request); @@ -776,93 +688,12 @@ public io.grpc.channelz.v1.GetSubchannelResponse getSubchannel(io.grpc.channelz. * Returns a single Socket or else a NOT_FOUND code. * */ - @java.lang.Override public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSocketRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetSocketMethod(), getCallOptions(), request); } } - /** - * 
-   * Channelz is a service exposed by gRPC servers that provides detailed debug
-   * information.
-   *
- */ - public interface ChannelzFuture { - - /** - * 
-     * Gets all root channels (i.e. channels the application has directly
-     * created). This does not include subchannels nor non-top level channels.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getTopChannels( - io.grpc.channelz.v1.GetTopChannelsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets all servers that exist in the process.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getServers( - io.grpc.channelz.v1.GetServersRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Server, or else a NOT_FOUND code.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getServer( - io.grpc.channelz.v1.GetServerRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Gets all server sockets that exist in the process.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getServerSockets( - io.grpc.channelz.v1.GetServerSocketsRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Channel, or else a NOT_FOUND code.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getChannel( - io.grpc.channelz.v1.GetChannelRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Subchannel, or else a NOT_FOUND code.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getSubchannel( - io.grpc.channelz.v1.GetSubchannelRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Returns a single Socket or else a NOT_FOUND code.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture getSocket( - io.grpc.channelz.v1.GetSocketRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service Channelz * 
@@ -871,8 +702,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ChannelzFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ChannelzFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ChannelzFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -890,7 +720,6 @@ protected ChannelzFutureStub build(
      * created). This does not include subchannels nor non-top level channels.
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getTopChannels( io.grpc.channelz.v1.GetTopChannelsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -902,7 +731,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServers( io.grpc.channelz.v1.GetServersRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -914,7 +742,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServer( io.grpc.channelz.v1.GetServerRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -926,7 +753,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getServerSockets( io.grpc.channelz.v1.GetServerSocketsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -938,7 +764,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getChannel( io.grpc.channelz.v1.GetChannelRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -950,7 +775,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getSubchannel( io.grpc.channelz.v1.GetSubchannelRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( @@ -962,7 +786,6 @@ public com.google.common.util.concurrent.ListenableFuture */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture getSocket( io.grpc.channelz.v1.GetSocketRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index 9cb6b27c68b..e3e5eecc826 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -224,8 +224,7 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, * A stub to allow clients to do asynchronous rpc calls to service Health */ public static final class HealthStub - extends io.grpc.stub.AbstractAsyncStub - implements HealthAsync { + extends io.grpc.stub.AbstractAsyncStub { private HealthStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -243,7 +242,6 @@ protected HealthStub build( * NOT_FOUND. * */ - @java.lang.Override public void check(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -267,7 +265,6 @@ public void check(io.grpc.health.v1.HealthCheckRequest request, * clients should retry the call with appropriate exponential backoff. * */ - @java.lang.Override public void watch(io.grpc.health.v1.HealthCheckRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -275,49 +272,11 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, } } - /** - */ - public interface HealthBlocking { - - /** - * 
-     * If the requested service is unknown, the call will fail with status
-     * NOT_FOUND.
-     *
- */ - default io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheckRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Performs a watch for the serving status of the requested service.
-     * The server will immediately send back a message indicating the current
-     * serving status.  It will then subsequently send a new message whenever
-     * the service's serving status changes.
-     * If the requested service is unknown when the call is received, the
-     * server will send a message setting the serving status to
-     * SERVICE_UNKNOWN but will *not* terminate the call.  If at some
-     * future point, the serving status of the service becomes known, the
-     * server will send a new message with the service's serving status.
-     * If the call terminates with status UNIMPLEMENTED, then clients
-     * should assume this method is not supported and should not retry the
-     * call.  If the call terminates with any other status (including OK),
-     * clients should retry the call with appropriate exponential backoff.
-     *
- */ - default java.util.Iterator watch( - io.grpc.health.v1.HealthCheckRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service Health */ public static final class HealthBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements HealthBlocking { + extends io.grpc.stub.AbstractBlockingStub { private HealthBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -335,7 +294,6 @@ protected HealthBlockingStub build( * NOT_FOUND. * */ - @java.lang.Override public io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCheckMethod(), getCallOptions(), request); @@ -358,7 +316,6 @@ public io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheck * clients should retry the call with appropriate exponential backoff. * */ - @java.lang.Override public java.util.Iterator watch( io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -366,28 +323,11 @@ public java.util.Iterator watch( } } - /** - */ - public interface HealthFuture { - - /** - * 
-     * If the requested service is unknown, the call will fail with status
-     * NOT_FOUND.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture check( - io.grpc.health.v1.HealthCheckRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service Health */ public static final class HealthFutureStub - extends io.grpc.stub.AbstractFutureStub - implements HealthFuture { + extends io.grpc.stub.AbstractFutureStub { private HealthFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -405,7 +345,6 @@ protected HealthFutureStub build( * NOT_FOUND. * */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture check( io.grpc.health.v1.HealthCheckRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index a8ad845c5ef..91bcb868199 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -141,8 +141,7 @@ public io.grpc.stub.StreamObserver - implements ServerReflectionAsync { + extends io.grpc.stub.AbstractAsyncStub { private ServerReflectionStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -160,7 +159,6 @@ protected ServerReflectionStub build( * all related requests go to a single server. * */ - @java.lang.Override public io.grpc.stub.StreamObserver serverReflectionInfo( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -168,17 +166,11 @@ public io.grpc.stub.StreamObserver - implements ServerReflectionBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ServerReflectionBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -191,17 +183,11 @@ protected ServerReflectionBlockingStub build( } } - /** - */ - public interface ServerReflectionFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection */ public static final class ServerReflectionFutureStub - extends io.grpc.stub.AbstractFutureStub - implements ServerReflectionFuture { + extends io.grpc.stub.AbstractFutureStub { private ServerReflectionFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index b5a1798ac65..57a97b876af 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -151,8 +151,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class AnotherDynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements AnotherDynamicServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private AnotherDynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -169,7 +168,6 @@ protected AnotherDynamicServiceStub build( * A method * */ - @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -177,23 +175,6 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, } } - /** - * 
-   * AnotherDynamicService
-   *
- */ - public interface AnotherDynamicServiceBlocking { - - /** - * 
-     * A method
-     *
- */ - default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service AnotherDynamicService * 
@@ -201,8 +182,7 @@ default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testin
    *
*/ public static final class AnotherDynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements AnotherDynamicServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private AnotherDynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,31 +199,12 @@ protected AnotherDynamicServiceBlockingStub build( * A method * */ - @java.lang.Override public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); } } - /** - * 
-   * AnotherDynamicService
-   *
- */ - public interface AnotherDynamicServiceFuture { - - /** - * 
-     * A method
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture method( - io.grpc.reflection.testing.DynamicRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherDynamicService * 
@@ -251,8 +212,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class AnotherDynamicServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements AnotherDynamicServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private AnotherDynamicServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -269,7 +229,6 @@ protected AnotherDynamicServiceFutureStub build(
      * A method
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index 0c8f47c2800..13afaf959c9 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -133,8 +133,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements AnotherReflectableServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private AnotherReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,7 +147,6 @@ protected AnotherReflectableServiceStub build( /** */ - @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -156,23 +154,11 @@ public void method(io.grpc.reflection.testing.Request request, } } - /** - */ - public interface AnotherReflectableServiceBlocking { - - /** - */ - default io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements AnotherReflectableServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private AnotherReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -186,31 +172,17 @@ protected AnotherReflectableServiceBlockingStub build( /** */ - @java.lang.Override public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); } } - /** - */ - public interface AnotherReflectableServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture method( - io.grpc.reflection.testing.Request request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements AnotherReflectableServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private AnotherReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -224,7 +196,6 @@ protected AnotherReflectableServiceFutureStub build( /** */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index cb4295506fe..0d8518adad5 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -151,8 +151,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class DynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements DynamicServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private DynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -169,7 +168,6 @@ protected DynamicServiceStub build( * A method * */ - @java.lang.Override public void method(io.grpc.reflection.testing.DynamicRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -177,23 +175,6 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, } } - /** - * 
-   * A DynamicService
-   *
- */ - public interface DynamicServiceBlocking { - - /** - * 
-     * A method
-     *
- */ - default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service DynamicService * 
@@ -201,8 +182,7 @@ default io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testin
    *
*/ public static final class DynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements DynamicServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private DynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,31 +199,12 @@ protected DynamicServiceBlockingStub build( * A method * */ - @java.lang.Override public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); } } - /** - * 
-   * A DynamicService
-   *
- */ - public interface DynamicServiceFuture { - - /** - * 
-     * A method
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture method( - io.grpc.reflection.testing.DynamicRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service DynamicService * 
@@ -251,8 +212,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class DynamicServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements DynamicServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private DynamicServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -269,7 +229,6 @@ protected DynamicServiceFutureStub build(
      * A method
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.DynamicRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index d62e0ae3b61..ca090a0f0cc 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -133,8 +133,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do asynchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ReflectableServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,7 +147,6 @@ protected ReflectableServiceStub build( /** */ - @java.lang.Override public void method(io.grpc.reflection.testing.Request request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -156,23 +154,11 @@ public void method(io.grpc.reflection.testing.Request request, } } - /** - */ - public interface ReflectableServiceBlocking { - - /** - */ - default io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ReflectableServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -186,31 +172,17 @@ protected ReflectableServiceBlockingStub build( /** */ - @java.lang.Override public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getMethodMethod(), getCallOptions(), request); } } - /** - */ - public interface ReflectableServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture method( - io.grpc.reflection.testing.Request request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService */ public static final class ReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements ReflectableServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private ReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -224,7 +196,6 @@ protected ReflectableServiceFutureStub build( /** */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture method( io.grpc.reflection.testing.Request request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index 53ceb65e2c7..ea38e006c88 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -328,8 +328,7 @@ public io.grpc.stub.StreamObserver bidiS * */ public static final class SimpleServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements SimpleServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private SimpleServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -346,7 +345,6 @@ protected SimpleServiceStub build( * Simple unary RPC. * */ - @java.lang.Override public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -358,7 +356,6 @@ public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple client-to-server streaming RPC. * */ - @java.lang.Override public io.grpc.stub.StreamObserver clientStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( @@ -370,7 +367,6 @@ public io.grpc.stub.StreamObserver clien * Simple server-to-client streaming RPC. * */ - @java.lang.Override public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -382,7 +378,6 @@ public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, * Simple bidirectional streaming RPC. * */ - @java.lang.Override public io.grpc.stub.StreamObserver bidiStreamingRpc( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -390,33 +385,6 @@ public io.grpc.stub.StreamObserver bidiS } } - /** - * 
-   * A simple service for test.
-   *
- */ - public interface SimpleServiceBlocking { - - /** - * 
-     * Simple unary RPC.
-     *
- */ - default io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - - /** - * 
-     * Simple server-to-client streaming RPC.
-     *
- */ - default java.util.Iterator serverStreamingRpc( - io.grpc.testing.protobuf.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service SimpleService * 
@@ -424,8 +392,7 @@ default java.util.Iterator serverStream
    *
*/ public static final class SimpleServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements SimpleServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private SimpleServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -442,7 +409,6 @@ protected SimpleServiceBlockingStub build( * Simple unary RPC. * */ - @java.lang.Override public io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUnaryRpcMethod(), getCallOptions(), request); @@ -453,7 +419,6 @@ public io.grpc.testing.protobuf.SimpleResponse unaryRpc(io.grpc.testing.protobuf * Simple server-to-client streaming RPC. * */ - @java.lang.Override public java.util.Iterator serverStreamingRpc( io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -461,24 +426,6 @@ public java.util.Iterator serverStreami } } - /** - * 
-   * A simple service for test.
-   *
- */ - public interface SimpleServiceFuture { - - /** - * 
-     * Simple unary RPC.
-     *
- */ - default com.google.common.util.concurrent.ListenableFuture unaryRpc( - io.grpc.testing.protobuf.SimpleRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service SimpleService * 
@@ -486,8 +433,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class SimpleServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements SimpleServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private SimpleServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -504,7 +450,6 @@ protected SimpleServiceFutureStub build(
      * Simple unary RPC.
      *
*/ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture unaryRpc( io.grpc.testing.protobuf.SimpleRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index fab38a05781..ff72e1b17b2 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -173,8 +173,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque * */ public static final class OpenRcaServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements OpenRcaServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private OpenRcaServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,7 +187,6 @@ protected OpenRcaServiceStub build( /** */ - @java.lang.Override public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( @@ -196,28 +194,6 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque } } - /** - * 
-   * Out-of-band (OOB) load reporting service for the additional load reporting
-   * agent that does not sit in the request path. Reports are periodically sampled
-   * with sufficient frequency to provide temporal association with requests.
-   * OOB reporting compensates the limitation of in-band reporting in revealing
-   * costs for backends that do not provide a steady stream of telemetry such as
-   * long running stream operations and zero QPS services. This is a server
-   * streaming service, client needs to terminate current RPC and initiate
-   * a new call to change backend reporting frequency.
-   *
- */ - public interface OpenRcaServiceBlocking { - - /** - */ - default java.util.Iterator streamCoreMetrics( - com.github.xds.service.orca.v3.OrcaLoadReportRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service OpenRcaService * 
@@ -232,8 +208,7 @@ default java.util.Iterator streamCor
    *
*/ public static final class OpenRcaServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements OpenRcaServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private OpenRcaServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -247,7 +222,6 @@ protected OpenRcaServiceBlockingStub build( /** */ - @java.lang.Override public java.util.Iterator streamCoreMetrics( com.github.xds.service.orca.v3.OrcaLoadReportRequest request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( @@ -255,21 +229,6 @@ public java.util.Iterator streamCore } } - /** - * 
-   * Out-of-band (OOB) load reporting service for the additional load reporting
-   * agent that does not sit in the request path. Reports are periodically sampled
-   * with sufficient frequency to provide temporal association with requests.
-   * OOB reporting compensates the limitation of in-band reporting in revealing
-   * costs for backends that do not provide a steady stream of telemetry such as
-   * long running stream operations and zero QPS services. This is a server
-   * streaming service, client needs to terminate current RPC and initiate
-   * a new call to change backend reporting frequency.
-   *
- */ - public interface OpenRcaServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service OpenRcaService * 
@@ -284,8 +243,7 @@ public interface OpenRcaServiceFuture {
    *
*/ public static final class OpenRcaServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements OpenRcaServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private OpenRcaServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index 15d65286887..15eb24f3319 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -251,8 +251,7 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ClusterDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ClusterDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ClusterDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -266,7 +265,6 @@ protected ClusterDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver streamClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -275,7 +273,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaClusters( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -284,7 +281,6 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -292,20 +288,6 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } } - /** - * 
-   * Return list of all clusters this proxy will load balance to.
-   *
- */ - public interface ClusterDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ClusterDiscoveryService * 
@@ -313,8 +295,7 @@ default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy
    *
*/ public static final class ClusterDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ClusterDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ClusterDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -328,28 +309,12 @@ protected ClusterDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchClustersMethod(), getCallOptions(), request); } } - /** - * 
-   * Return list of all clusters this proxy will load balance to.
-   *
- */ - public interface ClusterDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchClusters( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ClusterDiscoveryService * 
@@ -357,8 +322,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ClusterDiscoveryServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ClusterDiscoveryServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ClusterDiscoveryServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -372,7 +336,6 @@ protected ClusterDiscoveryServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture fetchClusters(
         io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
index 36f1e5b45ef..35b10b145d4 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
@@ -247,8 +247,7 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService
    */
   public static final class EndpointDiscoveryServiceStub
-   extends io.grpc.stub.AbstractAsyncStub
-   implements EndpointDiscoveryServiceAsync {
+   extends io.grpc.stub.AbstractAsyncStub {
     private EndpointDiscoveryServiceStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -266,7 +265,6 @@ protected EndpointDiscoveryServiceStub build(
      * to subscribe to updates for.
      *
*/ - @java.lang.Override public io.grpc.stub.StreamObserver streamEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -275,7 +273,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaEndpoints( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -284,7 +281,6 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -292,23 +288,11 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } } - /** - */ - public interface EndpointDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements EndpointDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private EndpointDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -322,31 +306,17 @@ protected EndpointDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchEndpointsMethod(), getCallOptions(), request); } } - /** - */ - public interface EndpointDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchEndpoints( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements EndpointDiscoveryServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private EndpointDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -360,7 +330,6 @@ protected EndpointDiscoveryServiceFutureStub build( /** */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchEndpoints( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index 15bcf298dd8..a62a4b44043 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -263,8 +263,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ListenerDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ListenerDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ListenerDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -278,7 +277,6 @@ protected ListenerDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -287,7 +285,6 @@ public io.grpc.stub.StreamObserver streamListeners( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -296,7 +293,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -304,23 +300,6 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } } - /** - * 
-   * The Envoy instance initiates an RPC at startup to discover a list of
-   * listeners. Updates are delivered via streaming from the LDS server and
-   * consist of a complete update of all listeners. Existing connections will be
-   * allowed to drain from listeners that are no longer present.
-   *
- */ - public interface ListenerDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ListenerDiscoveryService * 
@@ -331,8 +310,7 @@ default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyprox
    *
*/ public static final class ListenerDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ListenerDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ListenerDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -346,31 +324,12 @@ protected ListenerDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchListenersMethod(), getCallOptions(), request); } } - /** - * 
-   * The Envoy instance initiates an RPC at startup to discover a list of
-   * listeners. Updates are delivered via streaming from the LDS server and
-   * consist of a complete update of all listeners. Existing connections will be
-   * allowed to drain from listeners that are no longer present.
-   *
- */ - public interface ListenerDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchListeners( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ListenerDiscoveryService * 
@@ -381,8 +340,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ListenerDiscoveryServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ListenerDiscoveryServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ListenerDiscoveryServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -396,7 +354,6 @@ protected ListenerDiscoveryServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture fetchListeners(
         io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
index c719125eba5..6227426b250 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
@@ -267,8 +267,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    *
*/ public static final class RouteDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements RouteDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private RouteDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -282,7 +281,6 @@ protected RouteDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver streamRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -291,7 +289,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -300,7 +297,6 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -308,24 +304,6 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } } - /** - * 
-   * The resource_names field in DiscoveryRequest specifies a route configuration.
-   * This allows an Envoy configuration with multiple HTTP listeners (and
-   * associated HTTP connection manager filters) to use different route
-   * configurations. Each listener will bind its HTTP connection manager filter to
-   * a route table via this identifier.
-   *
- */ - public interface RouteDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service RouteDiscoveryService * 
@@ -337,8 +315,7 @@ default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.e
    *
*/ public static final class RouteDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements RouteDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private RouteDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -352,32 +329,12 @@ protected RouteDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchRoutesMethod(), getCallOptions(), request); } } - /** - * 
-   * The resource_names field in DiscoveryRequest specifies a route configuration.
-   * This allows an Envoy configuration with multiple HTTP listeners (and
-   * associated HTTP connection manager filters) to use different route
-   * configurations. Each listener will bind its HTTP connection manager filter to
-   * a route table via this identifier.
-   *
- */ - public interface RouteDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchRoutes( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteDiscoveryService * 
@@ -389,8 +346,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class RouteDiscoveryServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements RouteDiscoveryServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private RouteDiscoveryServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -404,7 +360,6 @@ protected RouteDiscoveryServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture fetchRoutes(
         io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
index 54759c7e5cb..a3685a0587d 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
@@ -275,8 +275,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques
    *
*/ public static final class ScopedRoutesDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ScopedRoutesDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ScopedRoutesDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -290,7 +289,6 @@ protected ScopedRoutesDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver streamScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -299,7 +297,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaScopedRoutes( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -308,7 +305,6 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -316,26 +312,6 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques } } - /** - * 
-   * The Scoped Routes Discovery Service (SRDS) API distributes
-   * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
-   * resources. Each ScopedRouteConfiguration resource represents a "routing
-   * scope" containing a mapping that allows the HTTP connection manager to
-   * dynamically assign a routing table (specified via a
-   * :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
-   * HTTP request.
-   *
- */ - public interface ScopedRoutesDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ScopedRoutesDiscoveryService * 
@@ -349,8 +325,7 @@ default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoyp
    *
*/ public static final class ScopedRoutesDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ScopedRoutesDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ScopedRoutesDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -364,34 +339,12 @@ protected ScopedRoutesDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchScopedRoutesMethod(), getCallOptions(), request); } } - /** - * 
-   * The Scoped Routes Discovery Service (SRDS) API distributes
-   * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
-   * resources. Each ScopedRouteConfiguration resource represents a "routing
-   * scope" containing a mapping that allows the HTTP connection manager to
-   * dynamically assign a routing table (specified via a
-   * :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
-   * HTTP request.
-   *
- */ - public interface ScopedRoutesDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchScopedRoutes( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ScopedRoutesDiscoveryService * 
@@ -405,8 +358,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ScopedRoutesDiscoveryServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ScopedRoutesDiscoveryServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ScopedRoutesDiscoveryServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -420,7 +372,6 @@ protected ScopedRoutesDiscoveryServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture fetchScopedRoutes(
         io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
index 4876bd55314..33e0bd6cb29 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
@@ -181,8 +181,7 @@ public io.grpc.stub.StreamObserver
    */
   public static final class VirtualHostDiscoveryServiceStub
-   extends io.grpc.stub.AbstractAsyncStub
-   implements VirtualHostDiscoveryServiceAsync {
+   extends io.grpc.stub.AbstractAsyncStub {
     private VirtualHostDiscoveryServiceStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -196,7 +195,6 @@ protected VirtualHostDiscoveryServiceStub build(
 
     /**
      */
-    @java.lang.Override
     public io.grpc.stub.StreamObserver deltaVirtualHosts(
         io.grpc.stub.StreamObserver responseObserver) {
       return io.grpc.stub.ClientCalls.asyncBidiStreamingCall(
@@ -204,23 +202,6 @@ public io.grpc.stub.StreamObserver
-   * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
-   * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
-   * during the processing of an HTTP request if a route for the request cannot be resolved. The
-   * :ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>`
-   * field contains a list of virtual host names or aliases to track. The contents of an alias would
-   * be the contents of a *host* or *authority* header used to make an http request. An xDS server
-   * will match an alias to a virtual host based on the content of :ref:`domains'
-   * <envoy_api_field_route.VirtualHost.domains>` field. The *resource_names_unsubscribe* field
-   * contains a list of virtual host names that have been :ref:`unsubscribed
-   * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
-   *
- */ - public interface VirtualHostDiscoveryServiceBlocking { - } - /** * A stub to allow clients to do synchronous rpc calls to service VirtualHostDiscoveryService * 
@@ -237,8 +218,7 @@ public interface VirtualHostDiscoveryServiceBlocking {
    *
*/ public static final class VirtualHostDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements VirtualHostDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private VirtualHostDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -251,23 +231,6 @@ protected VirtualHostDiscoveryServiceBlockingStub build( } } - /** - * 
-   * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
-   * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
-   * during the processing of an HTTP request if a route for the request cannot be resolved. The
-   * :ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>`
-   * field contains a list of virtual host names or aliases to track. The contents of an alias would
-   * be the contents of a *host* or *authority* header used to make an http request. An xDS server
-   * will match an alias to a virtual host based on the content of :ref:`domains'
-   * <envoy_api_field_route.VirtualHost.domains>` field. The *resource_names_unsubscribe* field
-   * contains a list of virtual host names that have been :ref:`unsubscribed
-   * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
-   *
- */ - public interface VirtualHostDiscoveryServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service VirtualHostDiscoveryService * 
@@ -284,8 +247,7 @@ public interface VirtualHostDiscoveryServiceFuture {
    *
*/ public static final class VirtualHostDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements VirtualHostDiscoveryServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private VirtualHostDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 35c49ca06c1..015632d1464 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -224,8 +224,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements AggregatedDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -242,7 +241,6 @@ protected AggregatedDiscoveryServiceStub build( * This is a gRPC-only API. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -251,7 +249,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -259,19 +256,6 @@ public io.grpc.stub.StreamObserver - * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of - * ADS and how it is intended to be used by a management server. ADS requests - * have the same structure as their singleton xDS counterparts, but can - * multiplex many resource types on a single stream. The type_url in the - * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover - * the multiplexed singleton APIs at the Envoy instance and management server. - * - */ - public interface AggregatedDiscoveryServiceBlocking { - } - /** * A stub to allow clients to do synchronous rpc calls to service AggregatedDiscoveryService * 
@@ -284,8 +268,7 @@ public interface AggregatedDiscoveryServiceBlocking {
    *
*/ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements AggregatedDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -298,19 +281,6 @@ protected AggregatedDiscoveryServiceBlockingStub build( } } - /** - * 
-   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
-   * ADS and how it is intended to be used by a management server. ADS requests
-   * have the same structure as their singleton xDS counterparts, but can
-   * multiplex many resource types on a single stream. The type_url in the
-   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
-   * the multiplexed singleton APIs at the Envoy instance and management server.
-   *
- */ - public interface AggregatedDiscoveryServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService * 
@@ -323,8 +293,7 @@ public interface AggregatedDiscoveryServiceFuture {
    *
*/ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements AggregatedDiscoveryServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index 966b9a7cb59..0dfe8e9e6b2 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -239,8 +239,7 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements SecretDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private SecretDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -254,7 +253,6 @@ protected SecretDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver deltaSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -263,7 +261,6 @@ public io.grpc.stub.StreamObserver streamSecrets( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -272,7 +269,6 @@ public io.grpc.stub.StreamObserver /** */ - @java.lang.Override public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -280,23 +276,11 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, } } - /** - */ - public interface SecretDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements SecretDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private SecretDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -310,31 +294,17 @@ protected SecretDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchSecretsMethod(), getCallOptions(), request); } } - /** - */ - public interface SecretDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchSecrets( - io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements SecretDiscoveryServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private SecretDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -348,7 +318,6 @@ protected SecretDiscoveryServiceFutureStub build( /** */ - @java.lang.Override public com.google.common.util.concurrent.ListenableFuture fetchSecrets( io.envoyproxy.envoy.api.v2.DiscoveryRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index 4bfa6056b40..d047a1b85de 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -224,8 +224,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements AggregatedDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -242,7 +241,6 @@ protected AggregatedDiscoveryServiceStub build( * This is a gRPC-only API. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -251,7 +249,6 @@ public io.grpc.stub.StreamObserver deltaAggregatedResources( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -259,19 +256,6 @@ public io.grpc.stub.StreamObserver - * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of - * ADS and how it is intended to be used by a management server. ADS requests - * have the same structure as their singleton xDS counterparts, but can - * multiplex many resource types on a single stream. The type_url in the - * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover - * the multiplexed singleton APIs at the Envoy instance and management server. - * - */ - public interface AggregatedDiscoveryServiceBlocking { - } - /** * A stub to allow clients to do synchronous rpc calls to service AggregatedDiscoveryService * 
@@ -284,8 +268,7 @@ public interface AggregatedDiscoveryServiceBlocking {
    *
*/ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements AggregatedDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -298,19 +281,6 @@ protected AggregatedDiscoveryServiceBlockingStub build( } } - /** - * 
-   * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
-   * ADS and how it is intended to be used by a management server. ADS requests
-   * have the same structure as their singleton xDS counterparts, but can
-   * multiplex many resource types on a single stream. The type_url in the
-   * DiscoveryRequest/DiscoveryResponse provides sufficient information to recover
-   * the multiplexed singleton APIs at the Envoy instance and management server.
-   *
- */ - public interface AggregatedDiscoveryServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService * 
@@ -323,8 +293,7 @@ public interface AggregatedDiscoveryServiceFuture {
    *
*/ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements AggregatedDiscoveryServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index 8a33a986536..6c3b87738de 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -191,8 +191,7 @@ public io.grpc.stub.StreamObserver - implements LoadReportingServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +234,6 @@ protected LoadReportingServiceStub build( * assignment destined for each zone Envoys are located in. Goto 2. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -243,17 +241,11 @@ public io.grpc.stub.StreamObserver - implements LoadReportingServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -266,17 +258,11 @@ protected LoadReportingServiceBlockingStub build( } } - /** - */ - public interface LoadReportingServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements LoadReportingServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index daf7adc1362..33932d49ec8 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -191,8 +191,7 @@ public io.grpc.stub.StreamObserver - implements LoadReportingServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +234,6 @@ protected LoadReportingServiceStub build( * assignment destined for each zone Envoys are located in. Goto 2. * */ - @java.lang.Override public io.grpc.stub.StreamObserver streamLoadStats( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -243,17 +241,11 @@ public io.grpc.stub.StreamObserver - implements LoadReportingServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -266,17 +258,11 @@ protected LoadReportingServiceBlockingStub build( } } - /** - */ - public interface LoadReportingServiceFuture { - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub - implements LoadReportingServiceFuture { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index 1564ee013f8..ccad24fdc03 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -206,8 +206,7 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus * */ public static final class ClientStatusDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub - implements ClientStatusDiscoveryServiceAsync { + extends io.grpc.stub.AbstractAsyncStub { private ClientStatusDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -221,7 +220,6 @@ protected ClientStatusDiscoveryServiceStub build( /** */ - @java.lang.Override public io.grpc.stub.StreamObserver streamClientStatus( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( @@ -230,7 +228,6 @@ public io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( @@ -238,22 +235,6 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus } } - /** - * 
-   * CSDS is Client Status Discovery Service. It can be used to get the status of
-   * an xDS-compliant client from the management server's point of view. It can
-   * also be used to get the current xDS states directly from the client.
-   *
- */ - public interface ClientStatusDiscoveryServiceBlocking { - - /** - */ - default io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do synchronous rpc calls to service ClientStatusDiscoveryService * 
@@ -263,8 +244,7 @@ default io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientSt
    *
*/ public static final class ClientStatusDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub - implements ClientStatusDiscoveryServiceBlocking { + extends io.grpc.stub.AbstractBlockingStub { private ClientStatusDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -278,30 +258,12 @@ protected ClientStatusDiscoveryServiceBlockingStub build( /** */ - @java.lang.Override public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getFetchClientStatusMethod(), getCallOptions(), request); } } - /** - * 
-   * CSDS is Client Status Discovery Service. It can be used to get the status of
-   * an xDS-compliant client from the management server's point of view. It can
-   * also be used to get the current xDS states directly from the client.
-   *
- */ - public interface ClientStatusDiscoveryServiceFuture { - - /** - */ - default com.google.common.util.concurrent.ListenableFuture fetchClientStatus( - io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) { - throw new UnsupportedOperationException(); - } - } - /** * A stub to allow clients to do ListenableFuture-style rpc calls to service ClientStatusDiscoveryService * 
@@ -311,8 +273,7 @@ default com.google.common.util.concurrent.ListenableFuture
    */
   public static final class ClientStatusDiscoveryServiceFutureStub
-   extends io.grpc.stub.AbstractFutureStub
-   implements ClientStatusDiscoveryServiceFuture {
+   extends io.grpc.stub.AbstractFutureStub {
     private ClientStatusDiscoveryServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -326,7 +287,6 @@ protected ClientStatusDiscoveryServiceFutureStub build(
 
     /**
      */
-    @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture fetchClientStatus(
         io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request) {
       return io.grpc.stub.ClientCalls.futureUnaryCall(

From c9ece18ecb5ab14c198c84657dec896be5c736c9 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 15 Nov 2022 02:01:18 +0000
Subject: [PATCH 20/42] update pom files to allow java 1.8

---
 examples/example-gauth/pom.xml    | 4 ++--
 examples/example-hostname/pom.xml | 4 ++--
 examples/example-jwt-auth/pom.xml | 4 ++--
 examples/example-tls/pom.xml      | 4 ++--
 examples/pom.xml                  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml
index 9f36e0e98b2..4d5b628bf2a 100644
--- a/examples/example-gauth/pom.xml
+++ b/examples/example-gauth/pom.xml
@@ -15,8 +15,8 @@
     1.51.0-SNAPSHOT
     3.21.7
     
-    1.7
-    1.7
+    1.8
+    1.8
   
 
   
diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml
index e111c244f6f..52289d41de3 100644
--- a/examples/example-hostname/pom.xml
+++ b/examples/example-hostname/pom.xml
@@ -15,8 +15,8 @@
     1.51.0-SNAPSHOT
     3.21.7
     
-    1.7
-    1.7
+    1.8
+    1.8
   
 
   
diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml
index d6223b1e0d0..dc8e5c0245b 100644
--- a/examples/example-jwt-auth/pom.xml
+++ b/examples/example-jwt-auth/pom.xml
@@ -17,8 +17,8 @@
     3.21.7
     3.21.7
     
-    1.7
-    1.7
+    1.8
+    1.8
   
 
   
diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml
index e3573aaa25d..d3dee7fe02e 100644
--- a/examples/example-tls/pom.xml
+++ b/examples/example-tls/pom.xml
@@ -16,8 +16,8 @@
     3.21.7
     2.0.54.Final
     
-    1.7
-    1.7
+    1.8
+    1.8
   
 
   
diff --git a/examples/pom.xml b/examples/pom.xml
index b6631152bd9..cbe2818beeb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -16,8 +16,8 @@
     3.21.7
     3.21.7
     
-    1.7
-    1.7
+    1.8
+    1.8
   
 
   

From ce4d6e32c12b4b682cce210ca5cb4213f8c996f0 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 15 Nov 2022 13:12:40 -0800
Subject: [PATCH 21/42] Respond to reviewer comments:   * Add a
 bindService(Async) method   * Remove methods from BaseImpl that were
 defaulted in Interface   * Fix indentations.

---
 .../src/java_plugin/cpp/java_generator.cpp    | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 32ee3df1f4f..ba46d6f652f 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -624,12 +624,12 @@ static void PrintStub(
     p->Print(
         *vars,
         "public static abstract class $abstract_name$\n"
-        " implements $BindableService$, $interface_name$ {\n");
+        "  implements $BindableService$, $interface_name$ {\n");
   } else {
     p->Print(
         *vars,
         "public static final class $stub_name$\n"
-        " extends $stub_base_class_name$<$stub_name$> {\n");
+        "  extends $stub_base_class_name$<$stub_name$> {\n");
   }
   p->Indent();
 
@@ -660,6 +660,9 @@ static void PrintStub(
 
   // RPC methods
   for (int i = 0; i < service->method_count(); ++i) {
+    if (impl_base && !interface) {
+      break; // Interface defines these as defaults, so not needed in abstract
+    }
     const MethodDescriptor* method = service->method(i);
     (*vars)["input_type"] = MessageFullJavaName(method->input_type());
     (*vars)["output_type"] = MessageFullJavaName(method->output_type());
@@ -688,9 +691,6 @@ static void PrintStub(
     }
 
     if (!interface) {
-      if (impl_base) {
-        p->Print(*vars, "@$Override$\n");
-      }
       p->Print("public ");
     } else {
       p->Print("default ");
@@ -821,8 +821,9 @@ static void PrintStub(
     p->Print(
         *vars,
         "@$Override$ public final $ServerServiceDefinition$ bindService() {\n");
-    (*vars)["instance"] = "this";
-    PrintBindServiceMethodBody(service, vars, p);
+    p->InDent();
+    p->Print(*vars, "return $service_class_name$.bindService(this);\n");
+    p->OutDent();
     p->Print("}\n");
   }
 
@@ -1045,10 +1046,17 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service,
   p->Print("}\n");
 }
 
-static void PrintBindServiceMethodBody(const ServiceDescriptor* service,
+    (*vars)["instance"] = "this";
+    PrintBindServiceMethodBody(service, vars, p);
+
+static void PrintBindServiceMethod(const ServiceDescriptor* service,
                                    std::map* vars,
                                    Printer* p) {
   (*vars)["service_name"] = service->name();
+  p->Print(*vars,
+           "public static final io.grpc.ServerServiceDefinition "
+           "bindService($service_name$Async service) {\n");
+
   p->Indent();
   p->Print(*vars,
            "return "
@@ -1089,7 +1097,7 @@ static void PrintBindServiceMethodBody(const ServiceDescriptor* service,
         "new MethodHandlers<\n"
         "  $input_type$,\n"
         "  $output_type$>(\n"
-        "    $instance$, $method_id_name$)))\n");
+        "    service, $method_id_name$)))\n");
     p->Outdent();
     p->Outdent();
   }

From feb8f95c96b5ffac973d94ae5c6fab15538ea872 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 15 Nov 2022 23:49:35 +0000
Subject: [PATCH 22/42] Fix generation of bind method

---
 .../proto/BenchmarkServiceGrpc.java           | 151 ++++--------
 .../proto/ReportQpsScenarioServiceGrpc.java   |  45 ++--
 .../benchmarks/proto/WorkerServiceGrpc.java   | 130 +++-------
 .../src/java_plugin/cpp/java_generator.cpp    |  13 +-
 .../golden/TestDeprecatedService.java.txt     |  53 ++--
 compiler/src/test/golden/TestService.java.txt | 229 ++++++-----------
 .../golden/TestDeprecatedService.java.txt     |  53 ++--
 .../src/testLite/golden/TestService.java.txt  | 229 ++++++-----------
 .../LoadBalancerStatsServiceGrpc.java         |  70 ++----
 .../integration/MetricsServiceGrpc.java       |  71 ++----
 .../integration/ReconnectServiceGrpc.java     |  64 ++---
 .../testing/integration/TestServiceGrpc.java  | 230 ++++++------------
 .../integration/UnimplementedServiceGrpc.java |  45 ++--
 .../XdsUpdateClientConfigureServiceGrpc.java  |  45 ++--
 .../XdsUpdateHealthServiceGrpc.java           |  64 ++---
 .../io/istio/test/EchoTestServiceGrpc.java    |  64 ++---
 .../io/grpc/channelz/v1/ChannelzGrpc.java     | 196 +++++----------
 .../grpc/io/grpc/health/v1/HealthGrpc.java    |  83 ++-----
 .../v1alpha/ServerReflectionGrpc.java         |  46 ++--
 .../testing/AnotherDynamicServiceGrpc.java    |  45 ++--
 .../AnotherReflectableServiceGrpc.java        |  42 ++--
 .../testing/DynamicServiceGrpc.java           |  45 ++--
 .../testing/ReflectableServiceGrpc.java       |  42 ++--
 .../testing/protobuf/SimpleServiceGrpc.java   | 120 +++------
 .../service/orca/v3/OpenRcaServiceGrpc.java   |  42 ++--
 .../api/v2/ClusterDiscoveryServiceGrpc.java   |  86 +++----
 .../api/v2/EndpointDiscoveryServiceGrpc.java  |  90 +++----
 .../api/v2/ListenerDiscoveryServiceGrpc.java  |  86 +++----
 .../api/v2/RouteDiscoveryServiceGrpc.java     |  86 +++----
 .../v2/ScopedRoutesDiscoveryServiceGrpc.java  |  86 +++----
 .../v2/VirtualHostDiscoveryServiceGrpc.java   |  42 ++--
 .../v2/AggregatedDiscoveryServiceGrpc.java    |  67 ++---
 .../v2/SecretDiscoveryServiceGrpc.java        |  86 +++----
 .../v3/AggregatedDiscoveryServiceGrpc.java    |  67 ++---
 .../v2/LoadReportingServiceGrpc.java          |  71 ++----
 .../v3/LoadReportingServiceGrpc.java          |  71 ++----
 .../v3/ClientStatusDiscoveryServiceGrpc.java  |  64 ++---
 37 files changed, 1132 insertions(+), 1987 deletions(-)

diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
index 85d2a933820..b2f60e94b3b 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@@ -279,107 +279,10 @@ default io.grpc.stub.StreamObserver
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - @java.lang.Override - public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); - } - - /** - * 
-     * Repeated sequence of one request followed by one response.
-     * Should be called streaming ping-pong
-     * The server returns the client payload as-is on each response
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingCallMethod(), responseObserver); - } - - /** - * 
-     * Single-sided unbounded streaming from client to server
-     * The server returns the client payload as-is once the client does WritesDone
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingFromClient( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingFromClientMethod(), responseObserver); - } - - /** - * 
-     * Single-sided unbounded streaming from server to client
-     * The server repeatedly returns the client payload as-is
-     *
- */ - @java.lang.Override - public void streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingFromServerMethod(), responseObserver); - } - - /** - * 
-     * Two-sided unbounded streaming between server to client
-     * Both sides send the content of their own choice to the other
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingBothWays( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingBothWaysMethod(), responseObserver); - } + implements io.grpc.BindableService, BenchmarkServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Messages.SimpleRequest, - io.grpc.benchmarks.proto.Messages.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getStreamingCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Messages.SimpleRequest, - io.grpc.benchmarks.proto.Messages.SimpleResponse>( - this, METHODID_STREAMING_CALL))) - .addMethod( - getStreamingFromClientMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Messages.SimpleRequest, - io.grpc.benchmarks.proto.Messages.SimpleResponse>( - this, METHODID_STREAMING_FROM_CLIENT))) - .addMethod( - getStreamingFromServerMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Messages.SimpleRequest, - io.grpc.benchmarks.proto.Messages.SimpleResponse>( - this, METHODID_STREAMING_FROM_SERVER))) - .addMethod( - getStreamingBothWaysMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Messages.SimpleRequest, - io.grpc.benchmarks.proto.Messages.SimpleResponse>( - this, METHODID_STREAMING_BOTH_WAYS))) - .build(); + return BenchmarkServiceGrpc.bindService(this); } } @@ -387,7 +290,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private BenchmarkServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -465,7 +368,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private BenchmarkServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -505,7 +408,7 @@ public java.util.Iterator stre * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService */ public static final class BenchmarkServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private BenchmarkServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -541,10 +444,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final BenchmarkServiceImplBase serviceImpl; + private final BenchmarkServiceAsync serviceImpl; private final int methodId; - MethodHandlers(BenchmarkServiceImplBase serviceImpl, int methodId) { + MethodHandlers(BenchmarkServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -586,6 +489,46 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(BenchmarkServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Messages.SimpleRequest, + io.grpc.benchmarks.proto.Messages.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getStreamingCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Messages.SimpleRequest, + io.grpc.benchmarks.proto.Messages.SimpleResponse>( + service, METHODID_STREAMING_CALL))) + .addMethod( + getStreamingFromClientMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Messages.SimpleRequest, + io.grpc.benchmarks.proto.Messages.SimpleResponse>( + service, METHODID_STREAMING_FROM_CLIENT))) + .addMethod( + getStreamingFromServerMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Messages.SimpleRequest, + io.grpc.benchmarks.proto.Messages.SimpleResponse>( + service, METHODID_STREAMING_FROM_SERVER))) + .addMethod( + getStreamingBothWaysMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Messages.SimpleRequest, + io.grpc.benchmarks.proto.Messages.SimpleResponse>( + service, METHODID_STREAMING_BOTH_WAYS))) + .build(); + } + private static abstract class BenchmarkServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { BenchmarkServiceBaseDescriptorSupplier() {} diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 68ede80f08a..a2904bad03a 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -109,29 +109,10 @@ default void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult requ * Base class for the server implementation of the service ReportQpsScenarioService */ public static abstract class ReportQpsScenarioServiceImplBase - implements io.grpc.BindableService, ReportQpsScenarioServiceAsync { - - /** - * 
-     * Report results of a QPS test benchmark scenario.
-     *
- */ - @java.lang.Override - public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReportScenarioMethod(), responseObserver); - } + implements io.grpc.BindableService, ReportQpsScenarioServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getReportScenarioMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Control.ScenarioResult, - io.grpc.benchmarks.proto.Control.Void>( - this, METHODID_REPORT_SCENARIO))) - .build(); + return ReportQpsScenarioServiceGrpc.bindService(this); } } @@ -139,7 +120,7 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReportQpsScenarioServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +148,7 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReportQpsScenarioServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -194,7 +175,7 @@ public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.p * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReportQpsScenarioServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -225,10 +206,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReportQpsScenarioServiceImplBase serviceImpl; + private final ReportQpsScenarioServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ReportQpsScenarioServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ReportQpsScenarioServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -257,6 +238,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ReportQpsScenarioServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getReportScenarioMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Control.ScenarioResult, + io.grpc.benchmarks.proto.Control.Void>( + service, METHODID_REPORT_SCENARIO))) + .build(); + } + private static abstract class ReportQpsScenarioServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ReportQpsScenarioServiceBaseDescriptorSupplier() {} diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 5da1f9c7c1c..47f9b8000e5 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -242,93 +242,10 @@ default void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * Base class for the server implementation of the service WorkerService */ public static abstract class WorkerServiceImplBase - implements io.grpc.BindableService, WorkerServiceAsync { - - /** - * 
-     * Start server with specified workload.
-     * First request sent specifies the ServerConfig followed by ServerStatus
-     * response. After that, a "Mark" can be sent anytime to request the latest
-     * stats. Closing the stream will initiate shutdown of the test server
-     * and once the shutdown has finished, the OK status is sent to terminate
-     * this RPC.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver runServer( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunServerMethod(), responseObserver); - } - - /** - * 
-     * Start client with specified workload.
-     * First request sent specifies the ClientConfig followed by ClientStatus
-     * response. After that, a "Mark" can be sent anytime to request the latest
-     * stats. Closing the stream will initiate shutdown of the test client
-     * and once the shutdown has finished, the OK status is sent to terminate
-     * this RPC.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver runClient( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getRunClientMethod(), responseObserver); - } - - /** - * 
-     * Just return the core count - unary call
-     *
- */ - @java.lang.Override - public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCoreCountMethod(), responseObserver); - } - - /** - * 
-     * Quit this worker
-     *
- */ - @java.lang.Override - public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getQuitWorkerMethod(), responseObserver); - } + implements io.grpc.BindableService, WorkerServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getRunServerMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Control.ServerArgs, - io.grpc.benchmarks.proto.Control.ServerStatus>( - this, METHODID_RUN_SERVER))) - .addMethod( - getRunClientMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Control.ClientArgs, - io.grpc.benchmarks.proto.Control.ClientStatus>( - this, METHODID_RUN_CLIENT))) - .addMethod( - getCoreCountMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Control.CoreRequest, - io.grpc.benchmarks.proto.Control.CoreResponse>( - this, METHODID_CORE_COUNT))) - .addMethod( - getQuitWorkerMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.benchmarks.proto.Control.Void, - io.grpc.benchmarks.proto.Control.Void>( - this, METHODID_QUIT_WORKER))) - .build(); + return WorkerServiceGrpc.bindService(this); } } @@ -336,7 +253,7 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * A stub to allow clients to do asynchronous rpc calls to service WorkerService */ public static final class WorkerServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private WorkerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -407,7 +324,7 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * A stub to allow clients to do synchronous rpc calls to service WorkerService */ public static final class WorkerServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private WorkerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -444,7 +361,7 @@ public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService */ public static final class WorkerServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private WorkerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -489,10 +406,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final WorkerServiceImplBase serviceImpl; + private final WorkerServiceAsync serviceImpl; private final int methodId; - MethodHandlers(WorkerServiceImplBase serviceImpl, int methodId) { + MethodHandlers(WorkerServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -531,6 +448,39 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(WorkerServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getRunServerMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Control.ServerArgs, + io.grpc.benchmarks.proto.Control.ServerStatus>( + service, METHODID_RUN_SERVER))) + .addMethod( + getRunClientMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Control.ClientArgs, + io.grpc.benchmarks.proto.Control.ClientStatus>( + service, METHODID_RUN_CLIENT))) + .addMethod( + getCoreCountMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Control.CoreRequest, + io.grpc.benchmarks.proto.Control.CoreResponse>( + service, METHODID_CORE_COUNT))) + .addMethod( + getQuitWorkerMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.benchmarks.proto.Control.Void, + io.grpc.benchmarks.proto.Control.Void>( + service, METHODID_QUIT_WORKER))) + .build(); + } + private static abstract class WorkerServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { WorkerServiceBaseDescriptorSupplier() {} diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index ba46d6f652f..efb4a247294 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -519,7 +519,7 @@ static void PrintMethodFields( } } -static void PrintBindServiceMethodBody(const ServiceDescriptor* service, +static void PrintBindServiceMethod(const ServiceDescriptor* service, std::map* vars, Printer* p); @@ -821,9 +821,9 @@ static void PrintStub( p->Print( *vars, "@$Override$ public final $ServerServiceDefinition$ bindService() {\n"); - p->InDent(); + p->Indent(); p->Print(*vars, "return $service_class_name$.bindService(this);\n"); - p->OutDent(); + p->Outdent(); p->Print("}\n"); } @@ -858,7 +858,7 @@ static void PrintMethodHandlerClass(const ServiceDescriptor* service, "private static final int $method_id_name$ = $method_id$;\n"); } p->Print("\n"); - (*vars)["service_name"] = service->name() + "ImplBase"; + (*vars)["service_name"] = service->name() + "Async"; p->Print( *vars, "private static final class MethodHandlers implements\n" @@ -1046,9 +1046,6 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service, p->Print("}\n"); } - (*vars)["instance"] = "this"; - PrintBindServiceMethodBody(service, vars, p); - static void PrintBindServiceMethod(const ServiceDescriptor* service, std::map* vars, Printer* p) { @@ -1105,6 +1102,7 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service, p->Outdent(); p->Outdent(); p->Outdent(); + p->Print("}\n\n"); } static void PrintService(const ServiceDescriptor* service, @@ -1197,6 +1195,7 @@ static void PrintService(const ServiceDescriptor* service, PrintStub(service, vars, p, FUTURE_CLIENT_IMPL); PrintMethodHandlerClass(service, vars, p); + PrintBindServiceMethod(service, vars, p); PrintGetServiceDescriptorMethod(service, vars, p, flavor); p->Outdent(); p->Print("}\n"); diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index 7c8fa57714d..40562a34f74 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -100,7 +100,7 @@ public final class TestDeprecatedServiceGrpc { * */ @java.lang.Deprecated - public static abstract class TestDeprecatedServiceImplBase implements io.grpc.BindableService { + public interface TestDeprecatedServiceAsync { /** * 
@@ -108,31 +108,36 @@ public final class TestDeprecatedServiceGrpc {
      *
*/ @java.lang.Deprecated - public void deprecatedMethod(io.grpc.testing.compiler.Test.SimpleRequest request, + default void deprecatedMethod(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeprecatedMethodMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service TestDeprecatedService + * 
+   * Test service that has been deprecated and should generate with Java's @Deprecated annotation
+   *
+ */ + @java.lang.Deprecated + public static abstract class TestDeprecatedServiceImplBase + implements io.grpc.BindableService, TestDeprecatedServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeprecatedMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_DEPRECATED_METHOD))) - .build(); + return TestDeprecatedServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestDeprecatedServiceStub + extends io.grpc.stub.AbstractAsyncStub { private TestDeprecatedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -158,12 +163,14 @@ public final class TestDeprecatedServiceGrpc { } /** + * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class TestDeprecatedServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private TestDeprecatedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,12 +195,14 @@ public final class TestDeprecatedServiceGrpc { } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class TestDeprecatedServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private TestDeprecatedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -225,10 +234,10 @@ public final class TestDeprecatedServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestDeprecatedServiceImplBase serviceImpl; + private final TestDeprecatedServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestDeprecatedServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestDeprecatedServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -257,6 +266,18 @@ public final class TestDeprecatedServiceGrpc { } } + public static final io.grpc.ServerServiceDefinition bindService(TestDeprecatedServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeprecatedMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_DEPRECATED_METHOD))) + .build(); + } + private static abstract class TestDeprecatedServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { TestDeprecatedServiceBaseDescriptorSupplier() {} diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 2678ba8ca6c..39628a5b7ff 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -416,164 +416,10 @@ public final class TestServiceGrpc { * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - @java.lang.Override - public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - @java.lang.Override - public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by one response (streamed upload).
-     * The server returns the aggregated size of client payload as the result.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests with each request served by the server immediately.
-     * As one request could lead to multiple responses, this interface
-     * demonstrates the idea of full bidirectionality.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver fullBidiCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by a sequence of responses.
-     * The server buffers all the client requests and then serves them in order. A
-     * stream of responses are returned to the client when the server starts with
-     * first request.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver halfBidiCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); - } - - /** - * 
-     * An RPC method whose Java name collides with a keyword, and whose generated
-     * method should have a '_' appended.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver import_( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - @java.lang.Override - public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - @java.lang.Override - public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); - } + implements io.grpc.BindableService, TestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getStreamingOutputCallMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_STREAMING_OUTPUT_CALL))) - .addMethod( - getStreamingInputCallMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingInputCallRequest, - io.grpc.testing.compiler.Test.StreamingInputCallResponse>( - this, METHODID_STREAMING_INPUT_CALL))) - .addMethod( - getFullBidiCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_FULL_BIDI_CALL))) - .addMethod( - getHalfBidiCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_HALF_BIDI_CALL))) - .addMethod( - getImportMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingInputCallRequest, - io.grpc.testing.compiler.Test.StreamingInputCallResponse>( - this, METHODID_IMPORT))) - .addMethod( - getSafeCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_SAFE_CALL))) - .addMethod( - getIdempotentCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_IDEMPOTENT_CALL))) - .build(); + return TestServiceGrpc.bindService(this); } } @@ -584,7 +430,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -701,7 +547,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -764,7 +610,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -825,10 +671,10 @@ public final class TestServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceImplBase serviceImpl; + private final TestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -881,6 +727,67 @@ public final class TestServiceGrpc { } } + public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getStreamingOutputCallMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_STREAMING_OUTPUT_CALL))) + .addMethod( + getStreamingInputCallMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingInputCallRequest, + io.grpc.testing.compiler.Test.StreamingInputCallResponse>( + service, METHODID_STREAMING_INPUT_CALL))) + .addMethod( + getFullBidiCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_FULL_BIDI_CALL))) + .addMethod( + getHalfBidiCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_HALF_BIDI_CALL))) + .addMethod( + getImportMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingInputCallRequest, + io.grpc.testing.compiler.Test.StreamingInputCallResponse>( + service, METHODID_IMPORT))) + .addMethod( + getSafeCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_SAFE_CALL))) + .addMethod( + getIdempotentCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_IDEMPOTENT_CALL))) + .build(); + } + private static abstract class TestServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { TestServiceBaseDescriptorSupplier() {} diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index dcd6f4e4bd5..ba954957cfa 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -99,7 +99,7 @@ public final class TestDeprecatedServiceGrpc { * */ @java.lang.Deprecated - public static abstract class TestDeprecatedServiceImplBase implements io.grpc.BindableService { + public interface TestDeprecatedServiceAsync { /** * 
@@ -107,31 +107,36 @@ public final class TestDeprecatedServiceGrpc {
      *
*/ @java.lang.Deprecated - public void deprecatedMethod(io.grpc.testing.compiler.Test.SimpleRequest request, + default void deprecatedMethod(io.grpc.testing.compiler.Test.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeprecatedMethodMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service TestDeprecatedService + * 
+   * Test service that has been deprecated and should generate with Java's @Deprecated annotation
+   *
+ */ + @java.lang.Deprecated + public static abstract class TestDeprecatedServiceImplBase + implements io.grpc.BindableService, TestDeprecatedServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeprecatedMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_DEPRECATED_METHOD))) - .build(); + return TestDeprecatedServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestDeprecatedServiceStub + extends io.grpc.stub.AbstractAsyncStub { private TestDeprecatedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -157,12 +162,14 @@ public final class TestDeprecatedServiceGrpc { } /** + * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class TestDeprecatedServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private TestDeprecatedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -187,12 +194,14 @@ public final class TestDeprecatedServiceGrpc { } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    *
*/ @java.lang.Deprecated - public static final class TestDeprecatedServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class TestDeprecatedServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private TestDeprecatedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -224,10 +233,10 @@ public final class TestDeprecatedServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestDeprecatedServiceImplBase serviceImpl; + private final TestDeprecatedServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestDeprecatedServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestDeprecatedServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -256,6 +265,18 @@ public final class TestDeprecatedServiceGrpc { } } + public static final io.grpc.ServerServiceDefinition bindService(TestDeprecatedServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeprecatedMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_DEPRECATED_METHOD))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index cbb51fc4d3e..0c9d35c4859 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -408,164 +408,10 @@ public final class TestServiceGrpc { * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { - - /** - * 
-     * One request followed by one response.
-     * The server returns the client payload as-is.
-     *
- */ - @java.lang.Override - public void unaryCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - @java.lang.Override - public void streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by one response (streamed upload).
-     * The server returns the aggregated size of client payload as the result.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests with each request served by the server immediately.
-     * As one request could lead to multiple responses, this interface
-     * demonstrates the idea of full bidirectionality.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver fullBidiCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullBidiCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by a sequence of responses.
-     * The server buffers all the client requests and then serves them in order. A
-     * stream of responses are returned to the client when the server starts with
-     * first request.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver halfBidiCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfBidiCallMethod(), responseObserver); - } - - /** - * 
-     * An RPC method whose Java name collides with a keyword, and whose generated
-     * method should have a '_' appended.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver import_( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getImportMethod(), responseObserver); - } - - /** - * 
-     * A unary call that is Safe.
-     *
- */ - @java.lang.Override - public void safeCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSafeCallMethod(), responseObserver); - } - - /** - * 
-     * A unary call that is Idempotent.
-     *
- */ - @java.lang.Override - public void idempotentCall(io.grpc.testing.compiler.Test.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getIdempotentCallMethod(), responseObserver); - } + implements io.grpc.BindableService, TestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getStreamingOutputCallMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_STREAMING_OUTPUT_CALL))) - .addMethod( - getStreamingInputCallMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingInputCallRequest, - io.grpc.testing.compiler.Test.StreamingInputCallResponse>( - this, METHODID_STREAMING_INPUT_CALL))) - .addMethod( - getFullBidiCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_FULL_BIDI_CALL))) - .addMethod( - getHalfBidiCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingOutputCallRequest, - io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( - this, METHODID_HALF_BIDI_CALL))) - .addMethod( - getImportMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.StreamingInputCallRequest, - io.grpc.testing.compiler.Test.StreamingInputCallResponse>( - this, METHODID_IMPORT))) - .addMethod( - getSafeCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_SAFE_CALL))) - .addMethod( - getIdempotentCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.compiler.Test.SimpleRequest, - io.grpc.testing.compiler.Test.SimpleResponse>( - this, METHODID_IDEMPOTENT_CALL))) - .build(); + return TestServiceGrpc.bindService(this); } } @@ -576,7 +422,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -693,7 +539,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -756,7 +602,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -817,10 +663,10 @@ public final class TestServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceImplBase serviceImpl; + private final TestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -873,6 +719,67 @@ public final class TestServiceGrpc { } } + public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getStreamingOutputCallMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_STREAMING_OUTPUT_CALL))) + .addMethod( + getStreamingInputCallMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingInputCallRequest, + io.grpc.testing.compiler.Test.StreamingInputCallResponse>( + service, METHODID_STREAMING_INPUT_CALL))) + .addMethod( + getFullBidiCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_FULL_BIDI_CALL))) + .addMethod( + getHalfBidiCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingOutputCallRequest, + io.grpc.testing.compiler.Test.StreamingOutputCallResponse>( + service, METHODID_HALF_BIDI_CALL))) + .addMethod( + getImportMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.StreamingInputCallRequest, + io.grpc.testing.compiler.Test.StreamingInputCallResponse>( + service, METHODID_IMPORT))) + .addMethod( + getSafeCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_SAFE_CALL))) + .addMethod( + getIdempotentCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.compiler.Test.SimpleRequest, + io.grpc.testing.compiler.Test.SimpleResponse>( + service, METHODID_IDEMPOTENT_CALL))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 2ef89c97b3d..0d9c9014503 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -159,47 +159,10 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load * */ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { - - /** - * 
-     * Gets the backend distribution for RPCs sent by a test client.
-     *
- */ - @java.lang.Override - public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientStatsMethod(), responseObserver); - } - - /** - * 
-     * Gets the accumulated stats for RPCs sent by a test client.
-     *
- */ - @java.lang.Override - public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientAccumulatedStatsMethod(), responseObserver); - } + implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetClientStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( - this, METHODID_GET_CLIENT_STATS))) - .addMethod( - getGetClientAccumulatedStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( - this, METHODID_GET_CLIENT_ACCUMULATED_STATS))) - .build(); + return LoadBalancerStatsServiceGrpc.bindService(this); } } @@ -210,7 +173,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -252,7 +215,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -292,7 +255,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse * */ public static final class LoadBalancerStatsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -335,10 +298,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerStatsServiceImplBase serviceImpl; + private final LoadBalancerStatsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerStatsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -371,6 +334,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetClientStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( + service, METHODID_GET_CLIENT_STATS))) + .addMethod( + getGetClientAccumulatedStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( + service, METHODID_GET_CLIENT_ACCUMULATED_STATS))) + .build(); + } + private static abstract class LoadBalancerStatsServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { LoadBalancerStatsServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 80405944c38..b31fc0e4881 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -151,48 +151,10 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * Base class for the server implementation of the service MetricsService */ public static abstract class MetricsServiceImplBase - implements io.grpc.BindableService, MetricsServiceAsync { - - /** - * 
-     * Returns the values of all the gauges that are currently being maintained by
-     * the service
-     *
- */ - @java.lang.Override - public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAllGaugesMethod(), responseObserver); - } - - /** - * 
-     * Returns the value of one gauge
-     *
- */ - @java.lang.Override - public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetGaugeMethod(), responseObserver); - } + implements io.grpc.BindableService, MetricsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetAllGaugesMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.EmptyMessage, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_ALL_GAUGES))) - .addMethod( - getGetGaugeMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.GaugeRequest, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_GAUGE))) - .build(); + return MetricsServiceGrpc.bindService(this); } } @@ -200,7 +162,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ public static final class MetricsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -240,7 +202,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do synchronous rpc calls to service MetricsService */ public static final class MetricsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -279,7 +241,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ public static final class MetricsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -311,10 +273,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final MetricsServiceImplBase serviceImpl; + private final MetricsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(MetricsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -347,6 +309,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetAllGaugesMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.EmptyMessage, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_ALL_GAUGES))) + .addMethod( + getGetGaugeMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.GaugeRequest, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_GAUGE))) + .build(); + } + private static abstract class MetricsServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { MetricsServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 0ce38cdba87..fa9e04b6879 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -153,41 +153,10 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, ReconnectServiceAsync { - - /** - */ - @java.lang.Override - public void start(io.grpc.testing.integration.Messages.ReconnectParams request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStopMethod(), responseObserver); - } + implements io.grpc.BindableService, ReconnectServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStartMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ReconnectParams, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_START))) - .addMethod( - getStopMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.Messages.ReconnectInfo>( - this, METHODID_STOP))) - .build(); + return ReconnectServiceGrpc.bindService(this); } } @@ -198,7 +167,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -234,7 +203,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -268,7 +237,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i * */ public static final class ReconnectServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -305,10 +274,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReconnectServiceImplBase serviceImpl; + private final ReconnectServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ReconnectServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -341,6 +310,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStartMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ReconnectParams, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_START))) + .addMethod( + getStopMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.Messages.ReconnectInfo>( + service, METHODID_STOP))) + .build(); + } + private static abstract class ReconnectServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ReconnectServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index dd28af67e00..50bf8d7a380 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -418,165 +418,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { - - /** - * 
-     * One empty request followed by one empty response.
-     *
- */ - @java.lang.Override - public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); - } - - /** - * 
-     * One request followed by one response.
-     *
- */ - @java.lang.Override - public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); - } - - /** - * 
-     * One request followed by one response. Response has cache control
-     * headers set such that a caching HTTP proxy (such as GFE) can
-     * satisfy subsequent requests.
-     *
- */ - @java.lang.Override - public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); - } - - /** - * 
-     * One request followed by a sequence of responses (streamed download).
-     * The server returns the payload with client desired type and sizes.
-     *
- */ - @java.lang.Override - public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by one response (streamed upload).
-     * The server returns the aggregated size of client payload as the result.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamingInputCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests with each request served by the server immediately.
-     * As one request could lead to multiple responses, this interface
-     * demonstrates the idea of full duplexing.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver fullDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); - } - - /** - * 
-     * A sequence of requests followed by a sequence of responses.
-     * The server buffers all the client requests and then serves them in order. A
-     * stream of responses are returned to the client when the server starts with
-     * first request.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver halfDuplexCall( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); - } - - /** - * 
-     * The test server will not implement this method. It will be used
-     * to test the behavior when clients call unimplemented methods.
-     *
- */ - @java.lang.Override - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); - } + implements io.grpc.BindableService, TestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getEmptyCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_EMPTY_CALL))) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getCacheableUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_CACHEABLE_UNARY_CALL))) - .addMethod( - getStreamingOutputCallMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_STREAMING_OUTPUT_CALL))) - .addMethod( - getStreamingInputCallMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingInputCallRequest, - io.grpc.testing.integration.Messages.StreamingInputCallResponse>( - this, METHODID_STREAMING_INPUT_CALL))) - .addMethod( - getFullDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_FULL_DUPLEX_CALL))) - .addMethod( - getHalfDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_HALF_DUPLEX_CALL))) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return TestServiceGrpc.bindService(this); } } @@ -588,7 +433,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -707,7 +552,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -783,7 +628,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -857,10 +702,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceImplBase serviceImpl; + private final TestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -914,6 +759,67 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getEmptyCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_EMPTY_CALL))) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getCacheableUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_CACHEABLE_UNARY_CALL))) + .addMethod( + getStreamingOutputCallMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_STREAMING_OUTPUT_CALL))) + .addMethod( + getStreamingInputCallMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingInputCallRequest, + io.grpc.testing.integration.Messages.StreamingInputCallResponse>( + service, METHODID_STREAMING_INPUT_CALL))) + .addMethod( + getFullDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_FULL_DUPLEX_CALL))) + .addMethod( + getHalfDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_HALF_DUPLEX_CALL))) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static abstract class TestServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { TestServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 83ce09c3fc1..a105cf24941 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -121,29 +121,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, UnimplementedServiceAsync { - - /** - * 
-     * A call that no server should implement
-     *
- */ - @java.lang.Override - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); - } + implements io.grpc.BindableService, UnimplementedServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return UnimplementedServiceGrpc.bindService(this); } } @@ -155,7 +136,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -187,7 +168,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -218,7 +199,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class UnimplementedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -249,10 +230,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceImplBase serviceImpl; + private final UnimplementedServiceAsync serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceImplBase serviceImpl, int methodId) { + MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -281,6 +262,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static abstract class UnimplementedServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { UnimplementedServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index d7907c8bc5f..fa2dc253d91 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -118,29 +118,10 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque * */ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { - - /** - * 
-     * Update the tes client's configuration.
-     *
- */ - @java.lang.Override - public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getConfigureMethod(), responseObserver); - } + implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getConfigureMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ClientConfigureRequest, - io.grpc.testing.integration.Messages.ClientConfigureResponse>( - this, METHODID_CONFIGURE))) - .build(); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } @@ -151,7 +132,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +163,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -212,7 +193,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io * */ public static final class XdsUpdateClientConfigureServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -243,10 +224,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceImplBase serviceImpl; + private final XdsUpdateClientConfigureServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -275,6 +256,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getConfigureMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ClientConfigureRequest, + io.grpc.testing.integration.Messages.ClientConfigureResponse>( + service, METHODID_CONFIGURE))) + .build(); + } + private static abstract class XdsUpdateClientConfigureServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { XdsUpdateClientConfigureServiceBaseDescriptorSupplier() {} diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index ed0161f1e20..25a3c3c4f24 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -153,41 +153,10 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { - - /** - */ - @java.lang.Override - public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetServingMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetNotServingMethod(), responseObserver); - } + implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getSetServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_SERVING))) - .addMethod( - getSetNotServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_NOT_SERVING))) - .build(); + return XdsUpdateHealthServiceGrpc.bindService(this); } } @@ -198,7 +167,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -234,7 +203,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -268,7 +237,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi * */ public static final class XdsUpdateHealthServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -305,10 +274,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceImplBase serviceImpl; + private final XdsUpdateHealthServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -341,6 +310,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getSetServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_SERVING))) + .addMethod( + getSetNotServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_NOT_SERVING))) + .build(); + } + private static abstract class XdsUpdateHealthServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { XdsUpdateHealthServiceBaseDescriptorSupplier() {} diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index 4e0e9ac219d..195475ec936 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -144,41 +144,10 @@ default void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * Base class for the server implementation of the service EchoTestService */ public static abstract class EchoTestServiceImplBase - implements io.grpc.BindableService, EchoTestServiceAsync { - - /** - */ - @java.lang.Override - public void echo(io.istio.test.Echo.EchoRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEchoMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getForwardEchoMethod(), responseObserver); - } + implements io.grpc.BindableService, EchoTestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getEchoMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.istio.test.Echo.EchoRequest, - io.istio.test.Echo.EchoResponse>( - this, METHODID_ECHO))) - .addMethod( - getForwardEchoMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.istio.test.Echo.ForwardEchoRequest, - io.istio.test.Echo.ForwardEchoResponse>( - this, METHODID_FORWARD_ECHO))) - .build(); + return EchoTestServiceGrpc.bindService(this); } } @@ -186,7 +155,7 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * A stub to allow clients to do asynchronous rpc calls to service EchoTestService */ public static final class EchoTestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private EchoTestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,7 +188,7 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * A stub to allow clients to do synchronous rpc calls to service EchoTestService */ public static final class EchoTestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private EchoTestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -250,7 +219,7 @@ public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.For * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService */ public static final class EchoTestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private EchoTestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -287,10 +256,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final EchoTestServiceImplBase serviceImpl; + private final EchoTestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(EchoTestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(EchoTestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -323,6 +292,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(EchoTestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getEchoMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.istio.test.Echo.EchoRequest, + io.istio.test.Echo.EchoResponse>( + service, METHODID_ECHO))) + .addMethod( + getForwardEchoMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.istio.test.Echo.ForwardEchoRequest, + io.istio.test.Echo.ForwardEchoResponse>( + service, METHODID_FORWARD_ECHO))) + .build(); + } + private static abstract class EchoTestServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { EchoTestServiceBaseDescriptorSupplier() {} diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index 7442f1894b6..dfbddba4baa 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -368,138 +368,10 @@ default void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static abstract class ChannelzImplBase - implements io.grpc.BindableService, ChannelzAsync { - - /** - * 
-     * Gets all root channels (i.e. channels the application has directly
-     * created). This does not include subchannels nor non-top level channels.
-     *
- */ - @java.lang.Override - public void getTopChannels(io.grpc.channelz.v1.GetTopChannelsRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetTopChannelsMethod(), responseObserver); - } - - /** - * 
-     * Gets all servers that exist in the process.
-     *
- */ - @java.lang.Override - public void getServers(io.grpc.channelz.v1.GetServersRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServersMethod(), responseObserver); - } - - /** - * 
-     * Returns a single Server, or else a NOT_FOUND code.
-     *
- */ - @java.lang.Override - public void getServer(io.grpc.channelz.v1.GetServerRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerMethod(), responseObserver); - } - - /** - * 
-     * Gets all server sockets that exist in the process.
-     *
- */ - @java.lang.Override - public void getServerSockets(io.grpc.channelz.v1.GetServerSocketsRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetServerSocketsMethod(), responseObserver); - } - - /** - * 
-     * Returns a single Channel, or else a NOT_FOUND code.
-     *
- */ - @java.lang.Override - public void getChannel(io.grpc.channelz.v1.GetChannelRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetChannelMethod(), responseObserver); - } - - /** - * 
-     * Returns a single Subchannel, or else a NOT_FOUND code.
-     *
- */ - @java.lang.Override - public void getSubchannel(io.grpc.channelz.v1.GetSubchannelRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSubchannelMethod(), responseObserver); - } - - /** - * 
-     * Returns a single Socket or else a NOT_FOUND code.
-     *
- */ - @java.lang.Override - public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetSocketMethod(), responseObserver); - } + implements io.grpc.BindableService, ChannelzAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetTopChannelsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetTopChannelsRequest, - io.grpc.channelz.v1.GetTopChannelsResponse>( - this, METHODID_GET_TOP_CHANNELS))) - .addMethod( - getGetServersMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetServersRequest, - io.grpc.channelz.v1.GetServersResponse>( - this, METHODID_GET_SERVERS))) - .addMethod( - getGetServerMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetServerRequest, - io.grpc.channelz.v1.GetServerResponse>( - this, METHODID_GET_SERVER))) - .addMethod( - getGetServerSocketsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetServerSocketsRequest, - io.grpc.channelz.v1.GetServerSocketsResponse>( - this, METHODID_GET_SERVER_SOCKETS))) - .addMethod( - getGetChannelMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetChannelRequest, - io.grpc.channelz.v1.GetChannelResponse>( - this, METHODID_GET_CHANNEL))) - .addMethod( - getGetSubchannelMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetSubchannelRequest, - io.grpc.channelz.v1.GetSubchannelResponse>( - this, METHODID_GET_SUBCHANNEL))) - .addMethod( - getGetSocketMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.channelz.v1.GetSocketRequest, - io.grpc.channelz.v1.GetSocketResponse>( - this, METHODID_GET_SOCKET))) - .build(); + return ChannelzGrpc.bindService(this); } } @@ -511,7 +383,7 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static final class ChannelzStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ChannelzStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -610,7 +482,7 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static final class ChannelzBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ChannelzBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -702,7 +574,7 @@ public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSo * */ public static final class ChannelzFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ChannelzFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -806,10 +678,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ChannelzImplBase serviceImpl; + private final ChannelzAsync serviceImpl; private final int methodId; - MethodHandlers(ChannelzImplBase serviceImpl, int methodId) { + MethodHandlers(ChannelzAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -862,6 +734,60 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ChannelzAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetTopChannelsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetTopChannelsRequest, + io.grpc.channelz.v1.GetTopChannelsResponse>( + service, METHODID_GET_TOP_CHANNELS))) + .addMethod( + getGetServersMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetServersRequest, + io.grpc.channelz.v1.GetServersResponse>( + service, METHODID_GET_SERVERS))) + .addMethod( + getGetServerMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetServerRequest, + io.grpc.channelz.v1.GetServerResponse>( + service, METHODID_GET_SERVER))) + .addMethod( + getGetServerSocketsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetServerSocketsRequest, + io.grpc.channelz.v1.GetServerSocketsResponse>( + service, METHODID_GET_SERVER_SOCKETS))) + .addMethod( + getGetChannelMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetChannelRequest, + io.grpc.channelz.v1.GetChannelResponse>( + service, METHODID_GET_CHANNEL))) + .addMethod( + getGetSubchannelMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetSubchannelRequest, + io.grpc.channelz.v1.GetSubchannelResponse>( + service, METHODID_GET_SUBCHANNEL))) + .addMethod( + getGetSocketMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.channelz.v1.GetSocketRequest, + io.grpc.channelz.v1.GetSocketResponse>( + service, METHODID_GET_SOCKET))) + .build(); + } + private static abstract class ChannelzBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ChannelzBaseDescriptorSupplier() {} diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index e3e5eecc826..e6e298c8fbc 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -163,60 +163,10 @@ default void watch(io.grpc.health.v1.HealthCheckRequest request, * Base class for the server implementation of the service Health */ public static abstract class HealthImplBase - implements io.grpc.BindableService, HealthAsync { - - /** - * 
-     * If the requested service is unknown, the call will fail with status
-     * NOT_FOUND.
-     *
- */ - @java.lang.Override - public void check(io.grpc.health.v1.HealthCheckRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCheckMethod(), responseObserver); - } - - /** - * 
-     * Performs a watch for the serving status of the requested service.
-     * The server will immediately send back a message indicating the current
-     * serving status.  It will then subsequently send a new message whenever
-     * the service's serving status changes.
-     * If the requested service is unknown when the call is received, the
-     * server will send a message setting the serving status to
-     * SERVICE_UNKNOWN but will *not* terminate the call.  If at some
-     * future point, the serving status of the service becomes known, the
-     * server will send a new message with the service's serving status.
-     * If the call terminates with status UNIMPLEMENTED, then clients
-     * should assume this method is not supported and should not retry the
-     * call.  If the call terminates with any other status (including OK),
-     * clients should retry the call with appropriate exponential backoff.
-     *
- */ - @java.lang.Override - public void watch(io.grpc.health.v1.HealthCheckRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getWatchMethod(), responseObserver); - } + implements io.grpc.BindableService, HealthAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getCheckMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.health.v1.HealthCheckRequest, - io.grpc.health.v1.HealthCheckResponse>( - this, METHODID_CHECK))) - .addMethod( - getWatchMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.health.v1.HealthCheckRequest, - io.grpc.health.v1.HealthCheckResponse>( - this, METHODID_WATCH))) - .build(); + return HealthGrpc.bindService(this); } } @@ -224,7 +174,7 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, * A stub to allow clients to do asynchronous rpc calls to service Health */ public static final class HealthStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private HealthStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -276,7 +226,7 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, * A stub to allow clients to do synchronous rpc calls to service Health */ public static final class HealthBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private HealthBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -327,7 +277,7 @@ public java.util.Iterator watch( * A stub to allow clients to do ListenableFuture-style rpc calls to service Health */ public static final class HealthFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private HealthFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -360,10 +310,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final HealthImplBase serviceImpl; + private final HealthAsync serviceImpl; private final int methodId; - MethodHandlers(HealthImplBase serviceImpl, int methodId) { + MethodHandlers(HealthAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -396,6 +346,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(HealthAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getCheckMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.health.v1.HealthCheckRequest, + io.grpc.health.v1.HealthCheckResponse>( + service, METHODID_CHECK))) + .addMethod( + getWatchMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.health.v1.HealthCheckRequest, + io.grpc.health.v1.HealthCheckResponse>( + service, METHODID_WATCH))) + .build(); + } + private static abstract class HealthBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { HealthBaseDescriptorSupplier() {} diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index 91bcb868199..2e07d0c2c7b 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -110,30 +110,10 @@ default io.grpc.stub.StreamObserver - * The reflection service is structured as a bidirectional stream, ensuring - * all related requests go to a single server. - * - */ - @java.lang.Override - public io.grpc.stub.StreamObserver serverReflectionInfo( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getServerReflectionInfoMethod(), responseObserver); - } + implements io.grpc.BindableService, ServerReflectionAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getServerReflectionInfoMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.reflection.v1alpha.ServerReflectionRequest, - io.grpc.reflection.v1alpha.ServerReflectionResponse>( - this, METHODID_SERVER_REFLECTION_INFO))) - .build(); + return ServerReflectionGrpc.bindService(this); } } @@ -141,7 +121,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private ServerReflectionStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -170,7 +150,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private ServerReflectionBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -187,7 +167,7 @@ protected ServerReflectionBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection */ public static final class ServerReflectionFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ServerReflectionFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -207,10 +187,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ServerReflectionImplBase serviceImpl; + private final ServerReflectionAsync serviceImpl; private final int methodId; - MethodHandlers(ServerReflectionImplBase serviceImpl, int methodId) { + MethodHandlers(ServerReflectionAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -238,6 +218,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ServerReflectionAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getServerReflectionInfoMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.reflection.v1alpha.ServerReflectionRequest, + io.grpc.reflection.v1alpha.ServerReflectionResponse>( + service, METHODID_SERVER_REFLECTION_INFO))) + .build(); + } + private static abstract class ServerReflectionBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ServerReflectionBaseDescriptorSupplier() {} diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index 57a97b876af..a27d041f192 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -118,29 +118,10 @@ default void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static abstract class AnotherDynamicServiceImplBase - implements io.grpc.BindableService, AnotherDynamicServiceAsync { - - /** - * 
-     * A method
-     *
- */ - @java.lang.Override - public void method(io.grpc.reflection.testing.DynamicRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); - } + implements io.grpc.BindableService, AnotherDynamicServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.reflection.testing.DynamicRequest, - io.grpc.reflection.testing.DynamicReply>( - this, METHODID_METHOD))) - .build(); + return AnotherDynamicServiceGrpc.bindService(this); } } @@ -151,7 +132,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class AnotherDynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AnotherDynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +163,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class AnotherDynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AnotherDynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -212,7 +193,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * */ public static final class AnotherDynamicServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AnotherDynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -243,10 +224,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final AnotherDynamicServiceImplBase serviceImpl; + private final AnotherDynamicServiceAsync serviceImpl; private final int methodId; - MethodHandlers(AnotherDynamicServiceImplBase serviceImpl, int methodId) { + MethodHandlers(AnotherDynamicServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -275,6 +256,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(AnotherDynamicServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.reflection.testing.DynamicRequest, + io.grpc.reflection.testing.DynamicReply>( + service, METHODID_METHOD))) + .build(); + } + private static abstract class AnotherDynamicServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { AnotherDynamicServiceBaseDescriptorSupplier() {} diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index 13afaf959c9..9f28b13538a 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -106,26 +106,10 @@ default void method(io.grpc.reflection.testing.Request request, * Base class for the server implementation of the service AnotherReflectableService */ public static abstract class AnotherReflectableServiceImplBase - implements io.grpc.BindableService, AnotherReflectableServiceAsync { - - /** - */ - @java.lang.Override - public void method(io.grpc.reflection.testing.Request request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); - } + implements io.grpc.BindableService, AnotherReflectableServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.reflection.testing.Request, - io.grpc.reflection.testing.Reply>( - this, METHODID_METHOD))) - .build(); + return AnotherReflectableServiceGrpc.bindService(this); } } @@ -133,7 +117,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AnotherReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -158,7 +142,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AnotherReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +166,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AnotherReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -210,10 +194,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final AnotherReflectableServiceImplBase serviceImpl; + private final AnotherReflectableServiceAsync serviceImpl; private final int methodId; - MethodHandlers(AnotherReflectableServiceImplBase serviceImpl, int methodId) { + MethodHandlers(AnotherReflectableServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -242,6 +226,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(AnotherReflectableServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.reflection.testing.Request, + io.grpc.reflection.testing.Reply>( + service, METHODID_METHOD))) + .build(); + } + private static abstract class AnotherReflectableServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { AnotherReflectableServiceBaseDescriptorSupplier() {} diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index 0d8518adad5..d950e58b3a5 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -118,29 +118,10 @@ default void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static abstract class DynamicServiceImplBase - implements io.grpc.BindableService, DynamicServiceAsync { - - /** - * 
-     * A method
-     *
- */ - @java.lang.Override - public void method(io.grpc.reflection.testing.DynamicRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); - } + implements io.grpc.BindableService, DynamicServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.reflection.testing.DynamicRequest, - io.grpc.reflection.testing.DynamicReply>( - this, METHODID_METHOD))) - .build(); + return DynamicServiceGrpc.bindService(this); } } @@ -151,7 +132,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class DynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private DynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +163,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class DynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private DynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -212,7 +193,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * */ public static final class DynamicServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private DynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -243,10 +224,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final DynamicServiceImplBase serviceImpl; + private final DynamicServiceAsync serviceImpl; private final int methodId; - MethodHandlers(DynamicServiceImplBase serviceImpl, int methodId) { + MethodHandlers(DynamicServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -275,6 +256,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(DynamicServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.reflection.testing.DynamicRequest, + io.grpc.reflection.testing.DynamicReply>( + service, METHODID_METHOD))) + .build(); + } + private static abstract class DynamicServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { DynamicServiceBaseDescriptorSupplier() {} diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index ca090a0f0cc..c526b6955e7 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -106,26 +106,10 @@ default void method(io.grpc.reflection.testing.Request request, * Base class for the server implementation of the service ReflectableService */ public static abstract class ReflectableServiceImplBase - implements io.grpc.BindableService, ReflectableServiceAsync { - - /** - */ - @java.lang.Override - public void method(io.grpc.reflection.testing.Request request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getMethodMethod(), responseObserver); - } + implements io.grpc.BindableService, ReflectableServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getMethodMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.reflection.testing.Request, - io.grpc.reflection.testing.Reply>( - this, METHODID_METHOD))) - .build(); + return ReflectableServiceGrpc.bindService(this); } } @@ -133,7 +117,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do asynchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -158,7 +142,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do synchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +166,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService */ public static final class ReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -210,10 +194,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReflectableServiceImplBase serviceImpl; + private final ReflectableServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ReflectableServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ReflectableServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -242,6 +226,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ReflectableServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getMethodMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.reflection.testing.Request, + io.grpc.reflection.testing.Reply>( + service, METHODID_METHOD))) + .build(); + } + private static abstract class ReflectableServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ReflectableServiceBaseDescriptorSupplier() {} diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index ea38e006c88..dd8557b9c90 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -241,83 +241,10 @@ default io.grpc.stub.StreamObserver bidi * */ public static abstract class SimpleServiceImplBase - implements io.grpc.BindableService, SimpleServiceAsync { - - /** - * 
-     * Simple unary RPC.
-     *
- */ - @java.lang.Override - public void unaryRpc(io.grpc.testing.protobuf.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryRpcMethod(), responseObserver); - } - - /** - * 
-     * Simple client-to-server streaming RPC.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver clientStreamingRpc( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getClientStreamingRpcMethod(), responseObserver); - } - - /** - * 
-     * Simple server-to-client streaming RPC.
-     *
- */ - @java.lang.Override - public void serverStreamingRpc(io.grpc.testing.protobuf.SimpleRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getServerStreamingRpcMethod(), responseObserver); - } - - /** - * 
-     * Simple bidirectional streaming RPC.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver bidiStreamingRpc( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBidiStreamingRpcMethod(), responseObserver); - } + implements io.grpc.BindableService, SimpleServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnaryRpcMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.protobuf.SimpleRequest, - io.grpc.testing.protobuf.SimpleResponse>( - this, METHODID_UNARY_RPC))) - .addMethod( - getClientStreamingRpcMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.protobuf.SimpleRequest, - io.grpc.testing.protobuf.SimpleResponse>( - this, METHODID_CLIENT_STREAMING_RPC))) - .addMethod( - getServerStreamingRpcMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.protobuf.SimpleRequest, - io.grpc.testing.protobuf.SimpleResponse>( - this, METHODID_SERVER_STREAMING_RPC))) - .addMethod( - getBidiStreamingRpcMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.protobuf.SimpleRequest, - io.grpc.testing.protobuf.SimpleResponse>( - this, METHODID_BIDI_STREAMING_RPC))) - .build(); + return SimpleServiceGrpc.bindService(this); } } @@ -328,7 +255,7 @@ public io.grpc.stub.StreamObserver bidiS * */ public static final class SimpleServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private SimpleServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -392,7 +319,7 @@ public io.grpc.stub.StreamObserver bidiS * */ public static final class SimpleServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private SimpleServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -433,7 +360,7 @@ public java.util.Iterator serverStreami * */ public static final class SimpleServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private SimpleServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -467,10 +394,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final SimpleServiceImplBase serviceImpl; + private final SimpleServiceAsync serviceImpl; private final int methodId; - MethodHandlers(SimpleServiceImplBase serviceImpl, int methodId) { + MethodHandlers(SimpleServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -509,6 +436,39 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(SimpleServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnaryRpcMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.protobuf.SimpleRequest, + io.grpc.testing.protobuf.SimpleResponse>( + service, METHODID_UNARY_RPC))) + .addMethod( + getClientStreamingRpcMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.protobuf.SimpleRequest, + io.grpc.testing.protobuf.SimpleResponse>( + service, METHODID_CLIENT_STREAMING_RPC))) + .addMethod( + getServerStreamingRpcMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.protobuf.SimpleRequest, + io.grpc.testing.protobuf.SimpleResponse>( + service, METHODID_SERVER_STREAMING_RPC))) + .addMethod( + getBidiStreamingRpcMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.protobuf.SimpleRequest, + io.grpc.testing.protobuf.SimpleResponse>( + service, METHODID_BIDI_STREAMING_RPC))) + .build(); + } + private static abstract class SimpleServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { SimpleServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index ff72e1b17b2..7c241a4c031 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -136,26 +136,10 @@ default void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequ * */ public static abstract class OpenRcaServiceImplBase - implements io.grpc.BindableService, OpenRcaServiceAsync { - - /** - */ - @java.lang.Override - public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamCoreMetricsMethod(), responseObserver); - } + implements io.grpc.BindableService, OpenRcaServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamCoreMetricsMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - com.github.xds.service.orca.v3.OrcaLoadReportRequest, - com.github.xds.data.orca.v3.OrcaLoadReport>( - this, METHODID_STREAM_CORE_METRICS))) - .build(); + return OpenRcaServiceGrpc.bindService(this); } } @@ -173,7 +157,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque * */ public static final class OpenRcaServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private OpenRcaServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -208,7 +192,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque * */ public static final class OpenRcaServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private OpenRcaServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -243,7 +227,7 @@ public java.util.Iterator streamCore * */ public static final class OpenRcaServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private OpenRcaServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -263,10 +247,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final OpenRcaServiceImplBase serviceImpl; + private final OpenRcaServiceAsync serviceImpl; private final int methodId; - MethodHandlers(OpenRcaServiceImplBase serviceImpl, int methodId) { + MethodHandlers(OpenRcaServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -295,6 +279,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(OpenRcaServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamCoreMetricsMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + com.github.xds.service.orca.v3.OrcaLoadReportRequest, + com.github.xds.data.orca.v3.OrcaLoadReport>( + service, METHODID_STREAM_CORE_METRICS))) + .build(); + } + private static abstract class OpenRcaServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { OpenRcaServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index 15eb24f3319..9091e836a6c 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -191,56 +191,10 @@ default void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ClusterDiscoveryServiceImplBase - implements io.grpc.BindableService, ClusterDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamClusters( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClustersMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaClusters( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaClustersMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClustersMethod(), responseObserver); - } + implements io.grpc.BindableService, ClusterDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamClustersMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_CLUSTERS))) - .addMethod( - getDeltaClustersMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_CLUSTERS))) - .addMethod( - getFetchClustersMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_CLUSTERS))) - .build(); + return ClusterDiscoveryServiceGrpc.bindService(this); } } @@ -251,7 +205,7 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ClusterDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ClusterDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -295,7 +249,7 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ClusterDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ClusterDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -322,7 +276,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy. * */ public static final class ClusterDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ClusterDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -352,10 +306,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ClusterDiscoveryServiceImplBase serviceImpl; + private final ClusterDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ClusterDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ClusterDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -390,6 +344,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ClusterDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamClustersMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_CLUSTERS))) + .addMethod( + getDeltaClustersMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_CLUSTERS))) + .addMethod( + getFetchClustersMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_CLUSTERS))) + .build(); + } + private static abstract class ClusterDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ClusterDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index 35b10b145d4..f00355b7d42 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -186,60 +186,10 @@ default void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * Base class for the server implementation of the service EndpointDiscoveryService */ public static abstract class EndpointDiscoveryServiceImplBase - implements io.grpc.BindableService, EndpointDiscoveryServiceAsync { - - /** - * 
-     * The resource_names field in DiscoveryRequest specifies a list of clusters
-     * to subscribe to updates for.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamEndpoints( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamEndpointsMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaEndpoints( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaEndpointsMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchEndpointsMethod(), responseObserver); - } + implements io.grpc.BindableService, EndpointDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamEndpointsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_ENDPOINTS))) - .addMethod( - getDeltaEndpointsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_ENDPOINTS))) - .addMethod( - getFetchEndpointsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_ENDPOINTS))) - .build(); + return EndpointDiscoveryServiceGrpc.bindService(this); } } @@ -247,7 +197,7 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private EndpointDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -292,7 +242,7 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private EndpointDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -316,7 +266,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private EndpointDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -346,10 +296,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final EndpointDiscoveryServiceImplBase serviceImpl; + private final EndpointDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(EndpointDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(EndpointDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -384,6 +334,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(EndpointDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamEndpointsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_ENDPOINTS))) + .addMethod( + getDeltaEndpointsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_ENDPOINTS))) + .addMethod( + getFetchEndpointsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_ENDPOINTS))) + .build(); + } + private static abstract class EndpointDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { EndpointDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index a62a4b44043..ed01b9582af 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -200,56 +200,10 @@ default void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ListenerDiscoveryServiceImplBase - implements io.grpc.BindableService, ListenerDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaListeners( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaListenersMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamListeners( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamListenersMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchListenersMethod(), responseObserver); - } + implements io.grpc.BindableService, ListenerDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeltaListenersMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_LISTENERS))) - .addMethod( - getStreamListenersMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_LISTENERS))) - .addMethod( - getFetchListenersMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_LISTENERS))) - .build(); + return ListenerDiscoveryServiceGrpc.bindService(this); } } @@ -263,7 +217,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ListenerDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ListenerDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -310,7 +264,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ListenerDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ListenerDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -340,7 +294,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy * */ public static final class ListenerDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ListenerDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -370,10 +324,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ListenerDiscoveryServiceImplBase serviceImpl; + private final ListenerDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ListenerDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ListenerDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -408,6 +362,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ListenerDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeltaListenersMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_LISTENERS))) + .addMethod( + getStreamListenersMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_LISTENERS))) + .addMethod( + getFetchListenersMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_LISTENERS))) + .build(); + } + private static abstract class ListenerDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ListenerDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index 6227426b250..0f8e16fbecf 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -203,56 +203,10 @@ default void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class RouteDiscoveryServiceImplBase - implements io.grpc.BindableService, RouteDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamRoutes( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamRoutesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaRoutes( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaRoutesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchRoutesMethod(), responseObserver); - } + implements io.grpc.BindableService, RouteDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamRoutesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_ROUTES))) - .addMethod( - getDeltaRoutesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_ROUTES))) - .addMethod( - getFetchRoutesMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_ROUTES))) - .build(); + return RouteDiscoveryServiceGrpc.bindService(this); } } @@ -267,7 +221,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class RouteDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private RouteDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -315,7 +269,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class RouteDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private RouteDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -346,7 +300,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.en * */ public static final class RouteDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private RouteDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -376,10 +330,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final RouteDiscoveryServiceImplBase serviceImpl; + private final RouteDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(RouteDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(RouteDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -414,6 +368,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(RouteDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamRoutesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_ROUTES))) + .addMethod( + getDeltaRoutesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_ROUTES))) + .addMethod( + getFetchRoutesMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_ROUTES))) + .build(); + } + private static abstract class RouteDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { RouteDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index a3685a0587d..db51d16b227 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -209,56 +209,10 @@ default void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reque * */ public static abstract class ScopedRoutesDiscoveryServiceImplBase - implements io.grpc.BindableService, ScopedRoutesDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamScopedRoutes( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamScopedRoutesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaScopedRoutes( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaScopedRoutesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchScopedRoutesMethod(), responseObserver); - } + implements io.grpc.BindableService, ScopedRoutesDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamScopedRoutesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_SCOPED_ROUTES))) - .addMethod( - getDeltaScopedRoutesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_SCOPED_ROUTES))) - .addMethod( - getFetchScopedRoutesMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_SCOPED_ROUTES))) - .build(); + return ScopedRoutesDiscoveryServiceGrpc.bindService(this); } } @@ -275,7 +229,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques * */ public static final class ScopedRoutesDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ScopedRoutesDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -325,7 +279,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques * */ public static final class ScopedRoutesDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ScopedRoutesDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -358,7 +312,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoypr * */ public static final class ScopedRoutesDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ScopedRoutesDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -388,10 +342,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ScopedRoutesDiscoveryServiceImplBase serviceImpl; + private final ScopedRoutesDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ScopedRoutesDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ScopedRoutesDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -426,6 +380,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ScopedRoutesDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamScopedRoutesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_SCOPED_ROUTES))) + .addMethod( + getDeltaScopedRoutesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_SCOPED_ROUTES))) + .addMethod( + getFetchScopedRoutesMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_SCOPED_ROUTES))) + .build(); + } + private static abstract class ScopedRoutesDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ScopedRoutesDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index 33e0bd6cb29..0b1bb6dd256 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -142,26 +142,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class VirtualHostDiscoveryServiceImplBase - implements io.grpc.BindableService, VirtualHostDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaVirtualHosts( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaVirtualHostsMethod(), responseObserver); - } + implements io.grpc.BindableService, VirtualHostDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeltaVirtualHostsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_VIRTUAL_HOSTS))) - .build(); + return VirtualHostDiscoveryServiceGrpc.bindService(this); } } @@ -181,7 +165,7 @@ public io.grpc.stub.StreamObserver */ public static final class VirtualHostDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private VirtualHostDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -218,7 +202,7 @@ public io.grpc.stub.StreamObserver */ public static final class VirtualHostDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private VirtualHostDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -247,7 +231,7 @@ protected VirtualHostDiscoveryServiceBlockingStub build( * */ public static final class VirtualHostDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private VirtualHostDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -267,10 +251,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final VirtualHostDiscoveryServiceImplBase serviceImpl; + private final VirtualHostDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(VirtualHostDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(VirtualHostDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -298,6 +282,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(VirtualHostDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeltaVirtualHostsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_VIRTUAL_HOSTS))) + .build(); + } + private static abstract class VirtualHostDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { VirtualHostDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 015632d1464..cfda17cdc4e 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -171,44 +171,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class AggregatedDiscoveryServiceImplBase - implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { - - /** - * 
-     * This is a gRPC-only API.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamAggregatedResources( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaAggregatedResources( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); - } + implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamAggregatedResourcesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_AGGREGATED_RESOURCES))) - .addMethod( - getDeltaAggregatedResourcesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_AGGREGATED_RESOURCES))) - .build(); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } @@ -224,7 +190,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -268,7 +234,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -293,7 +259,7 @@ protected AggregatedDiscoveryServiceBlockingStub build( * */ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -314,10 +280,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final AggregatedDiscoveryServiceImplBase serviceImpl; + private final AggregatedDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(AggregatedDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(AggregatedDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -348,6 +314,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(AggregatedDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamAggregatedResourcesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_AGGREGATED_RESOURCES))) + .addMethod( + getDeltaAggregatedResourcesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_AGGREGATED_RESOURCES))) + .build(); + } + private static abstract class AggregatedDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { AggregatedDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index 0dfe8e9e6b2..29aa73a6dc8 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -182,56 +182,10 @@ default void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * Base class for the server implementation of the service SecretDiscoveryService */ public static abstract class SecretDiscoveryServiceImplBase - implements io.grpc.BindableService, SecretDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaSecrets( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaSecretsMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamSecrets( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamSecretsMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchSecretsMethod(), responseObserver); - } + implements io.grpc.BindableService, SecretDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeltaSecretsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, - io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( - this, METHODID_DELTA_SECRETS))) - .addMethod( - getStreamSecretsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_STREAM_SECRETS))) - .addMethod( - getFetchSecretsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.api.v2.DiscoveryRequest, - io.envoyproxy.envoy.api.v2.DiscoveryResponse>( - this, METHODID_FETCH_SECRETS))) - .build(); + return SecretDiscoveryServiceGrpc.bindService(this); } } @@ -239,7 +193,7 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private SecretDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -280,7 +234,7 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private SecretDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -304,7 +258,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.e * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private SecretDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -334,10 +288,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final SecretDiscoveryServiceImplBase serviceImpl; + private final SecretDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(SecretDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(SecretDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -372,6 +326,32 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(SecretDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeltaSecretsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest, + io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse>( + service, METHODID_DELTA_SECRETS))) + .addMethod( + getStreamSecretsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_STREAM_SECRETS))) + .addMethod( + getFetchSecretsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.api.v2.DiscoveryRequest, + io.envoyproxy.envoy.api.v2.DiscoveryResponse>( + service, METHODID_FETCH_SECRETS))) + .build(); + } + private static abstract class SecretDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { SecretDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index d047a1b85de..0116fc08be7 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -171,44 +171,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class AggregatedDiscoveryServiceImplBase - implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { - - /** - * 
-     * This is a gRPC-only API.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamAggregatedResources( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamAggregatedResourcesMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver deltaAggregatedResources( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeltaAggregatedResourcesMethod(), responseObserver); - } + implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamAggregatedResourcesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest, - io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse>( - this, METHODID_STREAM_AGGREGATED_RESOURCES))) - .addMethod( - getDeltaAggregatedResourcesMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest, - io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryResponse>( - this, METHODID_DELTA_AGGREGATED_RESOURCES))) - .build(); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } @@ -224,7 +190,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -268,7 +234,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -293,7 +259,7 @@ protected AggregatedDiscoveryServiceBlockingStub build( * */ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -314,10 +280,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final AggregatedDiscoveryServiceImplBase serviceImpl; + private final AggregatedDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(AggregatedDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(AggregatedDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -348,6 +314,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(AggregatedDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamAggregatedResourcesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest, + io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse>( + service, METHODID_STREAM_AGGREGATED_RESOURCES))) + .addMethod( + getDeltaAggregatedResourcesMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest, + io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryResponse>( + service, METHODID_DELTA_AGGREGATED_RESOURCES))) + .build(); + } + private static abstract class AggregatedDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { AggregatedDiscoveryServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index 6c3b87738de..ed944de21df 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -135,55 +135,10 @@ default io.grpc.stub.StreamObserver - * Advanced API to allow for multi-dimensional load balancing by remote - * server. For receiving LB assignments, the steps are: - * 1, The management server is configured with per cluster/zone/load metric - * capacity configuration. The capacity configuration definition is - * outside of the scope of this document. - * 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters - * to balance. - * Independently, Envoy will initiate a StreamLoadStats bidi stream with a - * management server: - * 1. Once a connection establishes, the management server publishes a - * LoadStatsResponse for all clusters it is interested in learning load - * stats about. - * 2. For each cluster, Envoy load balances incoming traffic to upstream hosts - * based on per-zone weights and/or per-instance weights (if specified) - * based on intra-zone LbPolicy. This information comes from the above - * {Stream,Fetch}Endpoints. - * 3. When upstream hosts reply, they optionally add header <define header - * name> with ASCII representation of EndpointLoadMetricStats. - * 4. Envoy aggregates load reports over the period of time given to it in - * LoadStatsResponse.load_reporting_interval. This includes aggregation - * stats Envoy maintains by itself (total_requests, rpc_errors etc.) as - * well as load metrics from upstream hosts. - * 5. When the timer of load_reporting_interval expires, Envoy sends new - * LoadStatsRequest filled with load reports for each cluster. - * 6. The management server uses the load reports from all reported Envoys - * from around the world, computes global assignment and prepares traffic - * assignment destined for each zone Envoys are located in. Goto 2. - * - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamLoadStats( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); - } + implements io.grpc.BindableService, LoadReportingServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamLoadStatsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.service.load_stats.v2.LoadStatsRequest, - io.envoyproxy.envoy.service.load_stats.v2.LoadStatsResponse>( - this, METHODID_STREAM_LOAD_STATS))) - .build(); + return LoadReportingServiceGrpc.bindService(this); } } @@ -191,7 +146,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -245,7 +200,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -262,7 +217,7 @@ protected LoadReportingServiceBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -282,10 +237,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadReportingServiceImplBase serviceImpl; + private final LoadReportingServiceAsync serviceImpl; private final int methodId; - MethodHandlers(LoadReportingServiceImplBase serviceImpl, int methodId) { + MethodHandlers(LoadReportingServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -313,6 +268,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadReportingServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamLoadStatsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.service.load_stats.v2.LoadStatsRequest, + io.envoyproxy.envoy.service.load_stats.v2.LoadStatsResponse>( + service, METHODID_STREAM_LOAD_STATS))) + .build(); + } + private static abstract class LoadReportingServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { LoadReportingServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index 33932d49ec8..3c7cf0284d9 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -135,55 +135,10 @@ default io.grpc.stub.StreamObserver - * Advanced API to allow for multi-dimensional load balancing by remote - * server. For receiving LB assignments, the steps are: - * 1, The management server is configured with per cluster/zone/load metric - * capacity configuration. The capacity configuration definition is - * outside of the scope of this document. - * 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters - * to balance. - * Independently, Envoy will initiate a StreamLoadStats bidi stream with a - * management server: - * 1. Once a connection establishes, the management server publishes a - * LoadStatsResponse for all clusters it is interested in learning load - * stats about. - * 2. For each cluster, Envoy load balances incoming traffic to upstream hosts - * based on per-zone weights and/or per-instance weights (if specified) - * based on intra-zone LbPolicy. This information comes from the above - * {Stream,Fetch}Endpoints. - * 3. When upstream hosts reply, they optionally add header <define header - * name> with ASCII representation of EndpointLoadMetricStats. - * 4. Envoy aggregates load reports over the period of time given to it in - * LoadStatsResponse.load_reporting_interval. This includes aggregation - * stats Envoy maintains by itself (total_requests, rpc_errors etc.) as - * well as load metrics from upstream hosts. - * 5. When the timer of load_reporting_interval expires, Envoy sends new - * LoadStatsRequest filled with load reports for each cluster. - * 6. The management server uses the load reports from all reported Envoys - * from around the world, computes global assignment and prepares traffic - * assignment destined for each zone Envoys are located in. Goto 2. - * - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamLoadStats( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamLoadStatsMethod(), responseObserver); - } + implements io.grpc.BindableService, LoadReportingServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamLoadStatsMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.service.load_stats.v3.LoadStatsRequest, - io.envoyproxy.envoy.service.load_stats.v3.LoadStatsResponse>( - this, METHODID_STREAM_LOAD_STATS))) - .build(); + return LoadReportingServiceGrpc.bindService(this); } } @@ -191,7 +146,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -245,7 +200,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -262,7 +217,7 @@ protected LoadReportingServiceBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -282,10 +237,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadReportingServiceImplBase serviceImpl; + private final LoadReportingServiceAsync serviceImpl; private final int methodId; - MethodHandlers(LoadReportingServiceImplBase serviceImpl, int methodId) { + MethodHandlers(LoadReportingServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -313,6 +268,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadReportingServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamLoadStatsMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.service.load_stats.v3.LoadStatsRequest, + io.envoyproxy.envoy.service.load_stats.v3.LoadStatsResponse>( + service, METHODID_STREAM_LOAD_STATS))) + .build(); + } + private static abstract class LoadReportingServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { LoadReportingServiceBaseDescriptorSupplier() {} diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index ccad24fdc03..bdf220f50c4 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -159,41 +159,10 @@ default void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatu * */ public static abstract class ClientStatusDiscoveryServiceImplBase - implements io.grpc.BindableService, ClientStatusDiscoveryServiceAsync { - - /** - */ - @java.lang.Override - public io.grpc.stub.StreamObserver streamClientStatus( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamClientStatusMethod(), responseObserver); - } - - /** - */ - @java.lang.Override - public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatusRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getFetchClientStatusMethod(), responseObserver); - } + implements io.grpc.BindableService, ClientStatusDiscoveryServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStreamClientStatusMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.envoyproxy.envoy.service.status.v3.ClientStatusRequest, - io.envoyproxy.envoy.service.status.v3.ClientStatusResponse>( - this, METHODID_STREAM_CLIENT_STATUS))) - .addMethod( - getFetchClientStatusMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.envoyproxy.envoy.service.status.v3.ClientStatusRequest, - io.envoyproxy.envoy.service.status.v3.ClientStatusResponse>( - this, METHODID_FETCH_CLIENT_STATUS))) - .build(); + return ClientStatusDiscoveryServiceGrpc.bindService(this); } } @@ -206,7 +175,7 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus * */ public static final class ClientStatusDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ClientStatusDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -244,7 +213,7 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus * */ public static final class ClientStatusDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ClientStatusDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -273,7 +242,7 @@ public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientSta * */ public static final class ClientStatusDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ClientStatusDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -302,10 +271,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ClientStatusDiscoveryServiceImplBase serviceImpl; + private final ClientStatusDiscoveryServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ClientStatusDiscoveryServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ClientStatusDiscoveryServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -337,6 +306,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ClientStatusDiscoveryServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStreamClientStatusMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.envoyproxy.envoy.service.status.v3.ClientStatusRequest, + io.envoyproxy.envoy.service.status.v3.ClientStatusResponse>( + service, METHODID_STREAM_CLIENT_STATUS))) + .addMethod( + getFetchClientStatusMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.envoyproxy.envoy.service.status.v3.ClientStatusRequest, + io.envoyproxy.envoy.service.status.v3.ClientStatusResponse>( + service, METHODID_FETCH_CLIENT_STATUS))) + .build(); + } + private static abstract class ClientStatusDiscoveryServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { ClientStatusDiscoveryServiceBaseDescriptorSupplier() {} From 440ab9be20f969b255165adb4f3103791ca476a1 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 16 Nov 2022 00:03:43 +0000 Subject: [PATCH 23/42] more generated service files --- .../alts/internal/HandshakerServiceGrpc.java | 50 +++++++------------ .../grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 45 +++++++---------- .../lookup/v1/RouteLookupServiceGrpc.java | 45 +++++++---------- 3 files changed, 57 insertions(+), 83 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index b15e3c5576f..5864fe52688 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -114,34 +114,10 @@ default io.grpc.stub.StreamObserver doHands * Base class for the server implementation of the service HandshakerService */ public static abstract class HandshakerServiceImplBase - implements io.grpc.BindableService, HandshakerServiceAsync { - - /** - * 
-     * Handshaker service accepts a stream of handshaker request, returning a
-     * stream of handshaker response. Client is expected to send exactly one
-     * message with either client_start or server_start followed by one or more
-     * messages with next. Each time client sends a request, the handshaker
-     * service expects to respond. Client does not have to wait for service's
-     * response before sending next request.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver doHandshake( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDoHandshakeMethod(), responseObserver); - } + implements io.grpc.BindableService, HandshakerServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDoHandshakeMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.alts.internal.HandshakerReq, - io.grpc.alts.internal.HandshakerResp>( - this, METHODID_DO_HANDSHAKE))) - .build(); + return HandshakerServiceGrpc.bindService(this); } } @@ -149,7 +125,7 @@ public io.grpc.stub.StreamObserver doHandsh * A stub to allow clients to do asynchronous rpc calls to service HandshakerService */ public static final class HandshakerServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private HandshakerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -182,7 +158,7 @@ public io.grpc.stub.StreamObserver doHandsh * A stub to allow clients to do synchronous rpc calls to service HandshakerService */ public static final class HandshakerServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private HandshakerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -199,7 +175,7 @@ protected HandshakerServiceBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService */ public static final class HandshakerServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private HandshakerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,10 +195,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final HandshakerServiceImplBase serviceImpl; + private final HandshakerServiceAsync serviceImpl; private final int methodId; - MethodHandlers(HandshakerServiceImplBase serviceImpl, int methodId) { + MethodHandlers(HandshakerServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -250,6 +226,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(HandshakerServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDoHandshakeMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.alts.internal.HandshakerReq, + io.grpc.alts.internal.HandshakerResp>( + service, METHODID_DO_HANDSHAKE))) + .build(); + } + private static abstract class HandshakerServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { HandshakerServiceBaseDescriptorSupplier() {} diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index 8d5543c4b7a..ebb1d44d2a9 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -109,29 +109,10 @@ default io.grpc.stub.StreamObserver balanceLoa * Base class for the server implementation of the service LoadBalancer */ public static abstract class LoadBalancerImplBase - implements io.grpc.BindableService, LoadBalancerAsync { - - /** - * 
-     * Bidirectional rpc to get a list of servers.
-     *
- */ - @java.lang.Override - public io.grpc.stub.StreamObserver balanceLoad( - io.grpc.stub.StreamObserver responseObserver) { - return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getBalanceLoadMethod(), responseObserver); - } + implements io.grpc.BindableService, LoadBalancerAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getBalanceLoadMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.lb.v1.LoadBalanceRequest, - io.grpc.lb.v1.LoadBalanceResponse>( - this, METHODID_BALANCE_LOAD))) - .build(); + return LoadBalancerGrpc.bindService(this); } } @@ -139,7 +120,7 @@ public io.grpc.stub.StreamObserver balanceLoad * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +148,7 @@ public io.grpc.stub.StreamObserver balanceLoad * A stub to allow clients to do synchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -184,7 +165,7 @@ protected LoadBalancerBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer */ public static final class LoadBalancerFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -204,10 +185,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerImplBase serviceImpl; + private final LoadBalancerAsync serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerImplBase serviceImpl, int methodId) { + MethodHandlers(LoadBalancerAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -235,6 +216,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getBalanceLoadMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.lb.v1.LoadBalanceRequest, + io.grpc.lb.v1.LoadBalanceResponse>( + service, METHODID_BALANCE_LOAD))) + .build(); + } + private static abstract class LoadBalancerBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { LoadBalancerBaseDescriptorSupplier() {} diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index 53f9d06e4cd..525b6ffe926 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -109,29 +109,10 @@ default void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, * Base class for the server implementation of the service RouteLookupService */ public static abstract class RouteLookupServiceImplBase - implements io.grpc.BindableService, RouteLookupServiceAsync { - - /** - * 
-     * Lookup returns a target for a single key.
-     *
- */ - @java.lang.Override - public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRouteLookupMethod(), responseObserver); - } + implements io.grpc.BindableService, RouteLookupServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getRouteLookupMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.lookup.v1.RouteLookupRequest, - io.grpc.lookup.v1.RouteLookupResponse>( - this, METHODID_ROUTE_LOOKUP))) - .build(); + return RouteLookupServiceGrpc.bindService(this); } } @@ -139,7 +120,7 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService */ public static final class RouteLookupServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private RouteLookupServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +148,7 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, * A stub to allow clients to do synchronous rpc calls to service RouteLookupService */ public static final class RouteLookupServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private RouteLookupServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -194,7 +175,7 @@ public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.Route * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService */ public static final class RouteLookupServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private RouteLookupServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -225,10 +206,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final RouteLookupServiceImplBase serviceImpl; + private final RouteLookupServiceAsync serviceImpl; private final int methodId; - MethodHandlers(RouteLookupServiceImplBase serviceImpl, int methodId) { + MethodHandlers(RouteLookupServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -257,6 +238,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(RouteLookupServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getRouteLookupMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.lookup.v1.RouteLookupRequest, + io.grpc.lookup.v1.RouteLookupResponse>( + service, METHODID_ROUTE_LOOKUP))) + .build(); + } + private static abstract class RouteLookupServiceBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { RouteLookupServiceBaseDescriptorSupplier() {} From ef2e411350f14474d17122513068683e6a0fc2e9 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 16 Nov 2022 01:06:03 +0000 Subject: [PATCH 24/42] android interop testing generated files --- .../LoadBalancerStatsServiceGrpc.java | 68 +++++--- .../integration/MetricsServiceGrpc.java | 65 ++++--- .../integration/ReconnectServiceGrpc.java | 68 +++++--- .../testing/integration/TestServiceGrpc.java | 165 ++++++++++-------- .../integration/UnimplementedServiceGrpc.java | 53 ++++-- .../XdsUpdateClientConfigureServiceGrpc.java | 52 ++++-- .../XdsUpdateHealthServiceGrpc.java | 68 +++++--- .../LoadBalancerStatsServiceGrpc.java | 68 +++++--- .../integration/MetricsServiceGrpc.java | 65 ++++--- .../integration/ReconnectServiceGrpc.java | 68 +++++--- .../testing/integration/TestServiceGrpc.java | 165 ++++++++++-------- .../integration/UnimplementedServiceGrpc.java | 53 ++++-- .../XdsUpdateClientConfigureServiceGrpc.java | 52 ++++-- .../XdsUpdateHealthServiceGrpc.java | 68 +++++--- 14 files changed, 678 insertions(+), 400 deletions(-) diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index cd2bf958508..4bc8cfbb373 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -127,14 +127,14 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ - public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService { + public interface LoadBalancerStatsServiceAsync { /** * 
      * Gets the backend distribution for RPCs sent by a test client.
      *
*/ - public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, + default void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientStatsMethod(), responseObserver); } @@ -144,37 +144,34 @@ public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStat * Gets the accumulated stats for RPCs sent by a test client. * */ - public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, + default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientAccumulatedStatsMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service LoadBalancerStatsService + * 
+   * A service used to obtain stats for verifying LB behavior.
+   *
+ */ + public static abstract class LoadBalancerStatsServiceImplBase + implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetClientStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( - this, METHODID_GET_CLIENT_STATS))) - .addMethod( - getGetClientAccumulatedStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( - this, METHODID_GET_CLIENT_ACCUMULATED_STATS))) - .build(); + return LoadBalancerStatsServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class LoadBalancerStatsServiceStub + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -210,11 +207,13 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB } /** + * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class LoadBalancerStatsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -248,11 +247,13 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class LoadBalancerStatsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -295,10 +296,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerStatsServiceImplBase serviceImpl; + private final LoadBalancerStatsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerStatsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -331,6 +332,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetClientStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( + service, METHODID_GET_CLIENT_STATS))) + .addMethod( + getGetClientAccumulatedStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( + service, METHODID_GET_CLIENT_ACCUMULATED_STATS))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index e3e9bc1dc35..4411409abf7 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,7 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ - public static abstract class MetricsServiceImplBase implements io.grpc.BindableService { + public interface MetricsServiceAsync { /** * 
@@ -129,7 +129,7 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableS
      * the service
      *
*/ - public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, + default void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAllGaugesMethod(), responseObserver); } @@ -139,34 +139,28 @@ public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage reques * Returns the value of one gauge * */ - public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, + default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetGaugeMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service MetricsService + */ + public static abstract class MetricsServiceImplBase + implements io.grpc.BindableService, MetricsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetAllGaugesMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.EmptyMessage, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_ALL_GAUGES))) - .addMethod( - getGetGaugeMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.GaugeRequest, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_GAUGE))) - .build(); + return MetricsServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ - public static final class MetricsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class MetricsServiceStub + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -203,8 +197,10 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } /** + * A stub to allow clients to do synchronous rpc calls to service MetricsService */ - public static final class MetricsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class MetricsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -240,8 +236,10 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ - public static final class MetricsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class MetricsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -273,10 +271,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final MetricsServiceImplBase serviceImpl; + private final MetricsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(MetricsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -309,6 +307,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetAllGaugesMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.EmptyMessage, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_ALL_GAUGES))) + .addMethod( + getGetGaugeMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.GaugeRequest, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_GAUGE))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 476e9cc03a1..16ee20baa91 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -127,48 +127,45 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ - public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService { + public interface ReconnectServiceAsync { /** */ - public void start(io.grpc.testing.integration.Messages.ReconnectParams request, + default void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); } /** */ - public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, + default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStopMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service ReconnectService + * 
+   * A service used to control reconnect server.
+   *
+ */ + public static abstract class ReconnectServiceImplBase + implements io.grpc.BindableService, ReconnectServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStartMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ReconnectParams, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_START))) - .addMethod( - getStopMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.Messages.ReconnectInfo>( - this, METHODID_STOP))) - .build(); + return ReconnectServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ReconnectServiceStub + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,11 +195,13 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do synchronous rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class ReconnectServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -230,11 +229,13 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class ReconnectServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReconnectServiceImplBase serviceImpl; + private final ReconnectServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ReconnectServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -307,6 +308,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStartMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ReconnectParams, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_START))) + .addMethod( + getStopMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.Messages.ReconnectInfo>( + service, METHODID_STOP))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 3569dbc5292..ff4fb5d3631 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,14 +309,14 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ - public static abstract class TestServiceImplBase implements io.grpc.BindableService { + public interface TestServiceAsync { /** * 
      * One empty request followed by one empty response.
      *
*/ - public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -326,7 +326,7 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ - public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + default void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -338,7 +338,7 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + default void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -349,7 +349,7 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, + default void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -360,7 +360,7 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - public io.grpc.stub.StreamObserver streamingInputCall( + default io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } @@ -372,7 +372,7 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver fullDuplexCall( + default io.grpc.stub.StreamObserver fullDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } @@ -385,7 +385,7 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver halfDuplexCall( + default io.grpc.stub.StreamObserver halfDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } @@ -396,80 +396,36 @@ public io.grpc.stub.StreamObserver */ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service TestService + * 
+   * A simple service to test the various types of RPCs and experiment with
+   * performance with various types of payload.
+   *
+ */ + public static abstract class TestServiceImplBase + implements io.grpc.BindableService, TestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getEmptyCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_EMPTY_CALL))) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getCacheableUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_CACHEABLE_UNARY_CALL))) - .addMethod( - getStreamingOutputCallMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_STREAMING_OUTPUT_CALL))) - .addMethod( - getStreamingInputCallMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingInputCallRequest, - io.grpc.testing.integration.Messages.StreamingInputCallResponse>( - this, METHODID_STREAMING_INPUT_CALL))) - .addMethod( - getFullDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_FULL_DUPLEX_CALL))) - .addMethod( - getHalfDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_HALF_DUPLEX_CALL))) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return TestServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestServiceStub + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -581,12 +537,14 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } /** + * A stub to allow clients to do synchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class TestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -655,12 +613,14 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class TestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -734,10 +694,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceImplBase serviceImpl; + private final TestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -791,6 +751,67 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getEmptyCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_EMPTY_CALL))) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getCacheableUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_CACHEABLE_UNARY_CALL))) + .addMethod( + getStreamingOutputCallMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_STREAMING_OUTPUT_CALL))) + .addMethod( + getStreamingInputCallMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingInputCallRequest, + io.grpc.testing.integration.Messages.StreamingInputCallResponse>( + service, METHODID_STREAMING_INPUT_CALL))) + .addMethod( + getFullDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_FULL_DUPLEX_CALL))) + .addMethod( + getHalfDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_HALF_DUPLEX_CALL))) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 77a8cd64ba8..e12d45bc7fd 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,38 +99,43 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ - public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService { + public interface UnimplementedServiceAsync { /** * 
      * A call that no server should implement
      *
*/ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service UnimplementedService + * 
+   * A simple service NOT implemented at servers so clients can test for
+   * that case.
+   *
+ */ + public static abstract class UnimplementedServiceImplBase + implements io.grpc.BindableService, UnimplementedServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return UnimplementedServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class UnimplementedServiceStub + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -155,12 +160,14 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } /** + * A stub to allow clients to do synchronous rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class UnimplementedServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -184,12 +191,14 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class UnimplementedServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -220,10 +229,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceImplBase serviceImpl; + private final UnimplementedServiceAsync serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceImplBase serviceImpl, int methodId) { + MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -252,6 +261,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index ea7b6e1064e..9ee0a50884d 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,37 +97,41 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateClientConfigureServiceAsync { /** * 
      * Update the tes client's configuration.
      *
*/ - public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, + default void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getConfigureMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service XdsUpdateClientConfigureService + * 
+   * A service to dynamically update the configuration of an xDS test client.
+   *
+ */ + public static abstract class XdsUpdateClientConfigureServiceImplBase + implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getConfigureMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ClientConfigureRequest, - io.grpc.testing.integration.Messages.ClientConfigureResponse>( - this, METHODID_CONFIGURE))) - .build(); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateClientConfigureServiceStub + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -152,11 +156,13 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques } /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class XdsUpdateClientConfigureServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -180,11 +186,13 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class XdsUpdateClientConfigureServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -215,10 +223,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceImplBase serviceImpl; + private final XdsUpdateClientConfigureServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -247,6 +255,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getConfigureMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ClientConfigureRequest, + io.grpc.testing.integration.Messages.ClientConfigureResponse>( + service, METHODID_CONFIGURE))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 55458ce2a42..20eca5646ea 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,48 +127,45 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateHealthServiceAsync { /** */ - public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, + default void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetServingMethod(), responseObserver); } /** */ - public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, + default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetNotServingMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service XdsUpdateHealthService + * 
+   * A service to remotely control health status of an xDS test server.
+   *
+ */ + public static abstract class XdsUpdateHealthServiceImplBase + implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getSetServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_SERVING))) - .addMethod( - getSetNotServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_NOT_SERVING))) - .build(); + return XdsUpdateHealthServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateHealthServiceStub + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,11 +195,13 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class XdsUpdateHealthServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -230,11 +229,13 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class XdsUpdateHealthServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceImplBase serviceImpl; + private final XdsUpdateHealthServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -307,6 +308,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getSetServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_SERVING))) + .addMethod( + getSetNotServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_NOT_SERVING))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index cd2bf958508..4bc8cfbb373 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -127,14 +127,14 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ - public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService { + public interface LoadBalancerStatsServiceAsync { /** * 
      * Gets the backend distribution for RPCs sent by a test client.
      *
*/ - public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, + default void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientStatsMethod(), responseObserver); } @@ -144,37 +144,34 @@ public void getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStat * Gets the accumulated stats for RPCs sent by a test client. * */ - public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, + default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetClientAccumulatedStatsMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service LoadBalancerStatsService + * 
+   * A service used to obtain stats for verifying LB behavior.
+   *
+ */ + public static abstract class LoadBalancerStatsServiceImplBase + implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetClientStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( - this, METHODID_GET_CLIENT_STATS))) - .addMethod( - getGetClientAccumulatedStatsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, - io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( - this, METHODID_GET_CLIENT_ACCUMULATED_STATS))) - .build(); + return LoadBalancerStatsServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class LoadBalancerStatsServiceStub + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -210,11 +207,13 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB } /** + * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class LoadBalancerStatsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -248,11 +247,13 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService * 
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public static final class LoadBalancerStatsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class LoadBalancerStatsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -295,10 +296,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerStatsServiceImplBase serviceImpl; + private final LoadBalancerStatsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerStatsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -331,6 +332,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetClientStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerStatsResponse>( + service, METHODID_GET_CLIENT_STATS))) + .addMethod( + getGetClientAccumulatedStatsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest, + io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse>( + service, METHODID_GET_CLIENT_ACCUMULATED_STATS))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index e3e9bc1dc35..4411409abf7 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,7 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ - public static abstract class MetricsServiceImplBase implements io.grpc.BindableService { + public interface MetricsServiceAsync { /** * 
@@ -129,7 +129,7 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableS
      * the service
      *
*/ - public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, + default void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAllGaugesMethod(), responseObserver); } @@ -139,34 +139,28 @@ public void getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage reques * Returns the value of one gauge * */ - public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, + default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetGaugeMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service MetricsService + */ + public static abstract class MetricsServiceImplBase + implements io.grpc.BindableService, MetricsServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getGetAllGaugesMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.EmptyMessage, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_ALL_GAUGES))) - .addMethod( - getGetGaugeMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Metrics.GaugeRequest, - io.grpc.testing.integration.Metrics.GaugeResponse>( - this, METHODID_GET_GAUGE))) - .build(); + return MetricsServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ - public static final class MetricsServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class MetricsServiceStub + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -203,8 +197,10 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } /** + * A stub to allow clients to do synchronous rpc calls to service MetricsService */ - public static final class MetricsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class MetricsServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -240,8 +236,10 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ - public static final class MetricsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class MetricsServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -273,10 +271,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final MetricsServiceImplBase serviceImpl; + private final MetricsServiceAsync serviceImpl; private final int methodId; - MethodHandlers(MetricsServiceImplBase serviceImpl, int methodId) { + MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -309,6 +307,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetAllGaugesMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.EmptyMessage, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_ALL_GAUGES))) + .addMethod( + getGetGaugeMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Metrics.GaugeRequest, + io.grpc.testing.integration.Metrics.GaugeResponse>( + service, METHODID_GET_GAUGE))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 476e9cc03a1..16ee20baa91 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -127,48 +127,45 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ - public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService { + public interface ReconnectServiceAsync { /** */ - public void start(io.grpc.testing.integration.Messages.ReconnectParams request, + default void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); } /** */ - public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, + default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStopMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service ReconnectService + * 
+   * A service used to control reconnect server.
+   *
+ */ + public static abstract class ReconnectServiceImplBase + implements io.grpc.BindableService, ReconnectServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getStartMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ReconnectParams, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_START))) - .addMethod( - getStopMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.Messages.ReconnectInfo>( - this, METHODID_STOP))) - .build(); + return ReconnectServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class ReconnectServiceStub + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,11 +195,13 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do synchronous rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class ReconnectServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -230,11 +229,13 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService * 
    * A service used to control reconnect server.
    *
*/ - public static final class ReconnectServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class ReconnectServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReconnectServiceImplBase serviceImpl; + private final ReconnectServiceAsync serviceImpl; private final int methodId; - MethodHandlers(ReconnectServiceImplBase serviceImpl, int methodId) { + MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -307,6 +308,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getStartMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ReconnectParams, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_START))) + .addMethod( + getStopMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.Messages.ReconnectInfo>( + service, METHODID_STOP))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 3569dbc5292..ff4fb5d3631 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,14 +309,14 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ - public static abstract class TestServiceImplBase implements io.grpc.BindableService { + public interface TestServiceAsync { /** * 
      * One empty request followed by one empty response.
      *
*/ - public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEmptyCallMethod(), responseObserver); } @@ -326,7 +326,7 @@ public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request, * One request followed by one response. * */ - public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + default void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnaryCallMethod(), responseObserver); } @@ -338,7 +338,7 @@ public void unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request * satisfy subsequent requests. * */ - public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, + default void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCacheableUnaryCallMethod(), responseObserver); } @@ -349,7 +349,7 @@ public void cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleReques * The server returns the payload with client desired type and sizes. * */ - public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, + default void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStreamingOutputCallMethod(), responseObserver); } @@ -360,7 +360,7 @@ public void streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOu * The server returns the aggregated size of client payload as the result. * */ - public io.grpc.stub.StreamObserver streamingInputCall( + default io.grpc.stub.StreamObserver streamingInputCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getStreamingInputCallMethod(), responseObserver); } @@ -372,7 +372,7 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver fullDuplexCall( + default io.grpc.stub.StreamObserver fullDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getFullDuplexCallMethod(), responseObserver); } @@ -385,7 +385,7 @@ public io.grpc.stub.StreamObserver */ - public io.grpc.stub.StreamObserver halfDuplexCall( + default io.grpc.stub.StreamObserver halfDuplexCall( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getHalfDuplexCallMethod(), responseObserver); } @@ -396,80 +396,36 @@ public io.grpc.stub.StreamObserver */ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service TestService + * 
+   * A simple service to test the various types of RPCs and experiment with
+   * performance with various types of payload.
+   *
+ */ + public static abstract class TestServiceImplBase + implements io.grpc.BindableService, TestServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getEmptyCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_EMPTY_CALL))) - .addMethod( - getUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_UNARY_CALL))) - .addMethod( - getCacheableUnaryCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.SimpleRequest, - io.grpc.testing.integration.Messages.SimpleResponse>( - this, METHODID_CACHEABLE_UNARY_CALL))) - .addMethod( - getStreamingOutputCallMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_STREAMING_OUTPUT_CALL))) - .addMethod( - getStreamingInputCallMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingInputCallRequest, - io.grpc.testing.integration.Messages.StreamingInputCallResponse>( - this, METHODID_STREAMING_INPUT_CALL))) - .addMethod( - getFullDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_FULL_DUPLEX_CALL))) - .addMethod( - getHalfDuplexCallMethod(), - io.grpc.stub.ServerCalls.asyncBidiStreamingCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.StreamingOutputCallRequest, - io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( - this, METHODID_HALF_DUPLEX_CALL))) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return TestServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class TestServiceStub + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -581,12 +537,14 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } /** + * A stub to allow clients to do synchronous rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class TestServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -655,12 +613,14 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
    *
*/ - public static final class TestServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class TestServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -734,10 +694,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceImplBase serviceImpl; + private final TestServiceAsync serviceImpl; private final int methodId; - MethodHandlers(TestServiceImplBase serviceImpl, int methodId) { + MethodHandlers(TestServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -791,6 +751,67 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getEmptyCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_EMPTY_CALL))) + .addMethod( + getUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_UNARY_CALL))) + .addMethod( + getCacheableUnaryCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.SimpleRequest, + io.grpc.testing.integration.Messages.SimpleResponse>( + service, METHODID_CACHEABLE_UNARY_CALL))) + .addMethod( + getStreamingOutputCallMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_STREAMING_OUTPUT_CALL))) + .addMethod( + getStreamingInputCallMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingInputCallRequest, + io.grpc.testing.integration.Messages.StreamingInputCallResponse>( + service, METHODID_STREAMING_INPUT_CALL))) + .addMethod( + getFullDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_FULL_DUPLEX_CALL))) + .addMethod( + getHalfDuplexCallMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.StreamingOutputCallRequest, + io.grpc.testing.integration.Messages.StreamingOutputCallResponse>( + service, METHODID_HALF_DUPLEX_CALL))) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 77a8cd64ba8..e12d45bc7fd 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,38 +99,43 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ - public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService { + public interface UnimplementedServiceAsync { /** * 
      * A call that no server should implement
      *
*/ - public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, + default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUnimplementedCallMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service UnimplementedService + * 
+   * A simple service NOT implemented at servers so clients can test for
+   * that case.
+   *
+ */ + public static abstract class UnimplementedServiceImplBase + implements io.grpc.BindableService, UnimplementedServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getUnimplementedCallMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_UNIMPLEMENTED_CALL))) - .build(); + return UnimplementedServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class UnimplementedServiceStub + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -155,12 +160,14 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ } /** + * A stub to allow clients to do synchronous rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class UnimplementedServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -184,12 +191,14 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
    *
*/ - public static final class UnimplementedServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class UnimplementedServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -220,10 +229,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceImplBase serviceImpl; + private final UnimplementedServiceAsync serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceImplBase serviceImpl, int methodId) { + MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -252,6 +261,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getUnimplementedCallMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_UNIMPLEMENTED_CALL))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index ea7b6e1064e..9ee0a50884d 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,37 +97,41 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateClientConfigureServiceAsync { /** * 
      * Update the tes client's configuration.
      *
*/ - public void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, + default void configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getConfigureMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service XdsUpdateClientConfigureService + * 
+   * A service to dynamically update the configuration of an xDS test client.
+   *
+ */ + public static abstract class XdsUpdateClientConfigureServiceImplBase + implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getConfigureMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.Messages.ClientConfigureRequest, - io.grpc.testing.integration.Messages.ClientConfigureResponse>( - this, METHODID_CONFIGURE))) - .build(); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateClientConfigureServiceStub + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -152,11 +156,13 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques } /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class XdsUpdateClientConfigureServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -180,11 +186,13 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService * 
    * A service to dynamically update the configuration of an xDS test client.
    *
*/ - public static final class XdsUpdateClientConfigureServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class XdsUpdateClientConfigureServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -215,10 +223,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceImplBase serviceImpl; + private final XdsUpdateClientConfigureServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -247,6 +255,18 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getConfigureMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.Messages.ClientConfigureRequest, + io.grpc.testing.integration.Messages.ClientConfigureResponse>( + service, METHODID_CONFIGURE))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 55458ce2a42..20eca5646ea 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,48 +127,45 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService { + public interface XdsUpdateHealthServiceAsync { /** */ - public void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, + default void setServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetServingMethod(), responseObserver); } /** */ - public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, + default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetNotServingMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service XdsUpdateHealthService + * 
+   * A service to remotely control health status of an xDS test server.
+   *
+ */ + public static abstract class XdsUpdateHealthServiceImplBase + implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getSetServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_SERVING))) - .addMethod( - getSetNotServingMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, - io.grpc.testing.integration.EmptyProtos.Empty>( - this, METHODID_SET_NOT_SERVING))) - .build(); + return XdsUpdateHealthServiceGrpc.bindService(this); } } /** + * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceStub extends io.grpc.stub.AbstractAsyncStub { + public static final class XdsUpdateHealthServiceStub + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,11 +195,13 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, } /** + * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { + public static final class XdsUpdateHealthServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -230,11 +229,13 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi } /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService * 
    * A service to remotely control health status of an xDS test server.
    *
*/ - public static final class XdsUpdateHealthServiceFutureStub extends io.grpc.stub.AbstractFutureStub { + public static final class XdsUpdateHealthServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -271,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceImplBase serviceImpl; + private final XdsUpdateHealthServiceAsync serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceImplBase serviceImpl, int methodId) { + MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -307,6 +308,25 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getSetServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_SERVING))) + .addMethod( + getSetNotServingMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.EmptyProtos.Empty>( + service, METHODID_SET_NOT_SERVING))) + .build(); + } + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; public static io.grpc.ServiceDescriptor getServiceDescriptor() { From 0f489a6e2cdd61bad0233fbec72fbcdc3f7739a7 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Thu, 17 Nov 2022 16:00:02 -0800 Subject: [PATCH 25/42] Update interface name from Async to AsyncService --- compiler/src/java_plugin/cpp/java_generator.cpp | 17 ++++++----------- compiler/src/test/golden/TestService.java.txt | 10 +++++----- .../src/testLite/golden/TestService.java.txt | 10 +++++----- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index efb4a247294..ab1a04a3b6f 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -563,7 +563,6 @@ static void PrintStub( (*vars)["service_name"] = service_name; std::string stub_name = service_name; std::string stub_base_class_name = "AbstractStub"; - std::string interface_name = service_name; CallType call_type; bool impl_base = false; bool interface = false; @@ -572,31 +571,27 @@ static void PrintStub( call_type = ASYNC_CALL; interface = true; impl_base = true; - stub_name += "Async"; + stub_name = (*vars)["interface_name"]; break; case ABSTRACT_CLASS: call_type = ASYNC_CALL; impl_base = true; - interface_name += "Async"; (*vars)["abstract_name"] = service_name + "ImplBase"; break; case ASYNC_CLIENT_IMPL: call_type = ASYNC_CALL; stub_name += "Stub"; stub_base_class_name = "AbstractAsyncStub"; - interface_name += "Async"; break; case BLOCKING_CLIENT_IMPL: call_type = BLOCKING_CALL; stub_name += "BlockingStub"; stub_base_class_name = "AbstractBlockingStub"; - interface_name += "Blocking"; break; case FUTURE_CLIENT_IMPL: call_type = FUTURE_CALL; stub_name += "FutureStub"; stub_base_class_name = "AbstractFutureStub"; - interface_name += "Future"; break; case BLOCKING_CLIENT_INTERFACE: case FUTURE_CLIENT_INTERFACE: @@ -607,7 +602,6 @@ static void PrintStub( } (*vars)["stub_name"] = stub_name; (*vars)["stub_base_class_name"] = (*vars)[stub_base_class_name]; - (*vars)["interface_name"] = interface_name; // Class head GrpcWriteServiceDocComment(p, service, type); @@ -858,7 +852,6 @@ static void PrintMethodHandlerClass(const ServiceDescriptor* service, "private static final int $method_id_name$ = $method_id$;\n"); } p->Print("\n"); - (*vars)["service_name"] = service->name() + "Async"; p->Print( *vars, "private static final class MethodHandlers implements\n" @@ -866,10 +859,10 @@ static void PrintMethodHandlerClass(const ServiceDescriptor* service, " io.grpc.stub.ServerCalls.ServerStreamingMethod,\n" " io.grpc.stub.ServerCalls.ClientStreamingMethod,\n" " io.grpc.stub.ServerCalls.BidiStreamingMethod {\n" - " private final $service_name$ serviceImpl;\n" + " private final $interface_name$ serviceImpl;\n" " private final int methodId;\n" "\n" - " MethodHandlers($service_name$ serviceImpl, int methodId) {\n" + " MethodHandlers($interface_name$ serviceImpl, int methodId) {\n" " this.serviceImpl = serviceImpl;\n" " this.methodId = methodId;\n" " }\n\n"); @@ -1052,7 +1045,7 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service, (*vars)["service_name"] = service->name(); p->Print(*vars, "public static final io.grpc.ServerServiceDefinition " - "bindService($service_name$Async service) {\n"); + "bindService($interface_name$ service) {\n"); p->Indent(); p->Print(*vars, @@ -1247,6 +1240,8 @@ void GenerateService(const ServiceDescriptor* service, vars["ListenableFuture"] = "com.google.common.util.concurrent.ListenableFuture"; + vars["interface_name"] = "AsyncService"; + Printer printer(out, '$'); std::string package_name = ServiceJavaPackage(service->file()); if (!package_name.empty()) { diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 39628a5b7ff..cc481128f19 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -317,7 +317,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public interface TestServiceAsync { + public interface AsyncService { /** * 
@@ -416,7 +416,7 @@ public final class TestServiceGrpc {
    *
*/ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return TestServiceGrpc.bindService(this); @@ -671,10 +671,10 @@ public final class TestServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(TestServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -727,7 +727,7 @@ public final class TestServiceGrpc { } } - public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnaryCallMethod(), diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 0c9d35c4859..35da35201e2 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -309,7 +309,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ - public interface TestServiceAsync { + public interface AsyncService { /** * 
@@ -408,7 +408,7 @@ public final class TestServiceGrpc {
    *
*/ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return TestServiceGrpc.bindService(this); @@ -663,10 +663,10 @@ public final class TestServiceGrpc { io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(TestServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -719,7 +719,7 @@ public final class TestServiceGrpc { } } - public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnaryCallMethod(), From f0c9bc17f3329b1e3980a31dddf0f06a5b559c38 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Fri, 18 Nov 2022 00:26:37 +0000 Subject: [PATCH 26/42] Updated generated files to match change in interface name --- .../io/grpc/alts/internal/HandshakerServiceGrpc.java | 10 +++++----- .../integration/LoadBalancerStatsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/MetricsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++----- .../io/grpc/testing/integration/TestServiceGrpc.java | 10 +++++----- .../testing/integration/UnimplementedServiceGrpc.java | 10 +++++----- .../XdsUpdateClientConfigureServiceGrpc.java | 10 +++++----- .../integration/XdsUpdateHealthServiceGrpc.java | 10 +++++----- .../integration/LoadBalancerStatsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/MetricsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++----- .../io/grpc/testing/integration/TestServiceGrpc.java | 10 +++++----- .../testing/integration/UnimplementedServiceGrpc.java | 10 +++++----- .../XdsUpdateClientConfigureServiceGrpc.java | 10 +++++----- .../integration/XdsUpdateHealthServiceGrpc.java | 10 +++++----- .../io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 10 +++++----- .../benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 10 +++++----- .../io/grpc/benchmarks/proto/WorkerServiceGrpc.java | 10 +++++----- .../src/test/golden/TestDeprecatedService.java.txt | 10 +++++----- .../src/testLite/golden/TestDeprecatedService.java.txt | 10 +++++----- .../main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 10 +++++----- .../integration/LoadBalancerStatsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/MetricsServiceGrpc.java | 10 +++++----- .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++----- .../io/grpc/testing/integration/TestServiceGrpc.java | 10 +++++----- .../testing/integration/UnimplementedServiceGrpc.java | 10 +++++----- .../XdsUpdateClientConfigureServiceGrpc.java | 10 +++++----- .../integration/XdsUpdateHealthServiceGrpc.java | 10 +++++----- .../main/grpc/io/istio/test/EchoTestServiceGrpc.java | 10 +++++----- .../grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java | 10 +++++----- .../main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java | 10 +++++----- .../main/grpc/io/grpc/health/v1/HealthGrpc.java | 10 +++++----- .../grpc/reflection/v1alpha/ServerReflectionGrpc.java | 10 +++++----- .../reflection/testing/AnotherDynamicServiceGrpc.java | 10 +++++----- .../testing/AnotherReflectableServiceGrpc.java | 10 +++++----- .../io/grpc/reflection/testing/DynamicServiceGrpc.java | 10 +++++----- .../reflection/testing/ReflectableServiceGrpc.java | 10 +++++----- .../io/grpc/testing/protobuf/SimpleServiceGrpc.java | 10 +++++----- .../github/xds/service/orca/v3/OpenRcaServiceGrpc.java | 10 +++++----- .../envoy/api/v2/ClusterDiscoveryServiceGrpc.java | 10 +++++----- .../envoy/api/v2/EndpointDiscoveryServiceGrpc.java | 10 +++++----- .../envoy/api/v2/ListenerDiscoveryServiceGrpc.java | 10 +++++----- .../envoy/api/v2/RouteDiscoveryServiceGrpc.java | 10 +++++----- .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java | 10 +++++----- .../envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java | 10 +++++----- .../discovery/v2/AggregatedDiscoveryServiceGrpc.java | 10 +++++----- .../discovery/v2/SecretDiscoveryServiceGrpc.java | 10 +++++----- .../discovery/v3/AggregatedDiscoveryServiceGrpc.java | 10 +++++----- .../load_stats/v2/LoadReportingServiceGrpc.java | 10 +++++----- .../load_stats/v3/LoadReportingServiceGrpc.java | 10 +++++----- .../status/v3/ClientStatusDiscoveryServiceGrpc.java | 10 +++++----- 51 files changed, 255 insertions(+), 255 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 5864fe52688..c28f2578991 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -92,7 +92,7 @@ public HandshakerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Call /** */ - public interface HandshakerServiceAsync { + public interface AsyncService { /** * 
@@ -114,7 +114,7 @@ default io.grpc.stub.StreamObserver doHands
    * Base class for the server implementation of the service HandshakerService
    */
   public static abstract class HandshakerServiceImplBase
-    implements io.grpc.BindableService, HandshakerServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return HandshakerServiceGrpc.bindService(this);
@@ -195,10 +195,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final HandshakerServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(HandshakerServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -226,7 +226,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(HandshakerServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getDoHandshakeMethod(),
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 4bc8cfbb373..88d483f8e56 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -127,7 +127,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * A service used to obtain stats for verifying LB behavior.
    *
*/ - public interface LoadBalancerStatsServiceAsync { + public interface AsyncService { /** * 
@@ -157,7 +157,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
    *
*/ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return LoadBalancerStatsServiceGrpc.bindService(this); @@ -296,10 +296,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerStatsServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -332,7 +332,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getGetClientStatsMethod(), diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 4411409abf7..ad2f5ad73d3 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,7 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ - public interface MetricsServiceAsync { + public interface AsyncService { /** * 
@@ -149,7 +149,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
    * Base class for the server implementation of the service MetricsService
    */
   public static abstract class MetricsServiceImplBase
-    implements io.grpc.BindableService, MetricsServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return MetricsServiceGrpc.bindService(this);
@@ -271,10 +271,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final MetricsServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -307,7 +307,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getGetAllGaugesMethod(),
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index 16ee20baa91..74096f8926a 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -127,7 +127,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    *
*/ - public interface ReconnectServiceAsync { + public interface AsyncService { /** */ @@ -151,7 +151,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, ReconnectServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ReconnectServiceGrpc.bindService(this); @@ -272,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReconnectServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -308,7 +308,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStartMethod(), diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index ff4fb5d3631..495d3e4b015 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,7 +309,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ - public interface TestServiceAsync { + public interface AsyncService { /** * 
@@ -410,7 +410,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    *
*/ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return TestServiceGrpc.bindService(this); @@ -694,10 +694,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(TestServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -751,7 +751,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getEmptyCallMethod(), diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index e12d45bc7fd..4b7059912ae 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,7 +99,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ - public interface UnimplementedServiceAsync { + public interface AsyncService { /** * 
@@ -120,7 +120,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    *
*/ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, UnimplementedServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return UnimplementedServiceGrpc.bindService(this); @@ -229,10 +229,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -261,7 +261,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnimplementedCallMethod(), diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 9ee0a50884d..d9718ecf17d 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,7 +97,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public interface XdsUpdateClientConfigureServiceAsync { + public interface AsyncService { /** * 
@@ -117,7 +117,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
    *
*/ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateClientConfigureServiceGrpc.bindService(this); @@ -223,10 +223,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -255,7 +255,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getConfigureMethod(), diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 20eca5646ea..d6b623c48bb 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,7 +127,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public interface XdsUpdateHealthServiceAsync { + public interface AsyncService { /** */ @@ -151,7 +151,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateHealthServiceGrpc.bindService(this); @@ -272,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -308,7 +308,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getSetServingMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 4bc8cfbb373..88d483f8e56 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -127,7 +127,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ - public interface LoadBalancerStatsServiceAsync { + public interface AsyncService { /** * 
@@ -157,7 +157,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
    *
*/ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, LoadBalancerStatsServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return LoadBalancerStatsServiceGrpc.bindService(this); @@ -296,10 +296,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final LoadBalancerStatsServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -332,7 +332,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getGetClientStatsMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 4411409abf7..ad2f5ad73d3 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,7 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ - public interface MetricsServiceAsync { + public interface AsyncService { /** * 
@@ -149,7 +149,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
    * Base class for the server implementation of the service MetricsService
    */
   public static abstract class MetricsServiceImplBase
-    implements io.grpc.BindableService, MetricsServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return MetricsServiceGrpc.bindService(this);
@@ -271,10 +271,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final MetricsServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -307,7 +307,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getGetAllGaugesMethod(),
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index 16ee20baa91..74096f8926a 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -127,7 +127,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    *
*/ - public interface ReconnectServiceAsync { + public interface AsyncService { /** */ @@ -151,7 +151,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, ReconnectServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ReconnectServiceGrpc.bindService(this); @@ -272,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReconnectServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -308,7 +308,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStartMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java index ff4fb5d3631..495d3e4b015 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,7 +309,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ - public interface TestServiceAsync { + public interface AsyncService { /** * 
@@ -410,7 +410,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    *
*/ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, TestServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return TestServiceGrpc.bindService(this); @@ -694,10 +694,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final TestServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(TestServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -751,7 +751,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getEmptyCallMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index e12d45bc7fd..4b7059912ae 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,7 +99,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ - public interface UnimplementedServiceAsync { + public interface AsyncService { /** * 
@@ -120,7 +120,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    *
*/ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, UnimplementedServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return UnimplementedServiceGrpc.bindService(this); @@ -229,10 +229,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -261,7 +261,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnimplementedCallMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 9ee0a50884d..d9718ecf17d 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,7 +97,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public interface XdsUpdateClientConfigureServiceAsync { + public interface AsyncService { /** * 
@@ -117,7 +117,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
    *
*/ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateClientConfigureServiceGrpc.bindService(this); @@ -223,10 +223,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -255,7 +255,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getConfigureMethod(), diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 20eca5646ea..d6b623c48bb 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,7 +127,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public interface XdsUpdateHealthServiceAsync { + public interface AsyncService { /** */ @@ -151,7 +151,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateHealthServiceGrpc.bindService(this); @@ -272,10 +272,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -308,7 +308,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getSetServingMethod(), diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index b2f60e94b3b..796fd98f1b2 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -216,7 +216,7 @@ public BenchmarkServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO /** */ - public interface BenchmarkServiceAsync { + public interface AsyncService { /** * 
@@ -279,7 +279,7 @@ default io.grpc.stub.StreamObserver implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final BenchmarkServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(BenchmarkServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -489,7 +489,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(BenchmarkServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getUnaryCallMethod(),
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
index a2904bad03a..e1921234c92 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
@@ -92,7 +92,7 @@ public ReportQpsScenarioServiceFutureStub newStub(io.grpc.Channel channel, io.gr
 
   /**
    */
-  public interface ReportQpsScenarioServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -109,7 +109,7 @@ default void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult requ
    * Base class for the server implementation of the service ReportQpsScenarioService
    */
   public static abstract class ReportQpsScenarioServiceImplBase
-    implements io.grpc.BindableService, ReportQpsScenarioServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return ReportQpsScenarioServiceGrpc.bindService(this);
@@ -206,10 +206,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final ReportQpsScenarioServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(ReportQpsScenarioServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -238,7 +238,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(ReportQpsScenarioServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getReportScenarioMethod(),
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
index 47f9b8000e5..339baa9a2dd 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@@ -185,7 +185,7 @@ public WorkerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti
 
   /**
    */
-  public interface WorkerServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -242,7 +242,7 @@ default void quitWorker(io.grpc.benchmarks.proto.Control.Void request,
    * Base class for the server implementation of the service WorkerService
    */
   public static abstract class WorkerServiceImplBase
-    implements io.grpc.BindableService, WorkerServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return WorkerServiceGrpc.bindService(this);
@@ -406,10 +406,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final WorkerServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(WorkerServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -448,7 +448,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(WorkerServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getRunServerMethod(),
diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt
index 40562a34f74..1baa5b62cd9 100644
--- a/compiler/src/test/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/test/golden/TestDeprecatedService.java.txt
@@ -100,7 +100,7 @@ public final class TestDeprecatedServiceGrpc {
    * 

    */
   @java.lang.Deprecated
-  public interface TestDeprecatedServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -122,7 +122,7 @@ public final class TestDeprecatedServiceGrpc {
    */
   @java.lang.Deprecated
   public static abstract class TestDeprecatedServiceImplBase
-    implements io.grpc.BindableService, TestDeprecatedServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return TestDeprecatedServiceGrpc.bindService(this);
@@ -234,10 +234,10 @@ public final class TestDeprecatedServiceGrpc {
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final TestDeprecatedServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(TestDeprecatedServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -266,7 +266,7 @@ public final class TestDeprecatedServiceGrpc {
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(TestDeprecatedServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getDeprecatedMethodMethod(),
diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
index ba954957cfa..540f9dc122a 100644
--- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
@@ -99,7 +99,7 @@ public final class TestDeprecatedServiceGrpc {
    * 

    */
   @java.lang.Deprecated
-  public interface TestDeprecatedServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -121,7 +121,7 @@ public final class TestDeprecatedServiceGrpc {
    */
   @java.lang.Deprecated
   public static abstract class TestDeprecatedServiceImplBase
-    implements io.grpc.BindableService, TestDeprecatedServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return TestDeprecatedServiceGrpc.bindService(this);
@@ -233,10 +233,10 @@ public final class TestDeprecatedServiceGrpc {
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final TestDeprecatedServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(TestDeprecatedServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -265,7 +265,7 @@ public final class TestDeprecatedServiceGrpc {
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(TestDeprecatedServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getDeprecatedMethodMethod(),
diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
index ebb1d44d2a9..feb7bf29ae8 100644
--- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
@@ -92,7 +92,7 @@ public LoadBalancerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptio
 
   /**
    */
-  public interface LoadBalancerAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -109,7 +109,7 @@ default io.grpc.stub.StreamObserver balanceLoa
    * Base class for the server implementation of the service LoadBalancer
    */
   public static abstract class LoadBalancerImplBase
-    implements io.grpc.BindableService, LoadBalancerAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return LoadBalancerGrpc.bindService(this);
@@ -185,10 +185,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final LoadBalancerAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(LoadBalancerAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -216,7 +216,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getBalanceLoadMethod(),
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 0d9c9014503..8bbdf0c9c05 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -129,7 +129,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * A service used to obtain stats for verifying LB behavior.
    * 

    */
-  public interface LoadBalancerStatsServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -159,7 +159,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
    * 

    */
   public static abstract class LoadBalancerStatsServiceImplBase
-    implements io.grpc.BindableService, LoadBalancerStatsServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return LoadBalancerStatsServiceGrpc.bindService(this);
@@ -298,10 +298,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final LoadBalancerStatsServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(LoadBalancerStatsServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -334,7 +334,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(LoadBalancerStatsServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getGetClientStatsMethod(),
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index b31fc0e4881..41a622f784a 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -123,7 +123,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
 
   /**
    */
-  public interface MetricsServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -151,7 +151,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
    * Base class for the server implementation of the service MetricsService
    */
   public static abstract class MetricsServiceImplBase
-    implements io.grpc.BindableService, MetricsServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return MetricsServiceGrpc.bindService(this);
@@ -273,10 +273,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final MetricsServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(MetricsServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -309,7 +309,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(MetricsServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getGetAllGaugesMethod(),
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index fa9e04b6879..945327ec0ec 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -129,7 +129,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    * 

    */
-  public interface ReconnectServiceAsync {
+  public interface AsyncService {
 
     /**
      */
@@ -153,7 +153,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
    * 

    */
   public static abstract class ReconnectServiceImplBase
-    implements io.grpc.BindableService, ReconnectServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return ReconnectServiceGrpc.bindService(this);
@@ -274,10 +274,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final ReconnectServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(ReconnectServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -310,7 +310,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(ReconnectServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStartMethod(),
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index 50bf8d7a380..c54d5ac0408 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -317,7 +317,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
    * performance with various types of payload.
    * 

    */
-  public interface TestServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -418,7 +418,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    * 

    */
   public static abstract class TestServiceImplBase
-    implements io.grpc.BindableService, TestServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return TestServiceGrpc.bindService(this);
@@ -702,10 +702,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final TestServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(TestServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -759,7 +759,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(TestServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getEmptyCallMethod(),
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index a105cf24941..ca20122d476 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -100,7 +100,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
    * that case.
    *
*/ - public interface UnimplementedServiceAsync { + public interface AsyncService { /** * 
@@ -121,7 +121,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
    *
*/ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, UnimplementedServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return UnimplementedServiceGrpc.bindService(this); @@ -230,10 +230,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final UnimplementedServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(UnimplementedServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -262,7 +262,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(UnimplementedServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnimplementedCallMethod(), diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index fa2dc253d91..62834b464a8 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -98,7 +98,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ - public interface XdsUpdateClientConfigureServiceAsync { + public interface AsyncService { /** * 
@@ -118,7 +118,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
    *
*/ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, XdsUpdateClientConfigureServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateClientConfigureServiceGrpc.bindService(this); @@ -224,10 +224,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateClientConfigureServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateClientConfigureServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -256,7 +256,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateClientConfigureServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getConfigureMethod(), diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 25a3c3c4f24..3537efc477f 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -129,7 +129,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ - public interface XdsUpdateHealthServiceAsync { + public interface AsyncService { /** */ @@ -153,7 +153,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, XdsUpdateHealthServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return XdsUpdateHealthServiceGrpc.bindService(this); @@ -274,10 +274,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final XdsUpdateHealthServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(XdsUpdateHealthServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -310,7 +310,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(XdsUpdateHealthServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getSetServingMethod(), diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index 195475ec936..7bab0fe164c 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -123,7 +123,7 @@ public EchoTestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOp /** */ - public interface EchoTestServiceAsync { + public interface AsyncService { /** */ @@ -144,7 +144,7 @@ default void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * Base class for the server implementation of the service EchoTestService */ public static abstract class EchoTestServiceImplBase - implements io.grpc.BindableService, EchoTestServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return EchoTestServiceGrpc.bindService(this); @@ -256,10 +256,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final EchoTestServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(EchoTestServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -292,7 +292,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(EchoTestServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getEchoMethod(), diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index 525b6ffe926..c0e5156a1ee 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -92,7 +92,7 @@ public RouteLookupServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ - public interface RouteLookupServiceAsync { + public interface AsyncService { /** * 
@@ -109,7 +109,7 @@ default void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request,
    * Base class for the server implementation of the service RouteLookupService
    */
   public static abstract class RouteLookupServiceImplBase
-    implements io.grpc.BindableService, RouteLookupServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return RouteLookupServiceGrpc.bindService(this);
@@ -206,10 +206,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final RouteLookupServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(RouteLookupServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -238,7 +238,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(RouteLookupServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getRouteLookupMethod(),
diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
index dfbddba4baa..11f44b8815f 100644
--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@@ -286,7 +286,7 @@ public ChannelzFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions c
    * information.
    *
*/ - public interface ChannelzAsync { + public interface AsyncService { /** * 
@@ -368,7 +368,7 @@ default void getSocket(io.grpc.channelz.v1.GetSocketRequest request,
    *
*/ public static abstract class ChannelzImplBase - implements io.grpc.BindableService, ChannelzAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ChannelzGrpc.bindService(this); @@ -678,10 +678,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ChannelzAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ChannelzAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -734,7 +734,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ChannelzAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getGetTopChannelsMethod(), diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index e6e298c8fbc..952a7581d06 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -123,7 +123,7 @@ public HealthFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions cal /** */ - public interface HealthAsync { + public interface AsyncService { /** * 
@@ -163,7 +163,7 @@ default void watch(io.grpc.health.v1.HealthCheckRequest request,
    * Base class for the server implementation of the service Health
    */
   public static abstract class HealthImplBase
-    implements io.grpc.BindableService, HealthAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return HealthGrpc.bindService(this);
@@ -310,10 +310,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final HealthAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(HealthAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -346,7 +346,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(HealthAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getCheckMethod(),
diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
index 2e07d0c2c7b..c1117583a48 100644
--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@@ -92,7 +92,7 @@ public ServerReflectionFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
 
   /**
    */
-  public interface ServerReflectionAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -110,7 +110,7 @@ default io.grpc.stub.StreamObserver implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final ServerReflectionAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(ServerReflectionAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -218,7 +218,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(ServerReflectionAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getServerReflectionInfoMethod(),
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
index a27d041f192..08073f84ca8 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@@ -98,7 +98,7 @@ public AnotherDynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.
    * AnotherDynamicService
    * 

    */
-  public interface AnotherDynamicServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -118,7 +118,7 @@ default void method(io.grpc.reflection.testing.DynamicRequest request,
    * 

    */
   public static abstract class AnotherDynamicServiceImplBase
-    implements io.grpc.BindableService, AnotherDynamicServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return AnotherDynamicServiceGrpc.bindService(this);
@@ -224,10 +224,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final AnotherDynamicServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(AnotherDynamicServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -256,7 +256,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(AnotherDynamicServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getMethodMethod(),
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
index 9f28b13538a..92db1155b43 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
@@ -92,7 +92,7 @@ public AnotherReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.g
 
   /**
    */
-  public interface AnotherReflectableServiceAsync {
+  public interface AsyncService {
 
     /**
      */
@@ -106,7 +106,7 @@ default void method(io.grpc.reflection.testing.Request request,
    * Base class for the server implementation of the service AnotherReflectableService
    */
   public static abstract class AnotherReflectableServiceImplBase
-    implements io.grpc.BindableService, AnotherReflectableServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return AnotherReflectableServiceGrpc.bindService(this);
@@ -194,10 +194,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final AnotherReflectableServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(AnotherReflectableServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -226,7 +226,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(AnotherReflectableServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getMethodMethod(),
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
index d950e58b3a5..749592493c5 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@@ -98,7 +98,7 @@ public DynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
    * A DynamicService
    *
*/ - public interface DynamicServiceAsync { + public interface AsyncService { /** * 
@@ -118,7 +118,7 @@ default void method(io.grpc.reflection.testing.DynamicRequest request,
    *
*/ public static abstract class DynamicServiceImplBase - implements io.grpc.BindableService, DynamicServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return DynamicServiceGrpc.bindService(this); @@ -224,10 +224,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final DynamicServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(DynamicServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -256,7 +256,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(DynamicServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getMethodMethod(), diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index c526b6955e7..c0d1bad2e2f 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -92,7 +92,7 @@ public ReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ - public interface ReflectableServiceAsync { + public interface AsyncService { /** */ @@ -106,7 +106,7 @@ default void method(io.grpc.reflection.testing.Request request, * Base class for the server implementation of the service ReflectableService */ public static abstract class ReflectableServiceImplBase - implements io.grpc.BindableService, ReflectableServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ReflectableServiceGrpc.bindService(this); @@ -194,10 +194,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ReflectableServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ReflectableServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -226,7 +226,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ReflectableServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getMethodMethod(), diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index dd8557b9c90..5a1437b2e9b 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -191,7 +191,7 @@ public SimpleServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti * A simple service for test. * */ - public interface SimpleServiceAsync { + public interface AsyncService { /** * 
@@ -241,7 +241,7 @@ default io.grpc.stub.StreamObserver bidi
    *
*/ public static abstract class SimpleServiceImplBase - implements io.grpc.BindableService, SimpleServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return SimpleServiceGrpc.bindService(this); @@ -394,10 +394,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final SimpleServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(SimpleServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -436,7 +436,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(SimpleServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getUnaryRpcMethod(), diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index 7c241a4c031..e7e5d1dd446 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -112,7 +112,7 @@ public OpenRcaServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt * a new call to change backend reporting frequency. * */ - public interface OpenRcaServiceAsync { + public interface AsyncService { /** */ @@ -136,7 +136,7 @@ default void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequ * */ public static abstract class OpenRcaServiceImplBase - implements io.grpc.BindableService, OpenRcaServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return OpenRcaServiceGrpc.bindService(this); @@ -247,10 +247,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final OpenRcaServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(OpenRcaServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -279,7 +279,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(OpenRcaServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStreamCoreMetricsMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index 9091e836a6c..dcf770a1891 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -160,7 +160,7 @@ public ClusterDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grp * Return list of all clusters this proxy will load balance to. * */ - public interface ClusterDiscoveryServiceAsync { + public interface AsyncService { /** */ @@ -191,7 +191,7 @@ default void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ClusterDiscoveryServiceImplBase - implements io.grpc.BindableService, ClusterDiscoveryServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ClusterDiscoveryServiceGrpc.bindService(this); @@ -306,10 +306,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ClusterDiscoveryServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ClusterDiscoveryServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -344,7 +344,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ClusterDiscoveryServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStreamClustersMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index f00355b7d42..16b1d6409fc 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -154,7 +154,7 @@ public EndpointDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr /** */ - public interface EndpointDiscoveryServiceAsync { + public interface AsyncService { /** * 
@@ -186,7 +186,7 @@ default void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    * Base class for the server implementation of the service EndpointDiscoveryService
    */
   public static abstract class EndpointDiscoveryServiceImplBase
-    implements io.grpc.BindableService, EndpointDiscoveryServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return EndpointDiscoveryServiceGrpc.bindService(this);
@@ -296,10 +296,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final EndpointDiscoveryServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(EndpointDiscoveryServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -334,7 +334,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(EndpointDiscoveryServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamEndpointsMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
index ed01b9582af..5e16cfa42c4 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
@@ -166,7 +166,7 @@ public ListenerDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * allowed to drain from listeners that are no longer present.
    *
*/ - public interface ListenerDiscoveryServiceAsync { + public interface AsyncService { /** */ @@ -200,7 +200,7 @@ default void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ListenerDiscoveryServiceImplBase - implements io.grpc.BindableService, ListenerDiscoveryServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ListenerDiscoveryServiceGrpc.bindService(this); @@ -324,10 +324,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ListenerDiscoveryServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ListenerDiscoveryServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -362,7 +362,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ListenerDiscoveryServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getDeltaListenersMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index 0f8e16fbecf..e2410585ef0 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -168,7 +168,7 @@ public RouteDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc. * a route table via this identifier. * */ - public interface RouteDiscoveryServiceAsync { + public interface AsyncService { /** */ @@ -203,7 +203,7 @@ default void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class RouteDiscoveryServiceImplBase - implements io.grpc.BindableService, RouteDiscoveryServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return RouteDiscoveryServiceGrpc.bindService(this); @@ -330,10 +330,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final RouteDiscoveryServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(RouteDiscoveryServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -368,7 +368,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(RouteDiscoveryServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStreamRoutesMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index db51d16b227..16711339391 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -172,7 +172,7 @@ public ScopedRoutesDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i * HTTP request. * */ - public interface ScopedRoutesDiscoveryServiceAsync { + public interface AsyncService { /** */ @@ -209,7 +209,7 @@ default void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reque * */ public static abstract class ScopedRoutesDiscoveryServiceImplBase - implements io.grpc.BindableService, ScopedRoutesDiscoveryServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return ScopedRoutesDiscoveryServiceGrpc.bindService(this); @@ -342,10 +342,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final ScopedRoutesDiscoveryServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(ScopedRoutesDiscoveryServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -380,7 +380,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(ScopedRoutesDiscoveryServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getStreamScopedRoutesMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index 0b1bb6dd256..0e27b325b91 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -116,7 +116,7 @@ public VirtualHostDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration. * */ - public interface VirtualHostDiscoveryServiceAsync { + public interface AsyncService { /** */ @@ -142,7 +142,7 @@ default io.grpc.stub.StreamObserver */ public static abstract class VirtualHostDiscoveryServiceImplBase - implements io.grpc.BindableService, VirtualHostDiscoveryServiceAsync { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return VirtualHostDiscoveryServiceGrpc.bindService(this); @@ -251,10 +251,10 @@ private static final class MethodHandlers implements io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final VirtualHostDiscoveryServiceAsync serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(VirtualHostDiscoveryServiceAsync serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -282,7 +282,7 @@ public io.grpc.stub.StreamObserver invoke( } } - public static final io.grpc.ServerServiceDefinition bindService(VirtualHostDiscoveryServiceAsync service) { + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getDeltaVirtualHostsMethod(), diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index cfda17cdc4e..158189c7b7a 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -139,7 +139,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io. * the multiplexed singleton APIs at the Envoy instance and management server. * */ - public interface AggregatedDiscoveryServiceAsync { + public interface AsyncService { /** * 
@@ -171,7 +171,7 @@ default io.grpc.stub.StreamObserver
    */
   public static abstract class AggregatedDiscoveryServiceImplBase
-    implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return AggregatedDiscoveryServiceGrpc.bindService(this);
@@ -280,10 +280,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final AggregatedDiscoveryServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(AggregatedDiscoveryServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -314,7 +314,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(AggregatedDiscoveryServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamAggregatedResourcesMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
index 29aa73a6dc8..baaeb0abc96 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
@@ -154,7 +154,7 @@ public SecretDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc
 
   /**
    */
-  public interface SecretDiscoveryServiceAsync {
+  public interface AsyncService {
 
     /**
      */
@@ -182,7 +182,7 @@ default void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
    * Base class for the server implementation of the service SecretDiscoveryService
    */
   public static abstract class SecretDiscoveryServiceImplBase
-    implements io.grpc.BindableService, SecretDiscoveryServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return SecretDiscoveryServiceGrpc.bindService(this);
@@ -288,10 +288,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final SecretDiscoveryServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(SecretDiscoveryServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -326,7 +326,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(SecretDiscoveryServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getDeltaSecretsMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
index 0116fc08be7..729c7439e5c 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
@@ -139,7 +139,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.
    * the multiplexed singleton APIs at the Envoy instance and management server.
    *
*/ - public interface AggregatedDiscoveryServiceAsync { + public interface AsyncService { /** * 
@@ -171,7 +171,7 @@ default io.grpc.stub.StreamObserver
    */
   public static abstract class AggregatedDiscoveryServiceImplBase
-    implements io.grpc.BindableService, AggregatedDiscoveryServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return AggregatedDiscoveryServiceGrpc.bindService(this);
@@ -280,10 +280,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final AggregatedDiscoveryServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(AggregatedDiscoveryServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -314,7 +314,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(AggregatedDiscoveryServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamAggregatedResourcesMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
index ed944de21df..5f626bb20ce 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
@@ -92,7 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
 
   /**
    */
-  public interface LoadReportingServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -135,7 +135,7 @@ default io.grpc.stub.StreamObserver implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final LoadReportingServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(LoadReportingServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -268,7 +268,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(LoadReportingServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamLoadStatsMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
index 3c7cf0284d9..f1af53fe78f 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
@@ -92,7 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
 
   /**
    */
-  public interface LoadReportingServiceAsync {
+  public interface AsyncService {
 
     /**
      * 
@@ -135,7 +135,7 @@ default io.grpc.stub.StreamObserver implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final LoadReportingServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(LoadReportingServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -268,7 +268,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(LoadReportingServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamLoadStatsMethod(),
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
index bdf220f50c4..0f390d8ae63 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
@@ -133,7 +133,7 @@ public ClientStatusDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i
    * also be used to get the current xDS states directly from the client.
    * 

    */
-  public interface ClientStatusDiscoveryServiceAsync {
+  public interface AsyncService {
 
     /**
      */
@@ -159,7 +159,7 @@ default void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatu
    * 

    */
   public static abstract class ClientStatusDiscoveryServiceImplBase
-    implements io.grpc.BindableService, ClientStatusDiscoveryServiceAsync {
+    implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return ClientStatusDiscoveryServiceGrpc.bindService(this);
@@ -271,10 +271,10 @@ private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod,
       io.grpc.stub.ServerCalls.ClientStreamingMethod,
       io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final ClientStatusDiscoveryServiceAsync serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(ClientStatusDiscoveryServiceAsync serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -306,7 +306,7 @@ public io.grpc.stub.StreamObserver invoke(
     }
   }
 
-  public static final io.grpc.ServerServiceDefinition bindService(ClientStatusDiscoveryServiceAsync service) {
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
         .addMethod(
           getStreamClientStatusMethod(),

From 4b360983ad4525bed7a3f7955b86f15d34daf081 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Fri, 18 Nov 2022 13:58:54 -0800
Subject: [PATCH 27/42] Respond to code review

---
 .../src/java_plugin/cpp/java_generator.cpp    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index ab1a04a3b6f..daa7a022dfd 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -570,7 +570,6 @@ static void PrintStub(
     case ASYNC_INTERFACE:
       call_type = ASYNC_CALL;
       interface = true;
-      impl_base = true;
       stub_name = (*vars)["interface_name"];
       break;
     case ABSTRACT_CLASS:
@@ -618,12 +617,12 @@ static void PrintStub(
     p->Print(
         *vars,
         "public static abstract class $abstract_name$\n"
-        "  implements $BindableService$, $interface_name$ {\n");
+        "    implements $BindableService$, $interface_name$ {\n");
   } else {
     p->Print(
         *vars,
         "public static final class $stub_name$\n"
-        "  extends $stub_base_class_name$<$stub_name$> {\n");
+        "    extends $stub_base_class_name$<$stub_name$> {\n");
   }
   p->Indent();
 
@@ -654,7 +653,7 @@ static void PrintStub(
 
   // RPC methods
   for (int i = 0; i < service->method_count(); ++i) {
-    if (impl_base && !interface) {
+    if (impl_base) {
       break; // Interface defines these as defaults, so not needed in abstract
     }
     const MethodDescriptor* method = service->method(i);
@@ -736,7 +735,7 @@ static void PrintStub(
     // Method body.
     p->Print(" {\n");
     p->Indent();
-    if (impl_base) {
+    if (call_type = ASYNC_CALL) {
       // NB: Skipping validation of service methods. If something is wrong, we wouldn't get to
       // this point as compiler would return errors when generating service interface.
       if (client_streaming) {
@@ -810,15 +809,13 @@ static void PrintStub(
     p->Print("}\n");
   }
 
-  if (impl_base && !interface) {
-    p->Print("\n");
+  if (impl_base) {
     p->Print(
         *vars,
-        "@$Override$ public final $ServerServiceDefinition$ bindService() {\n");
-    p->Indent();
-    p->Print(*vars, "return $service_class_name$.bindService(this);\n");
-    p->Outdent();
-    p->Print("}\n");
+        "\n"
+        "@$Override$ public final $ServerServiceDefinition$ bindService() {\n"
+        "    return $service_class_name$.bindService(this);\n"
+        "}\n");
   }
 
   p->Outdent();

From 41579cbb0ad411dd36be1063d8a4ef704261176e Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Fri, 18 Nov 2022 23:16:24 +0000
Subject: [PATCH 28/42] Fixed indenting, so regenerated all files

---
 .../io/grpc/alts/internal/HandshakerServiceGrpc.java   | 10 +++++-----
 .../integration/LoadBalancerStatsServiceGrpc.java      | 10 +++++-----
 .../grpc/testing/integration/MetricsServiceGrpc.java   | 10 +++++-----
 .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++-----
 .../io/grpc/testing/integration/TestServiceGrpc.java   | 10 +++++-----
 .../testing/integration/UnimplementedServiceGrpc.java  | 10 +++++-----
 .../XdsUpdateClientConfigureServiceGrpc.java           | 10 +++++-----
 .../integration/XdsUpdateHealthServiceGrpc.java        | 10 +++++-----
 .../integration/LoadBalancerStatsServiceGrpc.java      | 10 +++++-----
 .../grpc/testing/integration/MetricsServiceGrpc.java   | 10 +++++-----
 .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++-----
 .../io/grpc/testing/integration/TestServiceGrpc.java   | 10 +++++-----
 .../testing/integration/UnimplementedServiceGrpc.java  | 10 +++++-----
 .../XdsUpdateClientConfigureServiceGrpc.java           | 10 +++++-----
 .../integration/XdsUpdateHealthServiceGrpc.java        | 10 +++++-----
 .../io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 10 +++++-----
 .../benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 10 +++++-----
 .../io/grpc/benchmarks/proto/WorkerServiceGrpc.java    | 10 +++++-----
 compiler/src/java_plugin/cpp/java_generator.cpp        |  2 +-
 .../src/test/golden/TestDeprecatedService.java.txt     | 10 +++++-----
 compiler/src/test/golden/TestService.java.txt          | 10 +++++-----
 .../src/testLite/golden/TestDeprecatedService.java.txt | 10 +++++-----
 compiler/src/testLite/golden/TestService.java.txt      | 10 +++++-----
 .../main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java      | 10 +++++-----
 .../integration/LoadBalancerStatsServiceGrpc.java      | 10 +++++-----
 .../grpc/testing/integration/MetricsServiceGrpc.java   | 10 +++++-----
 .../grpc/testing/integration/ReconnectServiceGrpc.java | 10 +++++-----
 .../io/grpc/testing/integration/TestServiceGrpc.java   | 10 +++++-----
 .../testing/integration/UnimplementedServiceGrpc.java  | 10 +++++-----
 .../XdsUpdateClientConfigureServiceGrpc.java           | 10 +++++-----
 .../integration/XdsUpdateHealthServiceGrpc.java        | 10 +++++-----
 .../main/grpc/io/istio/test/EchoTestServiceGrpc.java   | 10 +++++-----
 .../grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java | 10 +++++-----
 .../main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java    | 10 +++++-----
 .../main/grpc/io/grpc/health/v1/HealthGrpc.java        | 10 +++++-----
 .../grpc/reflection/v1alpha/ServerReflectionGrpc.java  | 10 +++++-----
 .../reflection/testing/AnotherDynamicServiceGrpc.java  | 10 +++++-----
 .../testing/AnotherReflectableServiceGrpc.java         | 10 +++++-----
 .../io/grpc/reflection/testing/DynamicServiceGrpc.java | 10 +++++-----
 .../reflection/testing/ReflectableServiceGrpc.java     | 10 +++++-----
 .../io/grpc/testing/protobuf/SimpleServiceGrpc.java    | 10 +++++-----
 .../github/xds/service/orca/v3/OpenRcaServiceGrpc.java | 10 +++++-----
 .../envoy/api/v2/ClusterDiscoveryServiceGrpc.java      | 10 +++++-----
 .../envoy/api/v2/EndpointDiscoveryServiceGrpc.java     | 10 +++++-----
 .../envoy/api/v2/ListenerDiscoveryServiceGrpc.java     | 10 +++++-----
 .../envoy/api/v2/RouteDiscoveryServiceGrpc.java        | 10 +++++-----
 .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java | 10 +++++-----
 .../envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java  | 10 +++++-----
 .../discovery/v2/AggregatedDiscoveryServiceGrpc.java   | 10 +++++-----
 .../discovery/v2/SecretDiscoveryServiceGrpc.java       | 10 +++++-----
 .../discovery/v3/AggregatedDiscoveryServiceGrpc.java   | 10 +++++-----
 .../load_stats/v2/LoadReportingServiceGrpc.java        | 10 +++++-----
 .../load_stats/v3/LoadReportingServiceGrpc.java        | 10 +++++-----
 .../status/v3/ClientStatusDiscoveryServiceGrpc.java    | 10 +++++-----
 54 files changed, 266 insertions(+), 266 deletions(-)

diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
index c28f2578991..9e6daee7760 100644
--- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
+++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
@@ -114,10 +114,10 @@ default io.grpc.stub.StreamObserver doHands
    * Base class for the server implementation of the service HandshakerService
    */
   public static abstract class HandshakerServiceImplBase
-    implements io.grpc.BindableService, AsyncService {
+      implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return HandshakerServiceGrpc.bindService(this);
+        return HandshakerServiceGrpc.bindService(this);
     }
   }
 
@@ -125,7 +125,7 @@ public static abstract class HandshakerServiceImplBase
    * A stub to allow clients to do asynchronous rpc calls to service HandshakerService
    */
   public static final class HandshakerServiceStub
-    extends io.grpc.stub.AbstractAsyncStub {
+      extends io.grpc.stub.AbstractAsyncStub {
     private HandshakerServiceStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -158,7 +158,7 @@ public io.grpc.stub.StreamObserver doHandsh
    * A stub to allow clients to do synchronous rpc calls to service HandshakerService
    */
   public static final class HandshakerServiceBlockingStub
-    extends io.grpc.stub.AbstractBlockingStub {
+      extends io.grpc.stub.AbstractBlockingStub {
     private HandshakerServiceBlockingStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -175,7 +175,7 @@ protected HandshakerServiceBlockingStub build(
    * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService
    */
   public static final class HandshakerServiceFutureStub
-    extends io.grpc.stub.AbstractFutureStub {
+      extends io.grpc.stub.AbstractFutureStub {
     private HandshakerServiceFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 88d483f8e56..caea5c4042f 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -157,10 +157,10 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
    *
*/ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } @@ -171,7 +171,7 @@ public static abstract class LoadBalancerStatsServiceImplBase * */ public static final class LoadBalancerStatsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -213,7 +213,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -253,7 +253,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse * */ public static final class LoadBalancerStatsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index ad2f5ad73d3..6860f2961d3 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -149,10 +149,10 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * Base class for the server implementation of the service MetricsService */ public static abstract class MetricsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } @@ -160,7 +160,7 @@ public static abstract class MetricsServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ public static final class MetricsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -200,7 +200,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do synchronous rpc calls to service MetricsService */ public static final class MetricsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -239,7 +239,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ public static final class MetricsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 74096f8926a..5af6ac1a223 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -151,10 +151,10 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } @@ -165,7 +165,7 @@ public static abstract class ReconnectServiceImplBase * */ public static final class ReconnectServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,7 +201,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +235,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i * */ public static final class ReconnectServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 495d3e4b015..8d10a8d2b85 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -410,10 +410,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } @@ -425,7 +425,7 @@ public static abstract class TestServiceImplBase * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -544,7 +544,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -620,7 +620,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 4b7059912ae..cac79f7e53b 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -120,10 +120,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } @@ -135,7 +135,7 @@ public static abstract class UnimplementedServiceImplBase * */ public static final class UnimplementedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +167,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,7 +198,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class UnimplementedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index d9718ecf17d..ebef79cd1e4 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -117,10 +117,10 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque * */ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } @@ -131,7 +131,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase * */ public static final class XdsUpdateClientConfigureServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -162,7 +162,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -192,7 +192,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io * */ public static final class XdsUpdateClientConfigureServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index d6b623c48bb..71afef2d345 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -151,10 +151,10 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } @@ -165,7 +165,7 @@ public static abstract class XdsUpdateHealthServiceImplBase * */ public static final class XdsUpdateHealthServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,7 +201,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +235,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi * */ public static final class XdsUpdateHealthServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 88d483f8e56..caea5c4042f 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -157,10 +157,10 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load * */ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } @@ -171,7 +171,7 @@ public static abstract class LoadBalancerStatsServiceImplBase * */ public static final class LoadBalancerStatsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -213,7 +213,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -253,7 +253,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse * */ public static final class LoadBalancerStatsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index ad2f5ad73d3..6860f2961d3 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -149,10 +149,10 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * Base class for the server implementation of the service MetricsService */ public static abstract class MetricsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } @@ -160,7 +160,7 @@ public static abstract class MetricsServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ public static final class MetricsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -200,7 +200,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do synchronous rpc calls to service MetricsService */ public static final class MetricsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -239,7 +239,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ public static final class MetricsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 74096f8926a..5af6ac1a223 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -151,10 +151,10 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } @@ -165,7 +165,7 @@ public static abstract class ReconnectServiceImplBase * */ public static final class ReconnectServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,7 +201,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +235,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i * */ public static final class ReconnectServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 495d3e4b015..8d10a8d2b85 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -410,10 +410,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } @@ -425,7 +425,7 @@ public static abstract class TestServiceImplBase * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -544,7 +544,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -620,7 +620,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 4b7059912ae..cac79f7e53b 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -120,10 +120,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } @@ -135,7 +135,7 @@ public static abstract class UnimplementedServiceImplBase * */ public static final class UnimplementedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +167,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -198,7 +198,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class UnimplementedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index d9718ecf17d..ebef79cd1e4 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -117,10 +117,10 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque * */ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } @@ -131,7 +131,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase * */ public static final class XdsUpdateClientConfigureServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -162,7 +162,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -192,7 +192,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io * */ public static final class XdsUpdateClientConfigureServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index d6b623c48bb..71afef2d345 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -151,10 +151,10 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } @@ -165,7 +165,7 @@ public static abstract class XdsUpdateHealthServiceImplBase * */ public static final class XdsUpdateHealthServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,7 +201,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -235,7 +235,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi * */ public static final class XdsUpdateHealthServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index 796fd98f1b2..ec1ba78984c 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -279,10 +279,10 @@ default io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private BenchmarkServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -368,7 +368,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private BenchmarkServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -408,7 +408,7 @@ public java.util.Iterator stre * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService */ public static final class BenchmarkServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private BenchmarkServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index e1921234c92..6b772b951d4 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -109,10 +109,10 @@ default void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult requ * Base class for the server implementation of the service ReportQpsScenarioService */ public static abstract class ReportQpsScenarioServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReportQpsScenarioServiceGrpc.bindService(this); + return ReportQpsScenarioServiceGrpc.bindService(this); } } @@ -120,7 +120,7 @@ public static abstract class ReportQpsScenarioServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReportQpsScenarioServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,7 +148,7 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReportQpsScenarioServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -175,7 +175,7 @@ public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.p * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService */ public static final class ReportQpsScenarioServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReportQpsScenarioServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 339baa9a2dd..92162463c7e 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -242,10 +242,10 @@ default void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * Base class for the server implementation of the service WorkerService */ public static abstract class WorkerServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return WorkerServiceGrpc.bindService(this); + return WorkerServiceGrpc.bindService(this); } } @@ -253,7 +253,7 @@ public static abstract class WorkerServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service WorkerService */ public static final class WorkerServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private WorkerServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -324,7 +324,7 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request, * A stub to allow clients to do synchronous rpc calls to service WorkerService */ public static final class WorkerServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private WorkerServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -361,7 +361,7 @@ public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService */ public static final class WorkerServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private WorkerServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index daa7a022dfd..3ccacbcf9d8 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -735,7 +735,7 @@ static void PrintStub( // Method body. p->Print(" {\n"); p->Indent(); - if (call_type = ASYNC_CALL) { + if (interface && call_type == ASYNC_CALL) { // NB: Skipping validation of service methods. If something is wrong, we wouldn't get to // this point as compiler would return errors when generating service interface. if (client_streaming) { diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index 1baa5b62cd9..abe3522f7f0 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -122,10 +122,10 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static abstract class TestDeprecatedServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestDeprecatedServiceGrpc.bindService(this); + return TestDeprecatedServiceGrpc.bindService(this); } } @@ -137,7 +137,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestDeprecatedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -170,7 +170,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestDeprecatedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,7 +202,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestDeprecatedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index cc481128f19..26d51c94338 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -416,10 +416,10 @@ public final class TestServiceGrpc { * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } @@ -430,7 +430,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -547,7 +547,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -610,7 +610,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index 540f9dc122a..32ebd32196e 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -121,10 +121,10 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static abstract class TestDeprecatedServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestDeprecatedServiceGrpc.bindService(this); + return TestDeprecatedServiceGrpc.bindService(this); } } @@ -136,7 +136,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestDeprecatedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -169,7 +169,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestDeprecatedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -201,7 +201,7 @@ public final class TestDeprecatedServiceGrpc { */ @java.lang.Deprecated public static final class TestDeprecatedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestDeprecatedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 35da35201e2..6ce4541f404 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -408,10 +408,10 @@ public final class TestServiceGrpc { * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } @@ -422,7 +422,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -539,7 +539,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -602,7 +602,7 @@ public final class TestServiceGrpc { * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index feb7bf29ae8..bdaed59efd7 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -109,10 +109,10 @@ default io.grpc.stub.StreamObserver balanceLoa * Base class for the server implementation of the service LoadBalancer */ public static abstract class LoadBalancerImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerGrpc.bindService(this); + return LoadBalancerGrpc.bindService(this); } } @@ -120,7 +120,7 @@ public static abstract class LoadBalancerImplBase * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,7 +148,7 @@ public io.grpc.stub.StreamObserver balanceLoad * A stub to allow clients to do synchronous rpc calls to service LoadBalancer */ public static final class LoadBalancerBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -165,7 +165,7 @@ protected LoadBalancerBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer */ public static final class LoadBalancerFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 8bbdf0c9c05..305bd3b7c43 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -159,10 +159,10 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load * */ public static abstract class LoadBalancerStatsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } @@ -173,7 +173,7 @@ public static abstract class LoadBalancerStatsServiceImplBase * */ public static final class LoadBalancerStatsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private LoadBalancerStatsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -215,7 +215,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB * */ public static final class LoadBalancerStatsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private LoadBalancerStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -255,7 +255,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse * */ public static final class LoadBalancerStatsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadBalancerStatsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 41a622f784a..77b370ac08c 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -151,10 +151,10 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * Base class for the server implementation of the service MetricsService */ public static abstract class MetricsServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } @@ -162,7 +162,7 @@ public static abstract class MetricsServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service MetricsService */ public static final class MetricsServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private MetricsServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,7 +202,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, * A stub to allow clients to do synchronous rpc calls to service MetricsService */ public static final class MetricsServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private MetricsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -241,7 +241,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService */ public static final class MetricsServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private MetricsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 945327ec0ec..d9b0b9c594e 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -153,10 +153,10 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static abstract class ReconnectServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } @@ -167,7 +167,7 @@ public static abstract class ReconnectServiceImplBase * */ public static final class ReconnectServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReconnectServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -203,7 +203,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class ReconnectServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReconnectServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -237,7 +237,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i * */ public static final class ReconnectServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReconnectServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index c54d5ac0408..6c445f0b927 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -418,10 +418,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class TestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } @@ -433,7 +433,7 @@ public static abstract class TestServiceImplBase * */ public static final class TestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private TestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -552,7 +552,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class TestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private TestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -628,7 +628,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class TestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private TestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index ca20122d476..cd63931b1d7 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -121,10 +121,10 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req * */ public static abstract class UnimplementedServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } @@ -136,7 +136,7 @@ public static abstract class UnimplementedServiceImplBase * */ public static final class UnimplementedServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private UnimplementedServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -168,7 +168,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ * */ public static final class UnimplementedServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private UnimplementedServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -199,7 +199,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t * */ public static final class UnimplementedServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private UnimplementedServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 62834b464a8..f8d3bf00d25 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -118,10 +118,10 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque * */ public static abstract class XdsUpdateClientConfigureServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } @@ -132,7 +132,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase * */ public static final class XdsUpdateClientConfigureServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateClientConfigureServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -163,7 +163,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques * */ public static final class XdsUpdateClientConfigureServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateClientConfigureServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -193,7 +193,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io * */ public static final class XdsUpdateClientConfigureServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateClientConfigureServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 3537efc477f..9a89169f1f9 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -153,10 +153,10 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request * */ public static abstract class XdsUpdateHealthServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } @@ -167,7 +167,7 @@ public static abstract class XdsUpdateHealthServiceImplBase * */ public static final class XdsUpdateHealthServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private XdsUpdateHealthServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -203,7 +203,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request, * */ public static final class XdsUpdateHealthServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private XdsUpdateHealthServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -237,7 +237,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi * */ public static final class XdsUpdateHealthServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private XdsUpdateHealthServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index 7bab0fe164c..ec2b05ab892 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -144,10 +144,10 @@ default void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * Base class for the server implementation of the service EchoTestService */ public static abstract class EchoTestServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return EchoTestServiceGrpc.bindService(this); + return EchoTestServiceGrpc.bindService(this); } } @@ -155,7 +155,7 @@ public static abstract class EchoTestServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service EchoTestService */ public static final class EchoTestServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private EchoTestServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -188,7 +188,7 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request, * A stub to allow clients to do synchronous rpc calls to service EchoTestService */ public static final class EchoTestServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private EchoTestServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -219,7 +219,7 @@ public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.For * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService */ public static final class EchoTestServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private EchoTestServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index c0e5156a1ee..42bf2b0aefd 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -109,10 +109,10 @@ default void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, * Base class for the server implementation of the service RouteLookupService */ public static abstract class RouteLookupServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return RouteLookupServiceGrpc.bindService(this); + return RouteLookupServiceGrpc.bindService(this); } } @@ -120,7 +120,7 @@ public static abstract class RouteLookupServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService */ public static final class RouteLookupServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private RouteLookupServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -148,7 +148,7 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request, * A stub to allow clients to do synchronous rpc calls to service RouteLookupService */ public static final class RouteLookupServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private RouteLookupServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -175,7 +175,7 @@ public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.Route * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService */ public static final class RouteLookupServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private RouteLookupServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index 11f44b8815f..d63ce33e5c1 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -368,10 +368,10 @@ default void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static abstract class ChannelzImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ChannelzGrpc.bindService(this); + return ChannelzGrpc.bindService(this); } } @@ -383,7 +383,7 @@ public static abstract class ChannelzImplBase * */ public static final class ChannelzStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ChannelzStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -482,7 +482,7 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request, * */ public static final class ChannelzBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ChannelzBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -574,7 +574,7 @@ public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSo * */ public static final class ChannelzFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ChannelzFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index 952a7581d06..b7c4eac9429 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -163,10 +163,10 @@ default void watch(io.grpc.health.v1.HealthCheckRequest request, * Base class for the server implementation of the service Health */ public static abstract class HealthImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return HealthGrpc.bindService(this); + return HealthGrpc.bindService(this); } } @@ -174,7 +174,7 @@ public static abstract class HealthImplBase * A stub to allow clients to do asynchronous rpc calls to service Health */ public static final class HealthStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private HealthStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -226,7 +226,7 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request, * A stub to allow clients to do synchronous rpc calls to service Health */ public static final class HealthBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private HealthBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -277,7 +277,7 @@ public java.util.Iterator watch( * A stub to allow clients to do ListenableFuture-style rpc calls to service Health */ public static final class HealthFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private HealthFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index c1117583a48..2b3b0ed9f5f 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -110,10 +110,10 @@ default io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private ServerReflectionStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -150,7 +150,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private ServerReflectionBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -167,7 +167,7 @@ protected ServerReflectionBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection */ public static final class ServerReflectionFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ServerReflectionFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index 08073f84ca8..890ed145a28 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -118,10 +118,10 @@ default void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static abstract class AnotherDynamicServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AnotherDynamicServiceGrpc.bindService(this); + return AnotherDynamicServiceGrpc.bindService(this); } } @@ -132,7 +132,7 @@ public static abstract class AnotherDynamicServiceImplBase * */ public static final class AnotherDynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AnotherDynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -163,7 +163,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class AnotherDynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AnotherDynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -193,7 +193,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * */ public static final class AnotherDynamicServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AnotherDynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index 92db1155b43..44e54c989b8 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -106,10 +106,10 @@ default void method(io.grpc.reflection.testing.Request request, * Base class for the server implementation of the service AnotherReflectableService */ public static abstract class AnotherReflectableServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AnotherReflectableServiceGrpc.bindService(this); + return AnotherReflectableServiceGrpc.bindService(this); } } @@ -117,7 +117,7 @@ public static abstract class AnotherReflectableServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AnotherReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -142,7 +142,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AnotherReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -166,7 +166,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService */ public static final class AnotherReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AnotherReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index 749592493c5..ac6f700fb99 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -118,10 +118,10 @@ default void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static abstract class DynamicServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return DynamicServiceGrpc.bindService(this); + return DynamicServiceGrpc.bindService(this); } } @@ -132,7 +132,7 @@ public static abstract class DynamicServiceImplBase * */ public static final class DynamicServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private DynamicServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -163,7 +163,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request, * */ public static final class DynamicServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private DynamicServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -193,7 +193,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing * */ public static final class DynamicServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private DynamicServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index c0d1bad2e2f..d56fc16d774 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -106,10 +106,10 @@ default void method(io.grpc.reflection.testing.Request request, * Base class for the server implementation of the service ReflectableService */ public static abstract class ReflectableServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReflectableServiceGrpc.bindService(this); + return ReflectableServiceGrpc.bindService(this); } } @@ -117,7 +117,7 @@ public static abstract class ReflectableServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ReflectableServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -142,7 +142,7 @@ public void method(io.grpc.reflection.testing.Request request, * A stub to allow clients to do synchronous rpc calls to service ReflectableService */ public static final class ReflectableServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ReflectableServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -166,7 +166,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService */ public static final class ReflectableServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ReflectableServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index 5a1437b2e9b..3251fcbcf73 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -241,10 +241,10 @@ default io.grpc.stub.StreamObserver bidi * */ public static abstract class SimpleServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return SimpleServiceGrpc.bindService(this); + return SimpleServiceGrpc.bindService(this); } } @@ -255,7 +255,7 @@ public static abstract class SimpleServiceImplBase * */ public static final class SimpleServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private SimpleServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -319,7 +319,7 @@ public io.grpc.stub.StreamObserver bidiS * */ public static final class SimpleServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private SimpleServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -360,7 +360,7 @@ public java.util.Iterator serverStreami * */ public static final class SimpleServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private SimpleServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index e7e5d1dd446..80eec62c1dd 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -136,10 +136,10 @@ default void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequ * */ public static abstract class OpenRcaServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return OpenRcaServiceGrpc.bindService(this); + return OpenRcaServiceGrpc.bindService(this); } } @@ -157,7 +157,7 @@ public static abstract class OpenRcaServiceImplBase * */ public static final class OpenRcaServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private OpenRcaServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -192,7 +192,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque * */ public static final class OpenRcaServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private OpenRcaServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -227,7 +227,7 @@ public java.util.Iterator streamCore * */ public static final class OpenRcaServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private OpenRcaServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index dcf770a1891..cd150cf3d24 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -191,10 +191,10 @@ default void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ClusterDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ClusterDiscoveryServiceGrpc.bindService(this); + return ClusterDiscoveryServiceGrpc.bindService(this); } } @@ -205,7 +205,7 @@ public static abstract class ClusterDiscoveryServiceImplBase * */ public static final class ClusterDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ClusterDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -249,7 +249,7 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ClusterDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ClusterDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -276,7 +276,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy. * */ public static final class ClusterDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ClusterDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index 16b1d6409fc..52eabdcd807 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -186,10 +186,10 @@ default void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * Base class for the server implementation of the service EndpointDiscoveryService */ public static abstract class EndpointDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return EndpointDiscoveryServiceGrpc.bindService(this); + return EndpointDiscoveryServiceGrpc.bindService(this); } } @@ -197,7 +197,7 @@ public static abstract class EndpointDiscoveryServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private EndpointDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -242,7 +242,7 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private EndpointDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -266,7 +266,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService */ public static final class EndpointDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private EndpointDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index 5e16cfa42c4..98eb17037ad 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -200,10 +200,10 @@ default void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class ListenerDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ListenerDiscoveryServiceGrpc.bindService(this); + return ListenerDiscoveryServiceGrpc.bindService(this); } } @@ -217,7 +217,7 @@ public static abstract class ListenerDiscoveryServiceImplBase * */ public static final class ListenerDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ListenerDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -264,7 +264,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class ListenerDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ListenerDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -294,7 +294,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy * */ public static final class ListenerDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ListenerDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index e2410585ef0..4defbfd7c0e 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -203,10 +203,10 @@ default void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static abstract class RouteDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return RouteDiscoveryServiceGrpc.bindService(this); + return RouteDiscoveryServiceGrpc.bindService(this); } } @@ -221,7 +221,7 @@ public static abstract class RouteDiscoveryServiceImplBase * */ public static final class RouteDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private RouteDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -269,7 +269,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * */ public static final class RouteDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private RouteDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -300,7 +300,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.en * */ public static final class RouteDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private RouteDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index 16711339391..8e9a31fa69e 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -209,10 +209,10 @@ default void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reque * */ public static abstract class ScopedRoutesDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ScopedRoutesDiscoveryServiceGrpc.bindService(this); + return ScopedRoutesDiscoveryServiceGrpc.bindService(this); } } @@ -229,7 +229,7 @@ public static abstract class ScopedRoutesDiscoveryServiceImplBase * */ public static final class ScopedRoutesDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ScopedRoutesDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -279,7 +279,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques * */ public static final class ScopedRoutesDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ScopedRoutesDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -312,7 +312,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoypr * */ public static final class ScopedRoutesDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ScopedRoutesDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index 0e27b325b91..996e2329d3b 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -142,10 +142,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class VirtualHostDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return VirtualHostDiscoveryServiceGrpc.bindService(this); + return VirtualHostDiscoveryServiceGrpc.bindService(this); } } @@ -165,7 +165,7 @@ public static abstract class VirtualHostDiscoveryServiceImplBase * */ public static final class VirtualHostDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private VirtualHostDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -202,7 +202,7 @@ public io.grpc.stub.StreamObserver */ public static final class VirtualHostDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private VirtualHostDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -231,7 +231,7 @@ protected VirtualHostDiscoveryServiceBlockingStub build( * */ public static final class VirtualHostDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private VirtualHostDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 158189c7b7a..2065bda4393 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -171,10 +171,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class AggregatedDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AggregatedDiscoveryServiceGrpc.bindService(this); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } @@ -190,7 +190,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase * */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -234,7 +234,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -259,7 +259,7 @@ protected AggregatedDiscoveryServiceBlockingStub build( * */ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index baaeb0abc96..a28b5c910d7 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -182,10 +182,10 @@ default void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * Base class for the server implementation of the service SecretDiscoveryService */ public static abstract class SecretDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return SecretDiscoveryServiceGrpc.bindService(this); + return SecretDiscoveryServiceGrpc.bindService(this); } } @@ -193,7 +193,7 @@ public static abstract class SecretDiscoveryServiceImplBase * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private SecretDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -234,7 +234,7 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request, * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private SecretDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -258,7 +258,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.e * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService */ public static final class SecretDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private SecretDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index 729c7439e5c..bce5cbf98e4 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -171,10 +171,10 @@ default io.grpc.stub.StreamObserver */ public static abstract class AggregatedDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AggregatedDiscoveryServiceGrpc.bindService(this); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } @@ -190,7 +190,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase * */ public static final class AggregatedDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private AggregatedDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -234,7 +234,7 @@ public io.grpc.stub.StreamObserver */ public static final class AggregatedDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private AggregatedDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -259,7 +259,7 @@ protected AggregatedDiscoveryServiceBlockingStub build( * */ public static final class AggregatedDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private AggregatedDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index 5f626bb20ce..f7725164e2a 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -135,10 +135,10 @@ default io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -200,7 +200,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -217,7 +217,7 @@ protected LoadReportingServiceBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index f1af53fe78f..42e6782f89f 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -135,10 +135,10 @@ default io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractAsyncStub { private LoadReportingServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -200,7 +200,7 @@ public io.grpc.stub.StreamObserver { + extends io.grpc.stub.AbstractBlockingStub { private LoadReportingServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -217,7 +217,7 @@ protected LoadReportingServiceBlockingStub build( * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService */ public static final class LoadReportingServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private LoadReportingServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index 0f390d8ae63..d6456ee7eae 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -159,10 +159,10 @@ default void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatu * */ public static abstract class ClientStatusDiscoveryServiceImplBase - implements io.grpc.BindableService, AsyncService { + implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ClientStatusDiscoveryServiceGrpc.bindService(this); + return ClientStatusDiscoveryServiceGrpc.bindService(this); } } @@ -175,7 +175,7 @@ public static abstract class ClientStatusDiscoveryServiceImplBase * */ public static final class ClientStatusDiscoveryServiceStub - extends io.grpc.stub.AbstractAsyncStub { + extends io.grpc.stub.AbstractAsyncStub { private ClientStatusDiscoveryServiceStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -213,7 +213,7 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus * */ public static final class ClientStatusDiscoveryServiceBlockingStub - extends io.grpc.stub.AbstractBlockingStub { + extends io.grpc.stub.AbstractBlockingStub { private ClientStatusDiscoveryServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -242,7 +242,7 @@ public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientSta * */ public static final class ClientStatusDiscoveryServiceFutureStub - extends io.grpc.stub.AbstractFutureStub { + extends io.grpc.stub.AbstractFutureStub { private ClientStatusDiscoveryServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); From a75862d8160be5efdc4df4b4ce297c1e33ecd261 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 19 Nov 2022 00:00:50 +0000 Subject: [PATCH 29/42] Fixed indenting, so regenerated all files --- .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 2 +- .../debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java | 2 +- .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 2 +- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 2 +- .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 2 +- .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/TestServiceGrpc.java | 2 +- .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 2 +- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 2 +- .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 2 +- .../grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 2 +- .../io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 2 +- .../main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java | 2 +- compiler/src/java_plugin/cpp/java_generator.cpp | 2 +- compiler/src/test/golden/TestDeprecatedService.java.txt | 2 +- compiler/src/test/golden/TestService.java.txt | 2 +- compiler/src/testLite/golden/TestDeprecatedService.java.txt | 2 +- compiler/src/testLite/golden/TestService.java.txt | 2 +- .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 2 +- .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 2 +- .../main/grpc/io/grpc/testing/integration/TestServiceGrpc.java | 2 +- .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 2 +- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 2 +- .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 2 +- .../generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index caea5c4042f..b48bba83bfc 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -160,7 +160,7 @@ public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 6860f2961d3..a2065aee097 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -152,7 +152,7 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 5af6ac1a223..54ba19f5d40 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -154,7 +154,7 @@ public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 8d10a8d2b85..5bdfde9cf9c 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -413,7 +413,7 @@ public static abstract class TestServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index cac79f7e53b..d52dcc2558c 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -123,7 +123,7 @@ public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index ebef79cd1e4..55508da6248 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -120,7 +120,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 71afef2d345..a9da1dc8884 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -154,7 +154,7 @@ public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index caea5c4042f..b48bba83bfc 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -160,7 +160,7 @@ public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 6860f2961d3..a2065aee097 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -152,7 +152,7 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 5af6ac1a223..54ba19f5d40 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -154,7 +154,7 @@ public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 8d10a8d2b85..5bdfde9cf9c 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -413,7 +413,7 @@ public static abstract class TestServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index cac79f7e53b..d52dcc2558c 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -123,7 +123,7 @@ public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index ebef79cd1e4..55508da6248 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -120,7 +120,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 71afef2d345..a9da1dc8884 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -154,7 +154,7 @@ public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index ec1ba78984c..1a63982bfdd 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -282,7 +282,7 @@ public static abstract class BenchmarkServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return BenchmarkServiceGrpc.bindService(this); + return BenchmarkServiceGrpc.bindService(this); } } diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 6b772b951d4..cea30cd3718 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -112,7 +112,7 @@ public static abstract class ReportQpsScenarioServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReportQpsScenarioServiceGrpc.bindService(this); + return ReportQpsScenarioServiceGrpc.bindService(this); } } diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 92162463c7e..2aca40cad85 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -245,7 +245,7 @@ public static abstract class WorkerServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return WorkerServiceGrpc.bindService(this); + return WorkerServiceGrpc.bindService(this); } } diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 3ccacbcf9d8..794996f2d31 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -814,7 +814,7 @@ static void PrintStub( *vars, "\n" "@$Override$ public final $ServerServiceDefinition$ bindService() {\n" - " return $service_class_name$.bindService(this);\n" + " return $service_class_name$.bindService(this);\n" "}\n"); } diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index abe3522f7f0..9b9d3599378 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -125,7 +125,7 @@ public final class TestDeprecatedServiceGrpc { implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestDeprecatedServiceGrpc.bindService(this); + return TestDeprecatedServiceGrpc.bindService(this); } } diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 26d51c94338..c59a097f511 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -419,7 +419,7 @@ public final class TestServiceGrpc { implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index 32ebd32196e..e32e9ae5bcc 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -124,7 +124,7 @@ public final class TestDeprecatedServiceGrpc { implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestDeprecatedServiceGrpc.bindService(this); + return TestDeprecatedServiceGrpc.bindService(this); } } diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 6ce4541f404..86709b911ec 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -411,7 +411,7 @@ public final class TestServiceGrpc { implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 305bd3b7c43..33f0cd1e1fe 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -162,7 +162,7 @@ public static abstract class LoadBalancerStatsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerStatsServiceGrpc.bindService(this); + return LoadBalancerStatsServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 77b370ac08c..129bee85b0e 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -154,7 +154,7 @@ public static abstract class MetricsServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return MetricsServiceGrpc.bindService(this); + return MetricsServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index d9b0b9c594e..877f7e6222a 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -156,7 +156,7 @@ public static abstract class ReconnectServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReconnectServiceGrpc.bindService(this); + return ReconnectServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 6c445f0b927..59251cce405 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -421,7 +421,7 @@ public static abstract class TestServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return TestServiceGrpc.bindService(this); + return TestServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index cd63931b1d7..442faab6a98 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -124,7 +124,7 @@ public static abstract class UnimplementedServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return UnimplementedServiceGrpc.bindService(this); + return UnimplementedServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index f8d3bf00d25..6bb2c845a20 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -121,7 +121,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateClientConfigureServiceGrpc.bindService(this); + return XdsUpdateClientConfigureServiceGrpc.bindService(this); } } diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index 9a89169f1f9..ed94d1439af 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -156,7 +156,7 @@ public static abstract class XdsUpdateHealthServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return XdsUpdateHealthServiceGrpc.bindService(this); + return XdsUpdateHealthServiceGrpc.bindService(this); } } diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index ec2b05ab892..5157590b3f9 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -147,7 +147,7 @@ public static abstract class EchoTestServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return EchoTestServiceGrpc.bindService(this); + return EchoTestServiceGrpc.bindService(this); } } From 2139419d2047bddbe443876ed0f975837c8afa96 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 19 Nov 2022 00:53:11 +0000 Subject: [PATCH 30/42] Updated generated files to match change in interface name --- .../main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java | 2 +- .../src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 2 +- .../main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java | 2 +- .../generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java | 2 +- .../src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java | 2 +- .../grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java | 2 +- .../io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java | 2 +- .../grpc/reflection/testing/AnotherReflectableServiceGrpc.java | 2 +- .../grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java | 2 +- .../grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java | 2 +- .../main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java | 2 +- .../grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java | 2 +- .../io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java | 2 +- .../envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java | 2 +- .../envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java | 2 +- .../io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java | 2 +- .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java | 2 +- .../envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java | 2 +- .../service/discovery/v2/AggregatedDiscoveryServiceGrpc.java | 2 +- .../envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java | 2 +- .../service/discovery/v3/AggregatedDiscoveryServiceGrpc.java | 2 +- .../envoy/service/load_stats/v2/LoadReportingServiceGrpc.java | 2 +- .../envoy/service/load_stats/v3/LoadReportingServiceGrpc.java | 2 +- .../service/status/v3/ClientStatusDiscoveryServiceGrpc.java | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 9e6daee7760..4c241609632 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -117,7 +117,7 @@ public static abstract class HandshakerServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return HandshakerServiceGrpc.bindService(this); + return HandshakerServiceGrpc.bindService(this); } } diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index bdaed59efd7..7ed8807e98b 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -112,7 +112,7 @@ public static abstract class LoadBalancerImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadBalancerGrpc.bindService(this); + return LoadBalancerGrpc.bindService(this); } } diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index 42bf2b0aefd..fb28b30cadf 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -112,7 +112,7 @@ public static abstract class RouteLookupServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return RouteLookupServiceGrpc.bindService(this); + return RouteLookupServiceGrpc.bindService(this); } } diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index d63ce33e5c1..d822f843318 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -371,7 +371,7 @@ public static abstract class ChannelzImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ChannelzGrpc.bindService(this); + return ChannelzGrpc.bindService(this); } } diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index b7c4eac9429..654eb2ddb48 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -166,7 +166,7 @@ public static abstract class HealthImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return HealthGrpc.bindService(this); + return HealthGrpc.bindService(this); } } diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index 2b3b0ed9f5f..c2b22a78bdf 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -113,7 +113,7 @@ public static abstract class ServerReflectionImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ServerReflectionGrpc.bindService(this); + return ServerReflectionGrpc.bindService(this); } } diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index 890ed145a28..de993b05146 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -121,7 +121,7 @@ public static abstract class AnotherDynamicServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AnotherDynamicServiceGrpc.bindService(this); + return AnotherDynamicServiceGrpc.bindService(this); } } diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index 44e54c989b8..f3ee3ebfae3 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -109,7 +109,7 @@ public static abstract class AnotherReflectableServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AnotherReflectableServiceGrpc.bindService(this); + return AnotherReflectableServiceGrpc.bindService(this); } } diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index ac6f700fb99..1cfbb0b0a66 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -121,7 +121,7 @@ public static abstract class DynamicServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return DynamicServiceGrpc.bindService(this); + return DynamicServiceGrpc.bindService(this); } } diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index d56fc16d774..b0f5bb1ac83 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -109,7 +109,7 @@ public static abstract class ReflectableServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ReflectableServiceGrpc.bindService(this); + return ReflectableServiceGrpc.bindService(this); } } diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index 3251fcbcf73..da623789cde 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -244,7 +244,7 @@ public static abstract class SimpleServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return SimpleServiceGrpc.bindService(this); + return SimpleServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index 80eec62c1dd..148a74c31e3 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -139,7 +139,7 @@ public static abstract class OpenRcaServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return OpenRcaServiceGrpc.bindService(this); + return OpenRcaServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index cd150cf3d24..4d552772dcb 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -194,7 +194,7 @@ public static abstract class ClusterDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ClusterDiscoveryServiceGrpc.bindService(this); + return ClusterDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index 52eabdcd807..bb4ab78fd35 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -189,7 +189,7 @@ public static abstract class EndpointDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return EndpointDiscoveryServiceGrpc.bindService(this); + return EndpointDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index 98eb17037ad..8c11e277059 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -203,7 +203,7 @@ public static abstract class ListenerDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ListenerDiscoveryServiceGrpc.bindService(this); + return ListenerDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index 4defbfd7c0e..27892d3dd3b 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -206,7 +206,7 @@ public static abstract class RouteDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return RouteDiscoveryServiceGrpc.bindService(this); + return RouteDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index 8e9a31fa69e..1668b8445a7 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -212,7 +212,7 @@ public static abstract class ScopedRoutesDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ScopedRoutesDiscoveryServiceGrpc.bindService(this); + return ScopedRoutesDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index 996e2329d3b..e331f66b1b1 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -145,7 +145,7 @@ public static abstract class VirtualHostDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return VirtualHostDiscoveryServiceGrpc.bindService(this); + return VirtualHostDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 2065bda4393..13650fdc8c7 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -174,7 +174,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AggregatedDiscoveryServiceGrpc.bindService(this); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index a28b5c910d7..45789213d4d 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -185,7 +185,7 @@ public static abstract class SecretDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return SecretDiscoveryServiceGrpc.bindService(this); + return SecretDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index bce5cbf98e4..3d93673b8a7 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -174,7 +174,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return AggregatedDiscoveryServiceGrpc.bindService(this); + return AggregatedDiscoveryServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index f7725164e2a..ed31e72c135 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -138,7 +138,7 @@ public static abstract class LoadReportingServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadReportingServiceGrpc.bindService(this); + return LoadReportingServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index 42e6782f89f..d9fe068b6a4 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -138,7 +138,7 @@ public static abstract class LoadReportingServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return LoadReportingServiceGrpc.bindService(this); + return LoadReportingServiceGrpc.bindService(this); } } diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index d6456ee7eae..1529af4e6e3 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -162,7 +162,7 @@ public static abstract class ClientStatusDiscoveryServiceImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return ClientStatusDiscoveryServiceGrpc.bindService(this); + return ClientStatusDiscoveryServiceGrpc.bindService(this); } } From 3703403ca1c00a9c8719c8d38fb192c25a64b9b3 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Mon, 21 Nov 2022 20:55:57 +0000 Subject: [PATCH 31/42] Add @Experimental flag and regenerate files --- .../main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java | 1 + .../grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 1 + .../io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 1 + .../main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java | 1 + compiler/src/java_plugin/cpp/java_generator.cpp | 2 ++ compiler/src/test/golden/TestDeprecatedService.java.txt | 1 + compiler/src/test/golden/TestService.java.txt | 1 + compiler/src/testLite/golden/TestDeprecatedService.java.txt | 1 + compiler/src/testLite/golden/TestService.java.txt | 1 + .../src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 1 + .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 1 + .../main/grpc/io/grpc/testing/integration/TestServiceGrpc.java | 1 + .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 1 + .../integration/XdsUpdateClientConfigureServiceGrpc.java | 1 + .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 + .../generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java | 1 + .../main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java | 1 + .../generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java | 1 + .../src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java | 1 + .../grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java | 1 + .../io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java | 1 + .../grpc/reflection/testing/AnotherReflectableServiceGrpc.java | 1 + .../grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java | 1 + .../grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java | 1 + .../main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java | 1 + .../grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java | 1 + .../io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java | 1 + .../envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java | 1 + .../envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java | 1 + .../io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java | 1 + .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java | 1 + .../envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java | 1 + .../service/discovery/v2/AggregatedDiscoveryServiceGrpc.java | 1 + .../envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java | 1 + .../service/discovery/v3/AggregatedDiscoveryServiceGrpc.java | 1 + .../envoy/service/load_stats/v2/LoadReportingServiceGrpc.java | 1 + .../envoy/service/load_stats/v3/LoadReportingServiceGrpc.java | 1 + .../service/status/v3/ClientStatusDiscoveryServiceGrpc.java | 1 + 40 files changed, 41 insertions(+) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 4c241609632..867eee00cf7 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -92,6 +92,7 @@ public HandshakerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Call /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index 1a63982bfdd..9238c213143 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -216,6 +216,7 @@ public BenchmarkServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index cea30cd3718..83e3de1267d 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -92,6 +92,7 @@ public ReportQpsScenarioServiceFutureStub newStub(io.grpc.Channel channel, io.gr /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 2aca40cad85..6edbfc705e3 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -185,6 +185,7 @@ public WorkerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 794996f2d31..640c1f4099f 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -612,6 +612,7 @@ static void PrintStub( if (interface) { p->Print( *vars, + "@$ExperimentalApi$(\"https://github.com/grpc/grpc-java/issues/9702\")\n" "public interface $stub_name$ {\n"); } else if (impl_base) { p->Print( @@ -1208,6 +1209,7 @@ void GenerateService(const ServiceDescriptor* service, vars["Deprecated"] = "java.lang.Deprecated"; vars["Override"] = "java.lang.Override"; vars["Channel"] = "io.grpc.Channel"; + vars["ExperimentalApi"] = "io.grpc.ExperimentalApi"; vars["CallOptions"] = "io.grpc.CallOptions"; vars["MethodType"] = "io.grpc.MethodDescriptor.MethodType"; vars["ServerMethodDefinition"] = diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index 9b9d3599378..1f5613ff7c0 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -100,6 +100,7 @@ public final class TestDeprecatedServiceGrpc { * */ @java.lang.Deprecated + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index c59a097f511..1b091c058cf 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -317,6 +317,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index e32e9ae5bcc..621cad89256 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -99,6 +99,7 @@ public final class TestDeprecatedServiceGrpc { * */ @java.lang.Deprecated + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 86709b911ec..59e5e6209b4 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -309,6 +309,7 @@ public final class TestServiceGrpc { * Test service that supports all call types. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java index 7ed8807e98b..dca98ac214b 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java @@ -92,6 +92,7 @@ public LoadBalancerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptio /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 33f0cd1e1fe..01b52f7e4db 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -129,6 +129,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 129bee85b0e..0ee520fe5a8 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -123,6 +123,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 877f7e6222a..d3c616fbe45 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -129,6 +129,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 59251cce405..87935556a9d 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -317,6 +317,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index 442faab6a98..6fae4389988 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -100,6 +100,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 6bb2c845a20..61a5d36638e 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -98,6 +98,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index ed94d1439af..70359698de2 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -129,6 +129,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java index 5157590b3f9..e1c678b5a70 100644 --- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java +++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java @@ -123,6 +123,7 @@ public EchoTestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOp /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java index fb28b30cadf..456509873da 100644 --- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java +++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java @@ -92,6 +92,7 @@ public RouteLookupServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java index d822f843318..ae36c6699dc 100644 --- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java @@ -286,6 +286,7 @@ public ChannelzFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions c * information. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index 654eb2ddb48..88372e9811f 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -123,6 +123,7 @@ public HealthFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions cal /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java index c2b22a78bdf..a26fd1a36ab 100644 --- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java @@ -92,6 +92,7 @@ public ServerReflectionFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java index de993b05146..f89a936046b 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java @@ -98,6 +98,7 @@ public AnotherDynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc. * AnotherDynamicService * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java index f3ee3ebfae3..0e1289d9f3a 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java @@ -92,6 +92,7 @@ public AnotherReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.g /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java index 1cfbb0b0a66..5b88ebe1cc4 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java @@ -98,6 +98,7 @@ public DynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt * A DynamicService * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java index b0f5bb1ac83..96b679441cd 100644 --- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java +++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java @@ -92,6 +92,7 @@ public ReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java index da623789cde..fce0f775422 100644 --- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java +++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java @@ -191,6 +191,7 @@ public SimpleServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti * A simple service for test. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java index 148a74c31e3..e60dfbd5e3d 100644 --- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java @@ -112,6 +112,7 @@ public OpenRcaServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt * a new call to change backend reporting frequency. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index 4d552772dcb..8b77f9e7914 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -160,6 +160,7 @@ public ClusterDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grp * Return list of all clusters this proxy will load balance to. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index bb4ab78fd35..c66ff4e5815 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -154,6 +154,7 @@ public EndpointDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java index 8c11e277059..2973c5de4f2 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java @@ -166,6 +166,7 @@ public ListenerDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr * allowed to drain from listeners that are no longer present. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java index 27892d3dd3b..227dc856010 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java @@ -168,6 +168,7 @@ public RouteDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc. * a route table via this identifier. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java index 1668b8445a7..db6d4e08e8a 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java @@ -172,6 +172,7 @@ public ScopedRoutesDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i * HTTP request. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java index e331f66b1b1..731d77ab863 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java @@ -116,6 +116,7 @@ public VirtualHostDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 13650fdc8c7..166971a5a0e 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -139,6 +139,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io. * the multiplexed singleton APIs at the Envoy instance and management server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java index 45789213d4d..fdc9b4e8594 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java @@ -154,6 +154,7 @@ public SecretDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java index 3d93673b8a7..6f7f95c3b3e 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java @@ -139,6 +139,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io. * the multiplexed singleton APIs at the Envoy instance and management server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index ed31e72c135..00ff1e46294 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -92,6 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java index d9fe068b6a4..31c8dcb6e57 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java @@ -92,6 +92,7 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java index 1529af4e6e3..2f6b25aaec2 100644 --- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java +++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java @@ -133,6 +133,7 @@ public ClientStatusDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i * also be used to get the current xDS states directly from the client. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** From 029088057af4f402513dfffb9d424ea90a0fa8d9 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 22 Nov 2022 17:51:59 -0800 Subject: [PATCH 32/42] Add a test case using a class that implements the interface directly instead of using ImplBase. --- .../alts/HandshakerServiceChannelTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java b/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java index dc297492fe3..01c64bca7a6 100644 --- a/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java +++ b/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java @@ -35,6 +35,21 @@ @RunWith(JUnit4.class) public final class HandshakerServiceChannelTest { + + public static class SimpleServiceAltServer + implements io.grpc.BindableService, SimpleServiceGrpc.AsyncService { + + @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { + return SimpleServiceGrpc.bindService(this); + } + + @Override + public void unaryRpc(SimpleRequest request, StreamObserver so) { + so.onNext(SimpleResponse.getDefaultInstance()); + so.onCompleted(); + } + } + @Rule public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule(); private final Server server = grpcCleanup.register( @@ -47,13 +62,21 @@ public void unaryRpc(SimpleRequest request, StreamObserver so) { } }) .build()); + private final Server altServer = grpcCleanup.register( + ServerBuilder.forPort(0) + .addService(new SimpleServiceAltServer()) + .build()); private Resource resource; + private Resource altResource; @Before public void setUp() throws Exception { server.start(); + altServer.start(); resource = HandshakerServiceChannel.getHandshakerChannelForTesting("localhost:" + server.getPort()); + altResource = + HandshakerServiceChannel.getHandshakerChannelForTesting("localhost:" + altServer.getPort()); } @Test @@ -78,6 +101,17 @@ public void resource_works() { } } + @Test + public void altServer_works() { + Channel channel = altResource.create(); + try { + // Do an RPC to verify that the channel actually works + doRpc(channel); + } finally { + altResource.close(channel); + } + } + @Test public void resource_lifecycleTwice() { Channel channel = resource.create(); From b92121639bf5d78567ccf1b47b3d94d51ad59cc2 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 4 Jan 2023 15:54:02 -0800 Subject: [PATCH 33/42] Respond to code review. --- .../src/java_plugin/cpp/java_generator.cpp | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 640c1f4099f..fa46c55f474 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -380,31 +380,23 @@ static void GrpcWriteServiceDocComment(Printer* printer, StubType type) { printer->Print("/**\n"); - bool add_service_name = false; + std::map vars = {{"service", service->name()}}; switch (type) { case ASYNC_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do asynchronous rpc calls to service "); - add_service_name = true; + printer->Print(vars, " * A stub to allow clients to do asynchronous rpc calls to service $service$\n"); break; case BLOCKING_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do synchronous rpc calls to service "); - add_service_name = true; + printer->Print(" * A stub to allow clients to do synchronous rpc calls to service $service$\n"); break; case FUTURE_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service "); - add_service_name = true; + printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service $service$\n"); break; case ABSTRACT_CLASS: - printer->Print(" * Base class for the server implementation of the service "); - add_service_name = true; + printer->Print(" * Base class for the server implementation of the service $service$\n"); break; default: ; // No extra description } - if (add_service_name) { - printer->Print(service->name().c_str()); - printer->Print("\n"); - } std::vector lines = GrpcGetDocLinesForDescriptor(service); GrpcWriteDocCommentBody(printer, lines, true); @@ -564,7 +556,6 @@ static void PrintStub( std::string stub_name = service_name; std::string stub_base_class_name = "AbstractStub"; CallType call_type; - bool impl_base = false; bool interface = false; switch (type) { case ASYNC_INTERFACE: @@ -572,11 +563,6 @@ static void PrintStub( interface = true; stub_name = (*vars)["interface_name"]; break; - case ABSTRACT_CLASS: - call_type = ASYNC_CALL; - impl_base = true; - (*vars)["abstract_name"] = service_name + "ImplBase"; - break; case ASYNC_CLIENT_IMPL: call_type = ASYNC_CALL; stub_name += "Stub"; @@ -596,6 +582,8 @@ static void PrintStub( case FUTURE_CLIENT_INTERFACE: GRPC_CODEGEN_FAIL << "Intentionally not creating StubType: " << type; break; + case ABSTRACT_CLASS: + GRPC_CODEGEN_FAIL << "Call PrintAbstractClassStub for ABSTRACT_CLASS"; default: GRPC_CODEGEN_FAIL << "Cannot determine class name for StubType: " << type; } @@ -614,11 +602,6 @@ static void PrintStub( *vars, "@$ExperimentalApi$(\"https://github.com/grpc/grpc-java/issues/9702\")\n" "public interface $stub_name$ {\n"); - } else if (impl_base) { - p->Print( - *vars, - "public static abstract class $abstract_name$\n" - " implements $BindableService$, $interface_name$ {\n"); } else { p->Print( *vars, @@ -628,7 +611,7 @@ static void PrintStub( p->Indent(); // Constructor and build() method - if (!impl_base && !interface) { + if (!interface) { p->Print( *vars, "private $stub_name$(\n" @@ -654,9 +637,6 @@ static void PrintStub( // RPC methods for (int i = 0; i < service->method_count(); ++i) { - if (impl_base) { - break; // Interface defines these as defaults, so not needed in abstract - } const MethodDescriptor* method = service->method(i); (*vars)["input_type"] = MessageFullJavaName(method->input_type()); (*vars)["output_type"] = MessageFullJavaName(method->output_type()); @@ -810,15 +790,33 @@ static void PrintStub( p->Print("}\n"); } - if (impl_base) { - p->Print( - *vars, - "\n" - "@$Override$ public final $ServerServiceDefinition$ bindService() {\n" - " return $service_class_name$.bindService(this);\n" - "}\n"); - } + p->Outdent(); + p->Print("}\n\n"); +} + +static void PrintAbstractClassStub( + const ServiceDescriptor* service, + std::map* vars, + Printer* p) { + const std::string service_name = service->name(); + (*vars)["service_name"] = service_name; + + GrpcWriteServiceDocComment(p, service, type); + if (service->options().deprecated()) { + p->Print(*vars, "@$Deprecated$\n"); + } + p->Print( + *vars, + "public static abstract class $service_name$ImplBase\n" + " implements $BindableService$, AsyncService {\n"); + p->Indent(); + p->Print( + *vars, + "\n" + "@$Override$ public final $ServerServiceDefinition$ bindService() {\n" + " return $service_class_name$.bindService(this);\n" + "}\n"); p->Outdent(); p->Print("}\n\n"); } @@ -1180,7 +1178,7 @@ static void PrintService(const ServiceDescriptor* service, p->Print("}\n\n"); PrintStub(service, vars, p, ASYNC_INTERFACE); - PrintStub(service, vars, p, ABSTRACT_CLASS); + PrintAbstractClassStub(service, vars, p); PrintStub(service, vars, p, ASYNC_CLIENT_IMPL); PrintStub(service, vars, p, BLOCKING_CLIENT_IMPL); PrintStub(service, vars, p, FUTURE_CLIENT_IMPL); From 07f8711ad63e08cdb8ed11df6da3182ff027fed4 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Fri, 6 Jan 2023 17:49:13 -0800 Subject: [PATCH 34/42] Fix syntax error --- compiler/src/java_plugin/cpp/java_generator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index fa46c55f474..43849582f7c 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -591,7 +591,7 @@ static void PrintStub( (*vars)["stub_base_class_name"] = (*vars)[stub_base_class_name]; // Class head - GrpcWriteServiceDocComment(p, service, type); + GrpcWriteServiceDocComment(p, service, type); if (service->options().deprecated()) { p->Print(*vars, "@$Deprecated$\n"); @@ -802,7 +802,7 @@ static void PrintAbstractClassStub( const std::string service_name = service->name(); (*vars)["service_name"] = service_name; - GrpcWriteServiceDocComment(p, service, type); + GrpcWriteServiceDocComment(p, service, ABSTRACT_CLASS); if (service->options().deprecated()) { p->Print(*vars, "@$Deprecated$\n"); } From d40354ad77cb186ac0393ec2c2d623d890d35117 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 7 Jan 2023 02:20:13 +0000 Subject: [PATCH 35/42] fix syntax errors --- compiler/src/java_plugin/cpp/java_generator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 43849582f7c..91e0d06d755 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -386,13 +386,13 @@ static void GrpcWriteServiceDocComment(Printer* printer, printer->Print(vars, " * A stub to allow clients to do asynchronous rpc calls to service $service$\n"); break; case BLOCKING_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do synchronous rpc calls to service $service$\n"); + printer->Print(vars, " * A stub to allow clients to do synchronous rpc calls to service $service$\n"); break; case FUTURE_CLIENT_IMPL: - printer->Print(" * A stub to allow clients to do ListenableFuture-style rpc calls to service $service$\n"); + printer->Print(vars, " * A stub to allow clients to do ListenableFuture-style rpc calls to service $service$\n"); break; case ABSTRACT_CLASS: - printer->Print(" * Base class for the server implementation of the service $service$\n"); + printer->Print(vars, " * Base class for the server implementation of the service $service$\n"); break; default: ; // No extra description From 2c1899a0858948384761e1dac486bfc1ac844133 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 7 Jan 2023 02:21:21 +0000 Subject: [PATCH 36/42] regenerate android-interop-testing service files --- .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 1 + .../debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java | 1 + .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 1 + .../testing/integration/XdsUpdateClientConfigureServiceGrpc.java | 1 + .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 + .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java | 1 + .../grpc/io/grpc/testing/integration/TestServiceGrpc.java | 1 + .../io/grpc/testing/integration/UnimplementedServiceGrpc.java | 1 + .../testing/integration/XdsUpdateClientConfigureServiceGrpc.java | 1 + .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 + 14 files changed, 14 insertions(+) diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index b48bba83bfc..7bccbb08fe1 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -127,6 +127,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index a2065aee097..3cc2129f1f6 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,6 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 54ba19f5d40..003f6502265 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -127,6 +127,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 5bdfde9cf9c..c5deec6b22f 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,6 +309,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index d52dcc2558c..f0ea94593bd 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,6 +99,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 55508da6248..bf8b60a5398 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,6 +97,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index a9da1dc8884..105d667f557 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,6 +127,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index b48bba83bfc..7bccbb08fe1 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -127,6 +127,7 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr * A service used to obtain stats for verifying LB behavior. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index a2065aee097..3cc2129f1f6 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -121,6 +121,7 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt /** */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 54ba19f5d40..003f6502265 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -127,6 +127,7 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO * A service used to control reconnect server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java index 5bdfde9cf9c..c5deec6b22f 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -309,6 +309,7 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption * performance with various types of payload. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index d52dcc2558c..f0ea94593bd 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -99,6 +99,7 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C * that case. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java index 55508da6248..bf8b60a5398 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java @@ -97,6 +97,7 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel * A service to dynamically update the configuration of an xDS test client. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java index a9da1dc8884..105d667f557 100644 --- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java +++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java @@ -127,6 +127,7 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc * A service to remotely control health status of an xDS test server. * */ + @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702") public interface AsyncService { /** From abcd5ecb198380a7ac6cd02412439c13beb22626 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Fri, 6 Jan 2023 18:42:33 -0800 Subject: [PATCH 37/42] Address code review comments --- .../src/java_plugin/cpp/java_generator.cpp | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 91e0d06d755..41acbbd7661 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -383,16 +383,16 @@ static void GrpcWriteServiceDocComment(Printer* printer, std::map vars = {{"service", service->name()}}; switch (type) { case ASYNC_CLIENT_IMPL: - printer->Print(vars, " * A stub to allow clients to do asynchronous rpc calls to service $service$\n"); + printer->Print(vars, " * A stub to allow clients to do asynchronous rpc calls to service $service$.\n"); break; case BLOCKING_CLIENT_IMPL: - printer->Print(vars, " * A stub to allow clients to do synchronous rpc calls to service $service$\n"); + printer->Print(vars, " * A stub to allow clients to do synchronous rpc calls to service $service$.\n"); break; case FUTURE_CLIENT_IMPL: - printer->Print(vars, " * A stub to allow clients to do ListenableFuture-style rpc calls to service $service$\n"); + printer->Print(vars, " * A stub to allow clients to do ListenableFuture-style rpc calls to service $service$.\n"); break; case ABSTRACT_CLASS: - printer->Print(vars, " * Base class for the server implementation of the service $service$\n"); + printer->Print(vars, " * Base class for the server implementation of the service $service$.\n"); break; default: ; // No extra description @@ -561,7 +561,7 @@ static void PrintStub( case ASYNC_INTERFACE: call_type = ASYNC_CALL; interface = true; - stub_name = (*vars)["interface_name"]; + stub_name ="AsyncService"; break; case ASYNC_CLIENT_IMPL: call_type = ASYNC_CALL; @@ -809,16 +809,12 @@ static void PrintAbstractClassStub( p->Print( *vars, "public static abstract class $service_name$ImplBase\n" - " implements $BindableService$, AsyncService {\n"); - p->Indent(); - p->Print( - *vars, + " implements $BindableService$, AsyncService {\n" "\n" - "@$Override$ public final $ServerServiceDefinition$ bindService() {\n" - " return $service_class_name$.bindService(this);\n" - "}\n"); - p->Outdent(); - p->Print("}\n\n"); + " @$Override$ public final $ServerServiceDefinition$ bindService() {\n" + " return $service_class_name$.bindService(this);\n" + " }\n" + "}\n\n"); } static bool CompareMethodClientStreaming(const MethodDescriptor* method1, @@ -855,10 +851,10 @@ static void PrintMethodHandlerClass(const ServiceDescriptor* service, " io.grpc.stub.ServerCalls.ServerStreamingMethod,\n" " io.grpc.stub.ServerCalls.ClientStreamingMethod,\n" " io.grpc.stub.ServerCalls.BidiStreamingMethod {\n" - " private final $interface_name$ serviceImpl;\n" + " private final AsyncService serviceImpl;\n" " private final int methodId;\n" "\n" - " MethodHandlers($interface_name$ serviceImpl, int methodId) {\n" + " MethodHandlers(AsyncService serviceImpl, int methodId) {\n" " this.serviceImpl = serviceImpl;\n" " this.methodId = methodId;\n" " }\n\n"); @@ -1041,7 +1037,7 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service, (*vars)["service_name"] = service->name(); p->Print(*vars, "public static final io.grpc.ServerServiceDefinition " - "bindService($interface_name$ service) {\n"); + "bindService(AsyncService service) {\n"); p->Indent(); p->Print(*vars, @@ -1237,8 +1233,6 @@ void GenerateService(const ServiceDescriptor* service, vars["ListenableFuture"] = "com.google.common.util.concurrent.ListenableFuture"; - vars["interface_name"] = "AsyncService"; - Printer printer(out, '$'); std::string package_name = ServiceJavaPackage(service->file()); if (!package_name.empty()) { From a7ba9fd734d7b772397964ab83b34f29da9dfc18 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Sat, 7 Jan 2023 03:02:34 +0000 Subject: [PATCH 38/42] Regenerated with period at end of method descriptions --- .../grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java | 8 ++++---- .../testing/integration/LoadBalancerStatsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/MetricsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/ReconnectServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/testing/integration/TestServiceGrpc.java | 8 ++++---- .../testing/integration/UnimplementedServiceGrpc.java | 8 ++++---- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 8 ++++---- .../testing/integration/XdsUpdateHealthServiceGrpc.java | 8 ++++---- .../testing/integration/LoadBalancerStatsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/MetricsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/ReconnectServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/testing/integration/TestServiceGrpc.java | 8 ++++---- .../testing/integration/UnimplementedServiceGrpc.java | 8 ++++---- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 8 ++++---- .../testing/integration/XdsUpdateHealthServiceGrpc.java | 8 ++++---- .../io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java | 8 ++++---- .../benchmarks/proto/ReportQpsScenarioServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java | 8 ++++---- compiler/src/test/golden/TestDeprecatedService.java.txt | 8 ++++---- compiler/src/test/golden/TestService.java.txt | 8 ++++---- .../src/testLite/golden/TestDeprecatedService.java.txt | 8 ++++---- compiler/src/testLite/golden/TestService.java.txt | 8 ++++---- .../main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 8 ++++---- .../testing/integration/LoadBalancerStatsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/MetricsServiceGrpc.java | 8 ++++---- .../io/grpc/testing/integration/ReconnectServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/testing/integration/TestServiceGrpc.java | 8 ++++---- .../testing/integration/UnimplementedServiceGrpc.java | 8 ++++---- .../integration/XdsUpdateClientConfigureServiceGrpc.java | 8 ++++---- .../testing/integration/XdsUpdateHealthServiceGrpc.java | 8 ++++---- .../main/grpc/io/istio/test/EchoTestServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java | 8 ++++---- .../main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java | 8 ++++---- .../generated/main/grpc/io/grpc/health/v1/HealthGrpc.java | 8 ++++---- .../io/grpc/reflection/v1alpha/ServerReflectionGrpc.java | 8 ++++---- .../reflection/testing/AnotherDynamicServiceGrpc.java | 8 ++++---- .../reflection/testing/AnotherReflectableServiceGrpc.java | 8 ++++---- .../io/grpc/reflection/testing/DynamicServiceGrpc.java | 8 ++++---- .../grpc/reflection/testing/ReflectableServiceGrpc.java | 8 ++++---- .../grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java | 8 ++++---- .../github/xds/service/orca/v3/OpenRcaServiceGrpc.java | 8 ++++---- .../envoy/api/v2/ClusterDiscoveryServiceGrpc.java | 8 ++++---- .../envoy/api/v2/EndpointDiscoveryServiceGrpc.java | 8 ++++---- .../envoy/api/v2/ListenerDiscoveryServiceGrpc.java | 8 ++++---- .../envoy/api/v2/RouteDiscoveryServiceGrpc.java | 8 ++++---- .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java | 8 ++++---- .../envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java | 8 ++++---- .../discovery/v2/AggregatedDiscoveryServiceGrpc.java | 8 ++++---- .../service/discovery/v2/SecretDiscoveryServiceGrpc.java | 8 ++++---- .../discovery/v3/AggregatedDiscoveryServiceGrpc.java | 8 ++++---- .../service/load_stats/v2/LoadReportingServiceGrpc.java | 8 ++++---- .../service/load_stats/v3/LoadReportingServiceGrpc.java | 8 ++++---- .../status/v3/ClientStatusDiscoveryServiceGrpc.java | 8 ++++---- 53 files changed, 212 insertions(+), 212 deletions(-) diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java index 867eee00cf7..ee636382f47 100644 --- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java +++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java @@ -112,7 +112,7 @@ default io.grpc.stub.StreamObserver doHands } /** - * Base class for the server implementation of the service HandshakerService + * Base class for the server implementation of the service HandshakerService. */ public static abstract class HandshakerServiceImplBase implements io.grpc.BindableService, AsyncService { @@ -123,7 +123,7 @@ public static abstract class HandshakerServiceImplBase } /** - * A stub to allow clients to do asynchronous rpc calls to service HandshakerService + * A stub to allow clients to do asynchronous rpc calls to service HandshakerService. */ public static final class HandshakerServiceStub extends io.grpc.stub.AbstractAsyncStub { @@ -156,7 +156,7 @@ public io.grpc.stub.StreamObserver doHandsh } /** - * A stub to allow clients to do synchronous rpc calls to service HandshakerService + * A stub to allow clients to do synchronous rpc calls to service HandshakerService. */ public static final class HandshakerServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { @@ -173,7 +173,7 @@ protected HandshakerServiceBlockingStub build( } /** - * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService + * A stub to allow clients to do ListenableFuture-style rpc calls to service HandshakerService. */ public static final class HandshakerServiceFutureStub extends io.grpc.stub.AbstractFutureStub { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java index 7bccbb08fe1..e4fbe9c38a3 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java @@ -152,7 +152,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load } /** - * Base class for the server implementation of the service LoadBalancerStatsService + * Base class for the server implementation of the service LoadBalancerStatsService. * 
    * A service used to obtain stats for verifying LB behavior.
    *
@@ -166,7 +166,7 @@ public static abstract class LoadBalancerStatsServiceImplBase } /** - * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService + * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService. * 
    * A service used to obtain stats for verifying LB behavior.
    *
@@ -208,7 +208,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB } /** - * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService + * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService. * 
    * A service used to obtain stats for verifying LB behavior.
    *
@@ -248,7 +248,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse } /** - * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService + * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService. * 
    * A service used to obtain stats for verifying LB behavior.
    *
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index 3cc2129f1f6..0546a363ce2 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -147,7 +147,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } /** - * Base class for the server implementation of the service MetricsService + * Base class for the server implementation of the service MetricsService. */ public static abstract class MetricsServiceImplBase implements io.grpc.BindableService, AsyncService { @@ -158,7 +158,7 @@ public static abstract class MetricsServiceImplBase } /** - * A stub to allow clients to do asynchronous rpc calls to service MetricsService + * A stub to allow clients to do asynchronous rpc calls to service MetricsService. */ public static final class MetricsServiceStub extends io.grpc.stub.AbstractAsyncStub { @@ -198,7 +198,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request, } /** - * A stub to allow clients to do synchronous rpc calls to service MetricsService + * A stub to allow clients to do synchronous rpc calls to service MetricsService. */ public static final class MetricsServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { @@ -237,7 +237,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin } /** - * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService + * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService. */ public static final class MetricsServiceFutureStub extends io.grpc.stub.AbstractFutureStub { diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 003f6502265..c23873b2284 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -146,7 +146,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } /** - * Base class for the server implementation of the service ReconnectService + * Base class for the server implementation of the service ReconnectService. * 
    * A service used to control reconnect server.
    *
@@ -160,7 +160,7 @@ public static abstract class ReconnectServiceImplBase } /** - * A stub to allow clients to do asynchronous rpc calls to service ReconnectService + * A stub to allow clients to do asynchronous rpc calls to service ReconnectService. * 
    * A service used to control reconnect server.
    *
@@ -196,7 +196,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, } /** - * A stub to allow clients to do synchronous rpc calls to service ReconnectService + * A stub to allow clients to do synchronous rpc calls to service ReconnectService. * 
    * A service used to control reconnect server.
    *
@@ -230,7 +230,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i } /** - * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService + * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService. * 
    * A service used to control reconnect server.
    *
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java index c5deec6b22f..bdf7a5220e8 100644 --- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -404,7 +404,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req } /** - * Base class for the server implementation of the service TestService + * Base class for the server implementation of the service TestService. * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -419,7 +419,7 @@ public static abstract class TestServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestService
+   * A stub to allow clients to do asynchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -538,7 +538,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestService
+   * A stub to allow clients to do synchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -614,7 +614,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index f0ea94593bd..af9ebe7d12d 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -114,7 +114,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
   }
 
   /**
-   * Base class for the server implementation of the service UnimplementedService
+   * Base class for the server implementation of the service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -129,7 +129,7 @@ public static abstract class UnimplementedServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -161,7 +161,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -192,7 +192,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index bf8b60a5398..ca3fb342ef4 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -112,7 +112,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateClientConfigureService
+   * Base class for the server implementation of the service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -126,7 +126,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -157,7 +157,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -187,7 +187,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index 105d667f557..eb1713cbcb5 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -146,7 +146,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateHealthService
+   * Base class for the server implementation of the service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -160,7 +160,7 @@ public static abstract class XdsUpdateHealthServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -196,7 +196,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -230,7 +230,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 7bccbb08fe1..e4fbe9c38a3 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -152,7 +152,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
   }
 
   /**
-   * Base class for the server implementation of the service LoadBalancerStatsService
+   * Base class for the server implementation of the service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -166,7 +166,7 @@ public static abstract class LoadBalancerStatsServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -208,7 +208,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -248,7 +248,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 3cc2129f1f6..0546a363ce2 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -147,7 +147,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service MetricsService
+   * Base class for the server implementation of the service MetricsService.
    */
   public static abstract class MetricsServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -158,7 +158,7 @@ public static abstract class MetricsServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service MetricsService
+   * A stub to allow clients to do asynchronous rpc calls to service MetricsService.
    */
   public static final class MetricsServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -198,7 +198,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service MetricsService
+   * A stub to allow clients to do synchronous rpc calls to service MetricsService.
    */
   public static final class MetricsServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -237,7 +237,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService.
    */
   public static final class MetricsServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index 003f6502265..c23873b2284 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -146,7 +146,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * Base class for the server implementation of the service ReconnectService
+   * Base class for the server implementation of the service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -160,7 +160,7 @@ public static abstract class ReconnectServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ReconnectService
+   * A stub to allow clients to do asynchronous rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -196,7 +196,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ReconnectService
+   * A stub to allow clients to do synchronous rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -230,7 +230,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index c5deec6b22f..bdf7a5220e8 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -404,7 +404,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
   }
 
   /**
-   * Base class for the server implementation of the service TestService
+   * Base class for the server implementation of the service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -419,7 +419,7 @@ public static abstract class TestServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestService
+   * A stub to allow clients to do asynchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -538,7 +538,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestService
+   * A stub to allow clients to do synchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -614,7 +614,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index f0ea94593bd..af9ebe7d12d 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -114,7 +114,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
   }
 
   /**
-   * Base class for the server implementation of the service UnimplementedService
+   * Base class for the server implementation of the service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -129,7 +129,7 @@ public static abstract class UnimplementedServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -161,7 +161,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -192,7 +192,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index bf8b60a5398..ca3fb342ef4 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -112,7 +112,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateClientConfigureService
+   * Base class for the server implementation of the service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -126,7 +126,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -157,7 +157,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -187,7 +187,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index 105d667f557..eb1713cbcb5 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -146,7 +146,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateHealthService
+   * Base class for the server implementation of the service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -160,7 +160,7 @@ public static abstract class XdsUpdateHealthServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -196,7 +196,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -230,7 +230,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
index 9238c213143..4752ab7eede 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@@ -277,7 +277,7 @@ default io.grpc.stub.StreamObserver {
@@ -366,7 +366,7 @@ public io.grpc.stub.StreamObserver {
@@ -406,7 +406,7 @@ public java.util.Iterator stre
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service BenchmarkService.
    */
   public static final class BenchmarkServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
index 83e3de1267d..3ecdfdf2d0a 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
@@ -107,7 +107,7 @@ default void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult requ
   }
 
   /**
-   * Base class for the server implementation of the service ReportQpsScenarioService
+   * Base class for the server implementation of the service ReportQpsScenarioService.
    */
   public static abstract class ReportQpsScenarioServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -118,7 +118,7 @@ public static abstract class ReportQpsScenarioServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService
+   * A stub to allow clients to do asynchronous rpc calls to service ReportQpsScenarioService.
    */
   public static final class ReportQpsScenarioServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -146,7 +146,7 @@ public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult reque
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService
+   * A stub to allow clients to do synchronous rpc calls to service ReportQpsScenarioService.
    */
   public static final class ReportQpsScenarioServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -173,7 +173,7 @@ public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.p
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReportQpsScenarioService.
    */
   public static final class ReportQpsScenarioServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
index 6edbfc705e3..8072dece367 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@@ -240,7 +240,7 @@ default void quitWorker(io.grpc.benchmarks.proto.Control.Void request,
   }
 
   /**
-   * Base class for the server implementation of the service WorkerService
+   * Base class for the server implementation of the service WorkerService.
    */
   public static abstract class WorkerServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -251,7 +251,7 @@ public static abstract class WorkerServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service WorkerService
+   * A stub to allow clients to do asynchronous rpc calls to service WorkerService.
    */
   public static final class WorkerServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -322,7 +322,7 @@ public void quitWorker(io.grpc.benchmarks.proto.Control.Void request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service WorkerService
+   * A stub to allow clients to do synchronous rpc calls to service WorkerService.
    */
   public static final class WorkerServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -359,7 +359,7 @@ public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service WorkerService.
    */
   public static final class WorkerServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt
index 1f5613ff7c0..651ace5413b 100644
--- a/compiler/src/test/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/test/golden/TestDeprecatedService.java.txt
@@ -116,7 +116,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * Base class for the server implementation of the service TestDeprecatedService
+   * Base class for the server implementation of the service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -131,7 +131,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -164,7 +164,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -196,7 +196,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
index 1b091c058cf..4cdbdb466c9 100644
--- a/compiler/src/test/golden/TestService.java.txt
+++ b/compiler/src/test/golden/TestService.java.txt
@@ -411,7 +411,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * Base class for the server implementation of the service TestService
+   * Base class for the server implementation of the service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -425,7 +425,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestService
+   * A stub to allow clients to do asynchronous rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -542,7 +542,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestService
+   * A stub to allow clients to do synchronous rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -605,7 +605,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
index 621cad89256..41ab122e623 100644
--- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
@@ -115,7 +115,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * Base class for the server implementation of the service TestDeprecatedService
+   * Base class for the server implementation of the service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -130,7 +130,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do asynchronous rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -163,7 +163,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do synchronous rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

@@ -195,7 +195,7 @@ public final class TestDeprecatedServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestDeprecatedService.
    * 
    * Test service that has been deprecated and should generate with Java's @Deprecated annotation
    * 

diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index 59e5e6209b4..d9260211981 100644
--- a/compiler/src/testLite/golden/TestService.java.txt
+++ b/compiler/src/testLite/golden/TestService.java.txt
@@ -403,7 +403,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * Base class for the server implementation of the service TestService
+   * Base class for the server implementation of the service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -417,7 +417,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestService
+   * A stub to allow clients to do asynchronous rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -534,7 +534,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestService
+   * A stub to allow clients to do synchronous rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

@@ -597,7 +597,7 @@ public final class TestServiceGrpc {
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService.
    * 
    * Test service that supports all call types.
    * 

diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
index dca98ac214b..b7e1b55b82e 100644
--- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
@@ -107,7 +107,7 @@ default io.grpc.stub.StreamObserver balanceLoa
   }
 
   /**
-   * Base class for the server implementation of the service LoadBalancer
+   * Base class for the server implementation of the service LoadBalancer.
    */
   public static abstract class LoadBalancerImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -118,7 +118,7 @@ public static abstract class LoadBalancerImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer
+   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancer.
    */
   public static final class LoadBalancerStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -146,7 +146,7 @@ public io.grpc.stub.StreamObserver balanceLoad
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service LoadBalancer
+   * A stub to allow clients to do synchronous rpc calls to service LoadBalancer.
    */
   public static final class LoadBalancerBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -163,7 +163,7 @@ protected LoadBalancerBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancer.
    */
   public static final class LoadBalancerFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 01b52f7e4db..91e95f0dab8 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -154,7 +154,7 @@ default void getClientAccumulatedStats(io.grpc.testing.integration.Messages.Load
   }
 
   /**
-   * Base class for the server implementation of the service LoadBalancerStatsService
+   * Base class for the server implementation of the service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -168,7 +168,7 @@ public static abstract class LoadBalancerStatsServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do asynchronous rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -210,7 +210,7 @@ public void getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadB
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do synchronous rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

@@ -250,7 +250,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadBalancerStatsService.
    * 
    * A service used to obtain stats for verifying LB behavior.
    * 

diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 0ee520fe5a8..9a7796daa1b 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -149,7 +149,7 @@ default void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service MetricsService
+   * Base class for the server implementation of the service MetricsService.
    */
   public static abstract class MetricsServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -160,7 +160,7 @@ public static abstract class MetricsServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service MetricsService
+   * A stub to allow clients to do asynchronous rpc calls to service MetricsService.
    */
   public static final class MetricsServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -200,7 +200,7 @@ public void getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service MetricsService
+   * A stub to allow clients to do synchronous rpc calls to service MetricsService.
    */
   public static final class MetricsServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -239,7 +239,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service MetricsService.
    */
   public static final class MetricsServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index d3c616fbe45..3c3b74b2edd 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -148,7 +148,7 @@ default void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * Base class for the server implementation of the service ReconnectService
+   * Base class for the server implementation of the service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -162,7 +162,7 @@ public static abstract class ReconnectServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ReconnectService
+   * A stub to allow clients to do asynchronous rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -198,7 +198,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ReconnectService
+   * A stub to allow clients to do synchronous rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

@@ -232,7 +232,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReconnectService.
    * 
    * A service used to control reconnect server.
    * 

diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index 87935556a9d..550d65e8e39 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -412,7 +412,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
   }
 
   /**
-   * Base class for the server implementation of the service TestService
+   * Base class for the server implementation of the service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -427,7 +427,7 @@ public static abstract class TestServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service TestService
+   * A stub to allow clients to do asynchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -546,7 +546,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service TestService
+   * A stub to allow clients to do synchronous rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
@@ -622,7 +622,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service TestService.
    * 
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index 6fae4389988..2f0b44a3719 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -115,7 +115,7 @@ default void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty req
   }
 
   /**
-   * Base class for the server implementation of the service UnimplementedService
+   * Base class for the server implementation of the service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -130,7 +130,7 @@ public static abstract class UnimplementedServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do asynchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -162,7 +162,7 @@ public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty requ
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService
+   * A stub to allow clients to do synchronous rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
@@ -193,7 +193,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service UnimplementedService.
    * 
    * A simple service NOT implemented at servers so clients can test for
    * that case.
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index 61a5d36638e..a6c95e5a02e 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -113,7 +113,7 @@ default void configure(io.grpc.testing.integration.Messages.ClientConfigureReque
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateClientConfigureService
+   * Base class for the server implementation of the service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -127,7 +127,7 @@ public static abstract class XdsUpdateClientConfigureServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -158,7 +158,7 @@ public void configure(io.grpc.testing.integration.Messages.ClientConfigureReques
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

@@ -188,7 +188,7 @@ public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateClientConfigureService.
    * 
    * A service to dynamically update the configuration of an xDS test client.
    * 

diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index 70359698de2..68596cce077 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -148,7 +148,7 @@ default void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request
   }
 
   /**
-   * Base class for the server implementation of the service XdsUpdateHealthService
+   * Base class for the server implementation of the service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -162,7 +162,7 @@ public static abstract class XdsUpdateHealthServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do asynchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -198,7 +198,7 @@ public void setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do synchronous rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

@@ -232,7 +232,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testi
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service XdsUpdateHealthService.
    * 
    * A service to remotely control health status of an xDS test server.
    * 

diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
index e1c678b5a70..b7968b2d43d 100644
--- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
+++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
@@ -142,7 +142,7 @@ default void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service EchoTestService
+   * Base class for the server implementation of the service EchoTestService.
    */
   public static abstract class EchoTestServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -153,7 +153,7 @@ public static abstract class EchoTestServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service EchoTestService
+   * A stub to allow clients to do asynchronous rpc calls to service EchoTestService.
    */
   public static final class EchoTestServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -186,7 +186,7 @@ public void forwardEcho(io.istio.test.Echo.ForwardEchoRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service EchoTestService
+   * A stub to allow clients to do synchronous rpc calls to service EchoTestService.
    */
   public static final class EchoTestServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -217,7 +217,7 @@ public io.istio.test.Echo.ForwardEchoResponse forwardEcho(io.istio.test.Echo.For
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service EchoTestService.
    */
   public static final class EchoTestServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
index 456509873da..ab3f97155cd 100644
--- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
+++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
@@ -107,7 +107,7 @@ default void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service RouteLookupService
+   * Base class for the server implementation of the service RouteLookupService.
    */
   public static abstract class RouteLookupServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -118,7 +118,7 @@ public static abstract class RouteLookupServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService
+   * A stub to allow clients to do asynchronous rpc calls to service RouteLookupService.
    */
   public static final class RouteLookupServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -146,7 +146,7 @@ public void routeLookup(io.grpc.lookup.v1.RouteLookupRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service RouteLookupService
+   * A stub to allow clients to do synchronous rpc calls to service RouteLookupService.
    */
   public static final class RouteLookupServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -173,7 +173,7 @@ public io.grpc.lookup.v1.RouteLookupResponse routeLookup(io.grpc.lookup.v1.Route
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteLookupService.
    */
   public static final class RouteLookupServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
index ae36c6699dc..2e47e3dd3dd 100644
--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@@ -362,7 +362,7 @@ default void getSocket(io.grpc.channelz.v1.GetSocketRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service Channelz
+   * Base class for the server implementation of the service Channelz.
    * 
    * Channelz is a service exposed by gRPC servers that provides detailed debug
    * information.
@@ -377,7 +377,7 @@ public static abstract class ChannelzImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service Channelz
+   * A stub to allow clients to do asynchronous rpc calls to service Channelz.
    * 
    * Channelz is a service exposed by gRPC servers that provides detailed debug
    * information.
@@ -476,7 +476,7 @@ public void getSocket(io.grpc.channelz.v1.GetSocketRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service Channelz
+   * A stub to allow clients to do synchronous rpc calls to service Channelz.
    * 
    * Channelz is a service exposed by gRPC servers that provides detailed debug
    * information.
@@ -568,7 +568,7 @@ public io.grpc.channelz.v1.GetSocketResponse getSocket(io.grpc.channelz.v1.GetSo
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service Channelz
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service Channelz.
    * 
    * Channelz is a service exposed by gRPC servers that provides detailed debug
    * information.
diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
index 88372e9811f..e1af9c96936 100644
--- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
@@ -161,7 +161,7 @@ default void watch(io.grpc.health.v1.HealthCheckRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service Health
+   * Base class for the server implementation of the service Health.
    */
   public static abstract class HealthImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -172,7 +172,7 @@ public static abstract class HealthImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service Health
+   * A stub to allow clients to do asynchronous rpc calls to service Health.
    */
   public static final class HealthStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -224,7 +224,7 @@ public void watch(io.grpc.health.v1.HealthCheckRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service Health
+   * A stub to allow clients to do synchronous rpc calls to service Health.
    */
   public static final class HealthBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -275,7 +275,7 @@ public java.util.Iterator watch(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service Health
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service Health.
    */
   public static final class HealthFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
index a26fd1a36ab..2f6c295b31f 100644
--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@@ -108,7 +108,7 @@ default io.grpc.stub.StreamObserver {
@@ -148,7 +148,7 @@ public io.grpc.stub.StreamObserver {
@@ -165,7 +165,7 @@ protected ServerReflectionBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ServerReflection.
    */
   public static final class ServerReflectionFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
index f89a936046b..d9b0c7189ab 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@@ -113,7 +113,7 @@ default void method(io.grpc.reflection.testing.DynamicRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service AnotherDynamicService
+   * Base class for the server implementation of the service AnotherDynamicService.
    * 
    * AnotherDynamicService
    * 

@@ -127,7 +127,7 @@ public static abstract class AnotherDynamicServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service AnotherDynamicService
+   * A stub to allow clients to do asynchronous rpc calls to service AnotherDynamicService.
    * 
    * AnotherDynamicService
    * 

@@ -158,7 +158,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service AnotherDynamicService
+   * A stub to allow clients to do synchronous rpc calls to service AnotherDynamicService.
    * 
    * AnotherDynamicService
    * 

@@ -188,7 +188,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherDynamicService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherDynamicService.
    * 
    * AnotherDynamicService
    * 

diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
index 0e1289d9f3a..b66a0d78feb 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
@@ -104,7 +104,7 @@ default void method(io.grpc.reflection.testing.Request request,
   }
 
   /**
-   * Base class for the server implementation of the service AnotherReflectableService
+   * Base class for the server implementation of the service AnotherReflectableService.
    */
   public static abstract class AnotherReflectableServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -115,7 +115,7 @@ public static abstract class AnotherReflectableServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService
+   * A stub to allow clients to do asynchronous rpc calls to service AnotherReflectableService.
    */
   public static final class AnotherReflectableServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -140,7 +140,7 @@ public void method(io.grpc.reflection.testing.Request request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService
+   * A stub to allow clients to do synchronous rpc calls to service AnotherReflectableService.
    */
   public static final class AnotherReflectableServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -164,7 +164,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service AnotherReflectableService.
    */
   public static final class AnotherReflectableServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
index 5b88ebe1cc4..cb3ebf787ca 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@@ -113,7 +113,7 @@ default void method(io.grpc.reflection.testing.DynamicRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service DynamicService
+   * Base class for the server implementation of the service DynamicService.
    * 
    * A DynamicService
    * 

@@ -127,7 +127,7 @@ public static abstract class DynamicServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service DynamicService
+   * A stub to allow clients to do asynchronous rpc calls to service DynamicService.
    * 
    * A DynamicService
    * 

@@ -158,7 +158,7 @@ public void method(io.grpc.reflection.testing.DynamicRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service DynamicService
+   * A stub to allow clients to do synchronous rpc calls to service DynamicService.
    * 
    * A DynamicService
    * 

@@ -188,7 +188,7 @@ public io.grpc.reflection.testing.DynamicReply method(io.grpc.reflection.testing
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service DynamicService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service DynamicService.
    * 
    * A DynamicService
    * 

diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
index 96b679441cd..9109e8d0ad8 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
@@ -104,7 +104,7 @@ default void method(io.grpc.reflection.testing.Request request,
   }
 
   /**
-   * Base class for the server implementation of the service ReflectableService
+   * Base class for the server implementation of the service ReflectableService.
    */
   public static abstract class ReflectableServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -115,7 +115,7 @@ public static abstract class ReflectableServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ReflectableService
+   * A stub to allow clients to do asynchronous rpc calls to service ReflectableService.
    */
   public static final class ReflectableServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -140,7 +140,7 @@ public void method(io.grpc.reflection.testing.Request request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ReflectableService
+   * A stub to allow clients to do synchronous rpc calls to service ReflectableService.
    */
   public static final class ReflectableServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -164,7 +164,7 @@ public io.grpc.reflection.testing.Reply method(io.grpc.reflection.testing.Reques
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ReflectableService.
    */
   public static final class ReflectableServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
index fce0f775422..c7922f77d36 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
@@ -236,7 +236,7 @@ default io.grpc.stub.StreamObserver bidi
   }
 
   /**
-   * Base class for the server implementation of the service SimpleService
+   * Base class for the server implementation of the service SimpleService.
    * 
    * A simple service for test.
    * 

@@ -250,7 +250,7 @@ public static abstract class SimpleServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service SimpleService
+   * A stub to allow clients to do asynchronous rpc calls to service SimpleService.
    * 
    * A simple service for test.
    * 

@@ -314,7 +314,7 @@ public io.grpc.stub.StreamObserver bidiS
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service SimpleService
+   * A stub to allow clients to do synchronous rpc calls to service SimpleService.
    * 
    * A simple service for test.
    * 

@@ -355,7 +355,7 @@ public java.util.Iterator serverStreami
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service SimpleService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service SimpleService.
    * 
    * A simple service for test.
    * 

diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
index e60dfbd5e3d..dace161cdba 100644
--- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
@@ -124,7 +124,7 @@ default void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportRequ
   }
 
   /**
-   * Base class for the server implementation of the service OpenRcaService
+   * Base class for the server implementation of the service OpenRcaService.
    * 
    * Out-of-band (OOB) load reporting service for the additional load reporting
    * agent that does not sit in the request path. Reports are periodically sampled
@@ -145,7 +145,7 @@ public static abstract class OpenRcaServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service OpenRcaService
+   * A stub to allow clients to do asynchronous rpc calls to service OpenRcaService.
    * 
    * Out-of-band (OOB) load reporting service for the additional load reporting
    * agent that does not sit in the request path. Reports are periodically sampled
@@ -180,7 +180,7 @@ public void streamCoreMetrics(com.github.xds.service.orca.v3.OrcaLoadReportReque
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service OpenRcaService
+   * A stub to allow clients to do synchronous rpc calls to service OpenRcaService.
    * 
    * Out-of-band (OOB) load reporting service for the additional load reporting
    * agent that does not sit in the request path. Reports are periodically sampled
@@ -215,7 +215,7 @@ public java.util.Iterator streamCore
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service OpenRcaService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service OpenRcaService.
    * 
    * Out-of-band (OOB) load reporting service for the additional load reporting
    * agent that does not sit in the request path. Reports are periodically sampled
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
index 8b77f9e7914..10b83c60a03 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
@@ -186,7 +186,7 @@ default void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service ClusterDiscoveryService
+   * Base class for the server implementation of the service ClusterDiscoveryService.
    * 
    * Return list of all clusters this proxy will load balance to.
    * 

@@ -200,7 +200,7 @@ public static abstract class ClusterDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ClusterDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service ClusterDiscoveryService.
    * 
    * Return list of all clusters this proxy will load balance to.
    * 

@@ -244,7 +244,7 @@ public void fetchClusters(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ClusterDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service ClusterDiscoveryService.
    * 
    * Return list of all clusters this proxy will load balance to.
    * 

@@ -271,7 +271,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchClusters(io.envoyproxy.
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ClusterDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ClusterDiscoveryService.
    * 
    * Return list of all clusters this proxy will load balance to.
    * 

diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
index c66ff4e5815..55d1b7ed90d 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
@@ -184,7 +184,7 @@ default void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service EndpointDiscoveryService
+   * Base class for the server implementation of the service EndpointDiscoveryService.
    */
   public static abstract class EndpointDiscoveryServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -195,7 +195,7 @@ public static abstract class EndpointDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service EndpointDiscoveryService.
    */
   public static final class EndpointDiscoveryServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -240,7 +240,7 @@ public void fetchEndpoints(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service EndpointDiscoveryService.
    */
   public static final class EndpointDiscoveryServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -264,7 +264,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchEndpoints(io.envoyproxy
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service EndpointDiscoveryService.
    */
   public static final class EndpointDiscoveryServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
index 2973c5de4f2..a391d4a4703 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
@@ -192,7 +192,7 @@ default void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service ListenerDiscoveryService
+   * Base class for the server implementation of the service ListenerDiscoveryService.
    * 
    * The Envoy instance initiates an RPC at startup to discover a list of
    * listeners. Updates are delivered via streaming from the LDS server and
@@ -209,7 +209,7 @@ public static abstract class ListenerDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ListenerDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service ListenerDiscoveryService.
    * 
    * The Envoy instance initiates an RPC at startup to discover a list of
    * listeners. Updates are delivered via streaming from the LDS server and
@@ -256,7 +256,7 @@ public void fetchListeners(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ListenerDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service ListenerDiscoveryService.
    * 
    * The Envoy instance initiates an RPC at startup to discover a list of
    * listeners. Updates are delivered via streaming from the LDS server and
@@ -286,7 +286,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchListeners(io.envoyproxy
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ListenerDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ListenerDiscoveryService.
    * 
    * The Envoy instance initiates an RPC at startup to discover a list of
    * listeners. Updates are delivered via streaming from the LDS server and
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
index 227dc856010..153e70a842d 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
@@ -194,7 +194,7 @@ default void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service RouteDiscoveryService
+   * Base class for the server implementation of the service RouteDiscoveryService.
    * 
    * The resource_names field in DiscoveryRequest specifies a route configuration.
    * This allows an Envoy configuration with multiple HTTP listeners (and
@@ -212,7 +212,7 @@ public static abstract class RouteDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service RouteDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service RouteDiscoveryService.
    * 
    * The resource_names field in DiscoveryRequest specifies a route configuration.
    * This allows an Envoy configuration with multiple HTTP listeners (and
@@ -260,7 +260,7 @@ public void fetchRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service RouteDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service RouteDiscoveryService.
    * 
    * The resource_names field in DiscoveryRequest specifies a route configuration.
    * This allows an Envoy configuration with multiple HTTP listeners (and
@@ -291,7 +291,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchRoutes(io.envoyproxy.en
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service RouteDiscoveryService.
    * 
    * The resource_names field in DiscoveryRequest specifies a route configuration.
    * This allows an Envoy configuration with multiple HTTP listeners (and
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
index db6d4e08e8a..23d2bf8f571 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
@@ -198,7 +198,7 @@ default void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reque
   }
 
   /**
-   * Base class for the server implementation of the service ScopedRoutesDiscoveryService
+   * Base class for the server implementation of the service ScopedRoutesDiscoveryService.
    * 
    * The Scoped Routes Discovery Service (SRDS) API distributes
    * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
@@ -218,7 +218,7 @@ public static abstract class ScopedRoutesDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ScopedRoutesDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service ScopedRoutesDiscoveryService.
    * 
    * The Scoped Routes Discovery Service (SRDS) API distributes
    * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
@@ -268,7 +268,7 @@ public void fetchScopedRoutes(io.envoyproxy.envoy.api.v2.DiscoveryRequest reques
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ScopedRoutesDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service ScopedRoutesDiscoveryService.
    * 
    * The Scoped Routes Discovery Service (SRDS) API distributes
    * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
@@ -301,7 +301,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchScopedRoutes(io.envoypr
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ScopedRoutesDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ScopedRoutesDiscoveryService.
    * 
    * The Scoped Routes Discovery Service (SRDS) API distributes
    * :ref:`ScopedRouteConfiguration<envoy_api_msg.ScopedRouteConfiguration>`
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
index 731d77ab863..0af457edaa9 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
@@ -128,7 +128,7 @@ default io.grpc.stub.StreamObserver
    * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
    * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
@@ -151,7 +151,7 @@ public static abstract class VirtualHostDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service VirtualHostDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service VirtualHostDiscoveryService.
    * 
    * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
    * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
@@ -188,7 +188,7 @@ public io.grpc.stub.StreamObserver
    * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
    * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
@@ -217,7 +217,7 @@ protected VirtualHostDiscoveryServiceBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service VirtualHostDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service VirtualHostDiscoveryService.
    * 
    * Virtual Host Discovery Service (VHDS) is used to dynamically update the list of virtual hosts for
    * a given RouteConfiguration. If VHDS is configured a virtual host list update will be triggered
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
index 166971a5a0e..d63c8c9cc75 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
@@ -161,7 +161,7 @@ default io.grpc.stub.StreamObserver
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -180,7 +180,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service AggregatedDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service AggregatedDiscoveryService.
    * 
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -224,7 +224,7 @@ public io.grpc.stub.StreamObserver
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -249,7 +249,7 @@ protected AggregatedDiscoveryServiceBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService.
    * 
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
index fdc9b4e8594..9d835aef84a 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
@@ -180,7 +180,7 @@ default void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * Base class for the server implementation of the service SecretDiscoveryService
+   * Base class for the server implementation of the service SecretDiscoveryService.
    */
   public static abstract class SecretDiscoveryServiceImplBase
       implements io.grpc.BindableService, AsyncService {
@@ -191,7 +191,7 @@ public static abstract class SecretDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service SecretDiscoveryService.
    */
   public static final class SecretDiscoveryServiceStub
       extends io.grpc.stub.AbstractAsyncStub {
@@ -232,7 +232,7 @@ public void fetchSecrets(io.envoyproxy.envoy.api.v2.DiscoveryRequest request,
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service SecretDiscoveryService.
    */
   public static final class SecretDiscoveryServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub {
@@ -256,7 +256,7 @@ public io.envoyproxy.envoy.api.v2.DiscoveryResponse fetchSecrets(io.envoyproxy.e
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service SecretDiscoveryService.
    */
   public static final class SecretDiscoveryServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
index 6f7f95c3b3e..786fdafbadf 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
@@ -161,7 +161,7 @@ default io.grpc.stub.StreamObserver
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -180,7 +180,7 @@ public static abstract class AggregatedDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service AggregatedDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service AggregatedDiscoveryService.
    * 
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -224,7 +224,7 @@ public io.grpc.stub.StreamObserver
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
@@ -249,7 +249,7 @@ protected AggregatedDiscoveryServiceBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service AggregatedDiscoveryService.
    * 
    * See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
    * ADS and how it is intended to be used by a management server. ADS requests
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
index 00ff1e46294..e4a294a20cf 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
@@ -133,7 +133,7 @@ default io.grpc.stub.StreamObserver {
@@ -198,7 +198,7 @@ public io.grpc.stub.StreamObserver {
@@ -215,7 +215,7 @@ protected LoadReportingServiceBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService.
    */
   public static final class LoadReportingServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
index 31c8dcb6e57..04d8c11b54f 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
@@ -133,7 +133,7 @@ default io.grpc.stub.StreamObserver {
@@ -198,7 +198,7 @@ public io.grpc.stub.StreamObserver {
@@ -215,7 +215,7 @@ protected LoadReportingServiceBlockingStub build(
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service LoadReportingService.
    */
   public static final class LoadReportingServiceFutureStub
       extends io.grpc.stub.AbstractFutureStub {
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
index 2f6b25aaec2..5d98dd5ca0e 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
@@ -152,7 +152,7 @@ default void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatu
   }
 
   /**
-   * Base class for the server implementation of the service ClientStatusDiscoveryService
+   * Base class for the server implementation of the service ClientStatusDiscoveryService.
    * 
    * CSDS is Client Status Discovery Service. It can be used to get the status of
    * an xDS-compliant client from the management server's point of view. It can
@@ -168,7 +168,7 @@ public static abstract class ClientStatusDiscoveryServiceImplBase
   }
 
   /**
-   * A stub to allow clients to do asynchronous rpc calls to service ClientStatusDiscoveryService
+   * A stub to allow clients to do asynchronous rpc calls to service ClientStatusDiscoveryService.
    * 
    * CSDS is Client Status Discovery Service. It can be used to get the status of
    * an xDS-compliant client from the management server's point of view. It can
@@ -206,7 +206,7 @@ public void fetchClientStatus(io.envoyproxy.envoy.service.status.v3.ClientStatus
   }
 
   /**
-   * A stub to allow clients to do synchronous rpc calls to service ClientStatusDiscoveryService
+   * A stub to allow clients to do synchronous rpc calls to service ClientStatusDiscoveryService.
    * 
    * CSDS is Client Status Discovery Service. It can be used to get the status of
    * an xDS-compliant client from the management server's point of view. It can
@@ -235,7 +235,7 @@ public io.envoyproxy.envoy.service.status.v3.ClientStatusResponse fetchClientSta
   }
 
   /**
-   * A stub to allow clients to do ListenableFuture-style rpc calls to service ClientStatusDiscoveryService
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service ClientStatusDiscoveryService.
    * 
    * CSDS is Client Status Discovery Service. It can be used to get the status of
    * an xDS-compliant client from the management server's point of view. It can

From e0f1af4b2078aa593245f359e4651cf4fbcd4b96 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 14 Feb 2023 01:21:04 +0000
Subject: [PATCH 39/42] Remove ExperimentalApi annotation from generated files

---
 .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java  | 1 -
 .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java    | 1 -
 .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java  | 1 -
 .../debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java | 1 -
 .../io/grpc/testing/integration/UnimplementedServiceGrpc.java   | 1 -
 .../integration/XdsUpdateClientConfigureServiceGrpc.java        | 1 -
 .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 -
 .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java  | 1 -
 .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java    | 1 -
 .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java  | 1 -
 .../grpc/io/grpc/testing/integration/TestServiceGrpc.java       | 1 -
 .../io/grpc/testing/integration/UnimplementedServiceGrpc.java   | 1 -
 .../integration/XdsUpdateClientConfigureServiceGrpc.java        | 1 -
 .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 -
 .../grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java     | 1 -
 .../io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java  | 1 -
 .../main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java   | 1 -
 compiler/src/java_plugin/cpp/java_generator.cpp                 | 2 --
 compiler/src/test/golden/TestDeprecatedService.java.txt         | 1 -
 compiler/src/test/golden/TestService.java.txt                   | 1 -
 compiler/src/testLite/golden/TestDeprecatedService.java.txt     | 1 -
 compiler/src/testLite/golden/TestService.java.txt               | 1 -
 .../grpc/testing/integration/LoadBalancerStatsServiceGrpc.java  | 1 -
 .../grpc/io/grpc/testing/integration/MetricsServiceGrpc.java    | 1 -
 .../grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java  | 1 -
 .../main/grpc/io/grpc/testing/integration/TestServiceGrpc.java  | 1 -
 .../io/grpc/testing/integration/UnimplementedServiceGrpc.java   | 1 -
 .../integration/XdsUpdateClientConfigureServiceGrpc.java        | 1 -
 .../io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java | 1 -
 .../generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java  | 1 -
 30 files changed, 31 deletions(-)

diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index e4fbe9c38a3..24c8d6189cc 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -127,7 +127,6 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * A service used to obtain stats for verifying LB behavior.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 0546a363ce2..0fc49afb5ea 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -121,7 +121,6 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index c23873b2284..93f97349e83 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -127,7 +127,6 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index bdf7a5220e8..8b9c3c899fd 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -309,7 +309,6 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
    * performance with various types of payload.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index af9ebe7d12d..2dc6495a6be 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -99,7 +99,6 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
    * that case.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index ca3fb342ef4..bb966dcbc73 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -97,7 +97,6 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel
    * A service to dynamically update the configuration of an xDS test client.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index eb1713cbcb5..57bf5365034 100644
--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -127,7 +127,6 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc
    * A service to remotely control health status of an xDS test server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index e4fbe9c38a3..24c8d6189cc 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -127,7 +127,6 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * A service used to obtain stats for verifying LB behavior.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 0546a363ce2..0fc49afb5ea 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -121,7 +121,6 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index c23873b2284..93f97349e83 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -127,7 +127,6 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index bdf7a5220e8..8b9c3c899fd 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -309,7 +309,6 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
    * performance with various types of payload.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index af9ebe7d12d..2dc6495a6be 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -99,7 +99,6 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
    * that case.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index ca3fb342ef4..bb966dcbc73 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -97,7 +97,6 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel
    * A service to dynamically update the configuration of an xDS test client.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index eb1713cbcb5..57bf5365034 100644
--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -127,7 +127,6 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc
    * A service to remotely control health status of an xDS test server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
index 4752ab7eede..6fd21f2c037 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@@ -216,7 +216,6 @@ public BenchmarkServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
index 3ecdfdf2d0a..534ba40ed77 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
@@ -92,7 +92,6 @@ public ReportQpsScenarioServiceFutureStub newStub(io.grpc.Channel channel, io.gr
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
index 8072dece367..a1031d9f241 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@@ -185,7 +185,6 @@ public WorkerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 41acbbd7661..140c96377c8 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -600,7 +600,6 @@ static void PrintStub(
   if (interface) {
     p->Print(
         *vars,
-        "@$ExperimentalApi$(\"https://github.com/grpc/grpc-java/issues/9702\")\n"
         "public interface $stub_name$ {\n");
   } else {
     p->Print(
@@ -1203,7 +1202,6 @@ void GenerateService(const ServiceDescriptor* service,
   vars["Deprecated"] = "java.lang.Deprecated";
   vars["Override"] = "java.lang.Override";
   vars["Channel"] = "io.grpc.Channel";
-  vars["ExperimentalApi"] = "io.grpc.ExperimentalApi";
   vars["CallOptions"] = "io.grpc.CallOptions";
   vars["MethodType"] = "io.grpc.MethodDescriptor.MethodType";
   vars["ServerMethodDefinition"] =
diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt
index 651ace5413b..5d5e3da30e4 100644
--- a/compiler/src/test/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/test/golden/TestDeprecatedService.java.txt
@@ -100,7 +100,6 @@ public final class TestDeprecatedServiceGrpc {
    * 

    */
   @java.lang.Deprecated
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
index 4cdbdb466c9..21e53d115a6 100644
--- a/compiler/src/test/golden/TestService.java.txt
+++ b/compiler/src/test/golden/TestService.java.txt
@@ -317,7 +317,6 @@ public final class TestServiceGrpc {
    * Test service that supports all call types.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
index 41ab122e623..15d3b90e11d 100644
--- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt
+++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt
@@ -99,7 +99,6 @@ public final class TestDeprecatedServiceGrpc {
    * 

    */
   @java.lang.Deprecated
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index d9260211981..d2a1666b682 100644
--- a/compiler/src/testLite/golden/TestService.java.txt
+++ b/compiler/src/testLite/golden/TestService.java.txt
@@ -309,7 +309,6 @@ public final class TestServiceGrpc {
    * Test service that supports all call types.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
index 91e95f0dab8..6cae73aa31c 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@@ -129,7 +129,6 @@ public LoadBalancerStatsServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * A service used to obtain stats for verifying LB behavior.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 9a7796daa1b..c9e0251245f 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -123,7 +123,6 @@ public MetricsServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index 3c3b74b2edd..e79c42cb892 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -129,7 +129,6 @@ public ReconnectServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
    * A service used to control reconnect server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index 550d65e8e39..35ab8d72ed2 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -317,7 +317,6 @@ public TestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOption
    * performance with various types of payload.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index 2f0b44a3719..d906409ea6e 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -100,7 +100,6 @@ public UnimplementedServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
    * that case.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
index a6c95e5a02e..f4c1c5dbf3a 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@@ -98,7 +98,6 @@ public XdsUpdateClientConfigureServiceFutureStub newStub(io.grpc.Channel channel
    * A service to dynamically update the configuration of an xDS test client.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
index 68596cce077..3fab6b23592 100644
--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@@ -129,7 +129,6 @@ public XdsUpdateHealthServiceFutureStub newStub(io.grpc.Channel channel, io.grpc
    * A service to remotely control health status of an xDS test server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
index b7968b2d43d..8134aee8809 100644
--- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
+++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
@@ -123,7 +123,6 @@ public EchoTestServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOp
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**

From e7d30848303bbeef35b9bd1af6615853037cd0a4 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 14 Feb 2023 02:59:36 +0000
Subject: [PATCH 40/42] squash! Remove ExperimentalApi annotation

---
 .../main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java   | 1 -
 .../src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java  | 1 -
 .../main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java      | 1 -
 .../generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java    | 1 -
 .../src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java    | 1 -
 .../grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java    | 1 -
 .../io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java    | 1 -
 .../grpc/reflection/testing/AnotherReflectableServiceGrpc.java   | 1 -
 .../test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java | 1 -
 .../grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java  | 1 -
 .../grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java  | 1 -
 .../io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java  | 1 -
 .../io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java | 1 -
 .../io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java | 1 -
 .../io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java    | 1 -
 .../envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java           | 1 -
 .../envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java | 1 -
 .../service/discovery/v2/AggregatedDiscoveryServiceGrpc.java     | 1 -
 .../envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java   | 1 -
 .../service/discovery/v3/AggregatedDiscoveryServiceGrpc.java     | 1 -
 .../envoy/service/load_stats/v2/LoadReportingServiceGrpc.java    | 1 -
 .../envoy/service/load_stats/v3/LoadReportingServiceGrpc.java    | 1 -
 .../service/status/v3/ClientStatusDiscoveryServiceGrpc.java      | 1 -
 23 files changed, 23 deletions(-)

diff --git a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
index ee636382f47..6e6fdd8f00b 100644
--- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
+++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
@@ -92,7 +92,6 @@ public HandshakerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Call
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
index b7e1b55b82e..0415195bc3e 100644
--- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
@@ -92,7 +92,6 @@ public LoadBalancerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptio
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
index ab3f97155cd..07a0e3ebdc8 100644
--- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
+++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
@@ -92,7 +92,6 @@ public RouteLookupServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
index 2e47e3dd3dd..1b85f675676 100644
--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@@ -286,7 +286,6 @@ public ChannelzFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions c
    * information.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
index e1af9c96936..31bf9f0e20f 100644
--- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
@@ -123,7 +123,6 @@ public HealthFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions cal
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
index 2f6c295b31f..ebe541e0e9b 100644
--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@@ -92,7 +92,6 @@ public ServerReflectionFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
index d9b0c7189ab..4e4c2fc517b 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@@ -98,7 +98,6 @@ public AnotherDynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.
    * AnotherDynamicService
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
index b66a0d78feb..68d03ef4f69 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
@@ -92,7 +92,6 @@ public AnotherReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.g
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
index cb3ebf787ca..3fbc30db9e5 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@@ -98,7 +98,6 @@ public DynamicServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
    * A DynamicService
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
index 9109e8d0ad8..b8e17ccf054 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
@@ -92,7 +92,6 @@ public ReflectableServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Cal
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
index dace161cdba..cf9725f107b 100644
--- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
@@ -112,7 +112,6 @@ public OpenRcaServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpt
    * a new call to change backend reporting frequency.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
index 10b83c60a03..602c455437f 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java
@@ -160,7 +160,6 @@ public ClusterDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grp
    * Return list of all clusters this proxy will load balance to.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
index 55d1b7ed90d..c1c5f3e989a 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java
@@ -154,7 +154,6 @@ public EndpointDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
index a391d4a4703..9e5cd92f0cd 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java
@@ -166,7 +166,6 @@ public ListenerDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.gr
    * allowed to drain from listeners that are no longer present.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
index 153e70a842d..fe1991f4883 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java
@@ -168,7 +168,6 @@ public RouteDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.
    * a route table via this identifier.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
index 23d2bf8f571..ec23ffe0129 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java
@@ -172,7 +172,6 @@ public ScopedRoutesDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i
    * HTTP request.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
index 0af457edaa9..45f0fed18fb 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java
@@ -116,7 +116,6 @@ public VirtualHostDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io
    * <xds_protocol_unsubscribe>` from the routing table associated with the RouteConfiguration.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
index d63c8c9cc75..947b6795478 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
@@ -139,7 +139,6 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.
    * the multiplexed singleton APIs at the Envoy instance and management server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
index 9d835aef84a..b83bdf3eeb7 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java
@@ -154,7 +154,6 @@ public SecretDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.grpc
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
index 786fdafbadf..73070b21368 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
@@ -139,7 +139,6 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.
    * the multiplexed singleton APIs at the Envoy instance and management server.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
index e4a294a20cf..370c844f6e6 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java
@@ -92,7 +92,6 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
index 04d8c11b54f..be1c2ab7d4f 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
@@ -92,7 +92,6 @@ public LoadReportingServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C
 
   /**
    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**
diff --git a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
index 5d98dd5ca0e..95fd294c1ab 100644
--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
@@ -133,7 +133,6 @@ public ClientStatusDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, i
    * also be used to get the current xDS states directly from the client.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**

From fc040d61834764b4a7f971b6bc1a6a968b9cfb8a Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 14 Feb 2023 18:26:26 +0000
Subject: [PATCH 41/42] missed generated file

---
 .../main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
index c7922f77d36..3dc0e9d3c52 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
@@ -191,7 +191,6 @@ public SimpleServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOpti
    * A simple service for test.
    * 

    */
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9702")
   public interface AsyncService {
 
     /**

From 27254ff21bc5289e74a2a78bd31e24a4e19682a8 Mon Sep 17 00:00:00 2001
From: larry-safran 
Date: Tue, 14 Feb 2023 17:48:09 -0800
Subject: [PATCH 42/42] Move testing with interface to the main interop test
 class instead of alts and revert the ignore of venv.

---
 .gitignore                                    |  3 --
 .../alts/HandshakerServiceChannelTest.java    | 34 -------------------
 .../testing/integration/TestServiceImpl.java  |  9 +++--
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4e852a53e8..9fd0d7fb574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,3 @@ qemu-arm-static
 
 # Temporary output dir for artifacts
 mvn-artifacts
-
-# test environment
-venv
diff --git a/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java b/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java
index 01c64bca7a6..a3937904cd7 100644
--- a/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java
+++ b/alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java
@@ -35,21 +35,6 @@
 
 @RunWith(JUnit4.class)
 public final class HandshakerServiceChannelTest {
-
-  public static class SimpleServiceAltServer
-      implements io.grpc.BindableService, SimpleServiceGrpc.AsyncService {
-
-    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return SimpleServiceGrpc.bindService(this);
-    }
-
-    @Override
-    public void unaryRpc(SimpleRequest request, StreamObserver so) {
-      so.onNext(SimpleResponse.getDefaultInstance());
-      so.onCompleted();
-    }
-  }
-
   @Rule
   public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
   private final Server server = grpcCleanup.register(
@@ -61,22 +46,14 @@ public void unaryRpc(SimpleRequest request, StreamObserver so) {
             so.onCompleted();
           }
         })
-        .build());
-  private final Server altServer = grpcCleanup.register(
-      ServerBuilder.forPort(0)
-          .addService(new SimpleServiceAltServer())
           .build());
   private Resource resource;
-  private Resource altResource;
 
   @Before
   public void setUp() throws Exception {
     server.start();
-    altServer.start();
     resource =
         HandshakerServiceChannel.getHandshakerChannelForTesting("localhost:" + server.getPort());
-    altResource =
-        HandshakerServiceChannel.getHandshakerChannelForTesting("localhost:" + altServer.getPort());
   }
 
   @Test
@@ -101,17 +78,6 @@ public void resource_works() {
     }
   }
 
-  @Test
-  public void altServer_works() {
-    Channel channel = altResource.create();
-    try {
-      // Do an RPC to verify that the channel actually works
-      doRpc(channel);
-    } finally {
-      altResource.close(channel);
-    }
-  }
-
   @Test
   public void resource_lifecycleTwice() {
     Channel channel = resource.create();
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
index ea77f13892a..8fa272122d0 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
@@ -40,6 +40,7 @@
 import io.grpc.testing.integration.Messages.StreamingOutputCallRequest;
 import io.grpc.testing.integration.Messages.StreamingOutputCallResponse;
 import io.grpc.testing.integration.Messages.TestOrcaReport;
+import io.grpc.testing.integration.TestServiceGrpc.AsyncService;
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -59,7 +60,7 @@
  * Implementation of the business logic for the TestService. Uses an executor to schedule chunks
  * sent in response streams.
  */
-public class TestServiceImpl extends TestServiceGrpc.TestServiceImplBase {
+public class TestServiceImpl implements io.grpc.BindableService, AsyncService {
   private final Random random = new Random();
 
   private final ScheduledExecutorService executor;
@@ -80,6 +81,11 @@ public TestServiceImpl(ScheduledExecutorService executor) {
     this(executor, MetricRecorder.newInstance());
   }
 
+  @Override
+  public final io.grpc.ServerServiceDefinition bindService() {
+    return TestServiceGrpc.bindService(this);
+  }
+
   @Override
   public void emptyCall(EmptyProtos.Empty request,
       StreamObserver responseObserver) {
@@ -419,7 +425,6 @@ private void scheduleNextChunk() {
           // TODO(ejona): cancel future if RPC is cancelled
           Future unused = executor.schedule(new LogExceptionRunnable(dispatchTask),
               nextChunk.delayMicroseconds, TimeUnit.MICROSECONDS);
-          return;
         }
       }
     }