Remove blocking from the creating a V2 ServerStreaming RPC which eliminates it throwing an exception.

Author: larry-safran

benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java

@@ -441,8 +441,7 @@ public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchm
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.benchmarks.proto.Messages.SimpleResponse>
-        streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        streamingFromServer(io.grpc.benchmarks.proto.Messages.SimpleRequest request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getStreamingFromServerMethod(), getCallOptions(), request);
     }

compiler/src/java_plugin/cpp/java_generator.cpp

@@ -741,8 +741,7 @@ static void PrintStub(
           p->Print(
               *vars,
               "$BlockingClientCall$<?, $output_type$>\n"
-              "    $lower_method_name$($input_type$ request) throws java.lang.InterruptedException,\n"
-              "        io.grpc.StatusException");
+              "    $lower_method_name$($input_type$ request)");
        } else {
           // Simple RPC
           p->Print(

compiler/src/test/golden/TestService.java.txt

@@ -593,8 +593,7 @@ public final class TestServiceGrpc {
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.testing.compiler.Test.StreamingOutputCallResponse>
-        streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getStreamingOutputCallMethod(), getCallOptions(), request);
     }

compiler/src/testLite/golden/TestService.java.txt

@@ -582,8 +582,7 @@ public final class TestServiceGrpc {
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.testing.compiler.Test.StreamingOutputCallResponse>
-        streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        streamingOutputCall(io.grpc.testing.compiler.Test.StreamingOutputCallRequest request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getStreamingOutputCallMethod(), getCallOptions(), request);
     }

interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java

@@ -237,8 +237,7 @@ protected MetricsServiceBlockingV2Stub build(
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.testing.integration.Metrics.GaugeResponse>
-        getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        getAllGauges(io.grpc.testing.integration.Metrics.EmptyMessage request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getGetAllGaugesMethod(), getCallOptions(), request);
     }

interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java

@@ -619,8 +619,7 @@ public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.testing.integration.Messages.StreamingOutputCallResponse>
-        streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        streamingOutputCall(io.grpc.testing.integration.Messages.StreamingOutputCallRequest request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getStreamingOutputCallMethod(), getCallOptions(), request);
     }

s2a/src/generated/main/grpc/io/grpc/s2a/internal/handshaker/S2AServiceGrpc.java

@@ -184,7 +184,7 @@ protected S2AServiceBlockingV2Stub build(
      * </pre>
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
-    public io.grpc.stub.BlockingClientCall<io.grpc.s2a.handshaker.SessionReq, io.grpc.s2a.handshaker.SessionResp>
+    public io.grpc.stub.BlockingClientCall<io.grpc.s2a.internal.handshaker.SessionReq, io.grpc.s2a.internal.handshaker.SessionResp>
         setUpSession() {
       return io.grpc.stub.ClientCalls.blockingBidiStreamingCall(
           getChannel(), getSetUpSessionMethod(), getCallOptions());

services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java

@@ -283,8 +283,7 @@ public io.grpc.health.v1.HealthCheckResponse check(io.grpc.health.v1.HealthCheck
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
     public io.grpc.stub.BlockingClientCall<?, io.grpc.health.v1.HealthCheckResponse>
-        watch(io.grpc.health.v1.HealthCheckRequest request) throws java.lang.InterruptedException,
-            io.grpc.StatusException {
+        watch(io.grpc.health.v1.HealthCheckRequest request) {
       return io.grpc.stub.ClientCalls.blockingV2ServerStreamingCall(
           getChannel(), getWatchMethod(), getCallOptions(), request);
     }

stub/src/main/java/io/grpc/stub/BlockingClientCall.java

@@ -238,6 +238,10 @@ private boolean write(boolean waitForever, ReqT request, long timeout, TimeUnit
     }
   }
 
+  void sendSingleRequest(ReqT request) {
+    call.sendMessage(request);
+  }
+
   /**
    * Cancel stream and stop any further writes.  Note that some reads that are in flight may still
    * happen after the cancel.

stub/src/main/java/io/grpc/stub/ClientCalls.java

@@ -220,35 +220,22 @@ public static <ReqT, RespT> Iterator<RespT> blockingServerStreamingCall(
 
   /**
    * Initiates a client streaming call over the specified channel.  It returns an
-   * object which can be used in a blocking manner to send values to the server and retrieve a
-   * response.
-   *
-   * <p>Call {@link BlockingClientCall#write} for each value to send to the server. After the last
-   * value has been written, call {@link BlockingClientCall#halfClose} to indicate that writing is
-   * complete and then {@link BlockingClientCall#read} to get the response.
+   * object which can be used in a blocking manner to retrieve responses..
    *
    * <p>The methods {@link BlockingClientCall#hasNext()} and {@link
    * BlockingClientCall#cancel(String, Throwable)} can be used for more extensive control.
    *
    * @return A {@link BlockingClientCall} that has had the request sent and halfClose called
-   * @throws InterruptedException if it receives an interrupt while sending the request
-   * @throws StatusException if the write to the server failed
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
   public static <ReqT, RespT> BlockingClientCall<ReqT, RespT> blockingV2ServerStreamingCall(
-      Channel channel, MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, ReqT req)
-      throws InterruptedException, StatusException {
+      Channel channel, MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, ReqT req) {
     BlockingClientCall<ReqT, RespT> call =
         blockingBidiStreamingCall(channel, method, callOptions);
 
-    try {
-      call.write(req);
+      call.sendSingleRequest(req);
       call.halfClose();
       return call;
-    } catch (InterruptedException e) {
-      call.cancel("Interrupted while writing request", e);
-      throw e;
-    }
   }
 
   /**