compiler, stub: Rename inputType and outputType in @RpcMethod

alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java

@@ -33,8 +33,8 @@ public final class HandshakerServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.gcp.HandshakerService",
       methodName = "DoHandshake",
-      inputType = io.grpc.alts.internal.Handshaker.HandshakerReq.class,
+      requestType = io.grpc.alts.internal.Handshaker.HandshakerReq.class,
-      outputType = io.grpc.alts.internal.Handshaker.HandshakerResp.class,
+      responseType = io.grpc.alts.internal.Handshaker.HandshakerResp.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.alts.internal.Handshaker.HandshakerReq,
       io.grpc.alts.internal.Handshaker.HandshakerResp> getDoHandshakeMethod() {

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

@@ -33,8 +33,8 @@ public final class BenchmarkServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.BenchmarkService",
       methodName = "UnaryCall",
-      inputType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
+      requestType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
-      outputType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
+      responseType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
       io.grpc.benchmarks.proto.Messages.SimpleResponse> getUnaryCallMethod() {
@@ -66,8 +66,8 @@ public final class BenchmarkServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.BenchmarkService",
       methodName = "StreamingCall",
-      inputType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
+      requestType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
-      outputType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
+      responseType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
       io.grpc.benchmarks.proto.Messages.SimpleResponse> getStreamingCallMethod() {
@@ -99,8 +99,8 @@ public final class BenchmarkServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.BenchmarkService",
       methodName = "StreamingFromClient",
-      inputType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
+      requestType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
-      outputType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
+      responseType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
       io.grpc.benchmarks.proto.Messages.SimpleResponse> getStreamingFromClientMethod() {
@@ -132,8 +132,8 @@ public final class BenchmarkServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.BenchmarkService",
       methodName = "StreamingFromServer",
-      inputType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
+      requestType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
-      outputType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
+      responseType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
       io.grpc.benchmarks.proto.Messages.SimpleResponse> getStreamingFromServerMethod() {
@@ -165,8 +165,8 @@ public final class BenchmarkServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.BenchmarkService",
       methodName = "StreamingBothWays",
-      inputType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
+      requestType = io.grpc.benchmarks.proto.Messages.SimpleRequest.class,
-      outputType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
+      responseType = io.grpc.benchmarks.proto.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
       io.grpc.benchmarks.proto.Messages.SimpleResponse> getStreamingBothWaysMethod() {

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

@@ -33,8 +33,8 @@ public final class ReportQpsScenarioServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.ReportQpsScenarioService",
       methodName = "ReportScenario",
-      inputType = io.grpc.benchmarks.proto.Control.ScenarioResult.class,
+      requestType = io.grpc.benchmarks.proto.Control.ScenarioResult.class,
-      outputType = io.grpc.benchmarks.proto.Control.Void.class,
+      responseType = io.grpc.benchmarks.proto.Control.Void.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult,
       io.grpc.benchmarks.proto.Control.Void> getReportScenarioMethod() {

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

@@ -33,8 +33,8 @@ public final class WorkerServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.WorkerService",
       methodName = "RunServer",
-      inputType = io.grpc.benchmarks.proto.Control.ServerArgs.class,
+      requestType = io.grpc.benchmarks.proto.Control.ServerArgs.class,
-      outputType = io.grpc.benchmarks.proto.Control.ServerStatus.class,
+      responseType = io.grpc.benchmarks.proto.Control.ServerStatus.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs,
       io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethod() {
@@ -66,8 +66,8 @@ public final class WorkerServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.WorkerService",
       methodName = "RunClient",
-      inputType = io.grpc.benchmarks.proto.Control.ClientArgs.class,
+      requestType = io.grpc.benchmarks.proto.Control.ClientArgs.class,
-      outputType = io.grpc.benchmarks.proto.Control.ClientStatus.class,
+      responseType = io.grpc.benchmarks.proto.Control.ClientStatus.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
       io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethod() {
@@ -99,8 +99,8 @@ public final class WorkerServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.WorkerService",
       methodName = "CoreCount",
-      inputType = io.grpc.benchmarks.proto.Control.CoreRequest.class,
+      requestType = io.grpc.benchmarks.proto.Control.CoreRequest.class,
-      outputType = io.grpc.benchmarks.proto.Control.CoreResponse.class,
+      responseType = io.grpc.benchmarks.proto.Control.CoreResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
       io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethod() {
@@ -132,8 +132,8 @@ public final class WorkerServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.WorkerService",
       methodName = "QuitWorker",
-      inputType = io.grpc.benchmarks.proto.Control.Void.class,
+      requestType = io.grpc.benchmarks.proto.Control.Void.class,
-      outputType = io.grpc.benchmarks.proto.Control.Void.class,
+      responseType = io.grpc.benchmarks.proto.Control.Void.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
       io.grpc.benchmarks.proto.Control.Void> getQuitWorkerMethod() {

compiler/src/java_plugin/cpp/java_generator.cpp

@@ -480,8 +480,8 @@ static void PrintMethodFields(
           "@$RpcMethod$(\n"
           "    fullServiceName = \"$Package$$service_name$\",\n"
           "    methodName = \"$method_name$\",\n"
-          "    inputType = $input_type$.class,\n"
+          "    requestType = $input_type$.class,\n"
-          "    outputType = $output_type$.class,\n"
+          "    responseType = $output_type$.class,\n"
           "    methodType = $MethodType$.$method_type$)\n"
           "public static $MethodDescriptor$<$input_type$,\n"
           "    $output_type$> $method_method_name$() {\n"

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

@@ -36,8 +36,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "UnaryCall",
-      inputType = io.grpc.testing.compiler.Test.SimpleRequest.class,
+      requestType = io.grpc.testing.compiler.Test.SimpleRequest.class,
-      outputType = io.grpc.testing.compiler.Test.SimpleResponse.class,
+      responseType = io.grpc.testing.compiler.Test.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.SimpleRequest,
       io.grpc.testing.compiler.Test.SimpleResponse> getUnaryCallMethod() {
@@ -69,8 +69,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "StreamingOutputCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getStreamingOutputCallMethod() {
@@ -102,8 +102,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "StreamingInputCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingInputCallRequest,
       io.grpc.testing.compiler.Test.StreamingInputCallResponse> getStreamingInputCallMethod() {
@@ -135,8 +135,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "FullBidiCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getFullBidiCallMethod() {
@@ -168,8 +168,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "HalfBidiCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getHalfBidiCallMethod() {
@@ -201,8 +201,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "Import",
-      inputType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingInputCallRequest,
       io.grpc.testing.compiler.Test.StreamingInputCallResponse> getImportMethod() {

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

@@ -36,8 +36,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "UnaryCall",
-      inputType = io.grpc.testing.compiler.Test.SimpleRequest.class,
+      requestType = io.grpc.testing.compiler.Test.SimpleRequest.class,
-      outputType = io.grpc.testing.compiler.Test.SimpleResponse.class,
+      responseType = io.grpc.testing.compiler.Test.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.SimpleRequest,
       io.grpc.testing.compiler.Test.SimpleResponse> getUnaryCallMethod() {
@@ -68,8 +68,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "StreamingOutputCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getStreamingOutputCallMethod() {
@@ -100,8 +100,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "StreamingInputCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingInputCallRequest,
       io.grpc.testing.compiler.Test.StreamingInputCallResponse> getStreamingInputCallMethod() {
@@ -132,8 +132,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "FullBidiCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getFullBidiCallMethod() {
@@ -164,8 +164,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "HalfBidiCall",
-      inputType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingOutputCallRequest,
       io.grpc.testing.compiler.Test.StreamingOutputCallResponse> getHalfBidiCallMethod() {
@@ -196,8 +196,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.compiler.TestService",
       methodName = "Import",
-      inputType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.class,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      responseType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.compiler.Test.StreamingInputCallRequest,
       io.grpc.testing.compiler.Test.StreamingInputCallResponse> getImportMethod() {

grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java

@@ -33,8 +33,8 @@ public final class LoadBalancerGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.lb.v1.LoadBalancer",
       methodName = "BalanceLoad",
-      inputType = io.grpc.grpclb.LoadBalanceRequest.class,
+      requestType = io.grpc.grpclb.LoadBalanceRequest.class,
-      outputType = io.grpc.grpclb.LoadBalanceResponse.class,
+      responseType = io.grpc.grpclb.LoadBalanceResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.grpclb.LoadBalanceRequest,
       io.grpc.grpclb.LoadBalanceResponse> getBalanceLoadMethod() {

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

@@ -33,8 +33,8 @@ public final class MetricsServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.MetricsService",
       methodName = "GetAllGauges",
-      inputType = io.grpc.testing.integration.Metrics.EmptyMessage.class,
+      requestType = io.grpc.testing.integration.Metrics.EmptyMessage.class,
-      outputType = io.grpc.testing.integration.Metrics.GaugeResponse.class,
+      responseType = io.grpc.testing.integration.Metrics.GaugeResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Metrics.EmptyMessage,
       io.grpc.testing.integration.Metrics.GaugeResponse> getGetAllGaugesMethod() {
@@ -66,8 +66,8 @@ public final class MetricsServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.MetricsService",
       methodName = "GetGauge",
-      inputType = io.grpc.testing.integration.Metrics.GaugeRequest.class,
+      requestType = io.grpc.testing.integration.Metrics.GaugeRequest.class,
-      outputType = io.grpc.testing.integration.Metrics.GaugeResponse.class,
+      responseType = io.grpc.testing.integration.Metrics.GaugeResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Metrics.GaugeRequest,
       io.grpc.testing.integration.Metrics.GaugeResponse> getGetGaugeMethod() {

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

@@ -36,8 +36,8 @@ public final class ReconnectServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.ReconnectService",
       methodName = "Start",
-      inputType = io.grpc.testing.integration.EmptyProtos.Empty.class,
+      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      outputType = 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<io.grpc.testing.integration.EmptyProtos.Empty,
       io.grpc.testing.integration.EmptyProtos.Empty> getStartMethod() {
@@ -69,8 +69,8 @@ public final class ReconnectServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.ReconnectService",
       methodName = "Stop",
-      inputType = io.grpc.testing.integration.EmptyProtos.Empty.class,
+      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      outputType = io.grpc.testing.integration.Messages.ReconnectInfo.class,
+      responseType = io.grpc.testing.integration.Messages.ReconnectInfo.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
       io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethod() {

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

@@ -37,8 +37,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "EmptyCall",
-      inputType = io.grpc.testing.integration.EmptyProtos.Empty.class,
+      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      outputType = 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<io.grpc.testing.integration.EmptyProtos.Empty,
       io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethod() {
@@ -70,8 +70,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "UnaryCall",
-      inputType = io.grpc.testing.integration.Messages.SimpleRequest.class,
+      requestType = io.grpc.testing.integration.Messages.SimpleRequest.class,
-      outputType = io.grpc.testing.integration.Messages.SimpleResponse.class,
+      responseType = io.grpc.testing.integration.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.SimpleRequest,
       io.grpc.testing.integration.Messages.SimpleResponse> getUnaryCallMethod() {
@@ -103,8 +103,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "CacheableUnaryCall",
-      inputType = io.grpc.testing.integration.Messages.SimpleRequest.class,
+      requestType = io.grpc.testing.integration.Messages.SimpleRequest.class,
-      outputType = io.grpc.testing.integration.Messages.SimpleResponse.class,
+      responseType = io.grpc.testing.integration.Messages.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.SimpleRequest,
       io.grpc.testing.integration.Messages.SimpleResponse> getCacheableUnaryCallMethod() {
@@ -136,8 +136,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "StreamingOutputCall",
-      inputType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
       io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getStreamingOutputCallMethod() {
@@ -169,8 +169,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "StreamingInputCall",
-      inputType = io.grpc.testing.integration.Messages.StreamingInputCallRequest.class,
+      requestType = io.grpc.testing.integration.Messages.StreamingInputCallRequest.class,
-      outputType = io.grpc.testing.integration.Messages.StreamingInputCallResponse.class,
+      responseType = io.grpc.testing.integration.Messages.StreamingInputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingInputCallRequest,
       io.grpc.testing.integration.Messages.StreamingInputCallResponse> getStreamingInputCallMethod() {
@@ -202,8 +202,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "FullDuplexCall",
-      inputType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
       io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getFullDuplexCallMethod() {
@@ -235,8 +235,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "HalfDuplexCall",
-      inputType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
+      requestType = io.grpc.testing.integration.Messages.StreamingOutputCallRequest.class,
-      outputType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
+      responseType = io.grpc.testing.integration.Messages.StreamingOutputCallResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
       io.grpc.testing.integration.Messages.StreamingOutputCallResponse> getHalfDuplexCallMethod() {
@@ -268,8 +268,8 @@ public final class TestServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.TestService",
       methodName = "UnimplementedCall",
-      inputType = io.grpc.testing.integration.EmptyProtos.Empty.class,
+      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      outputType = 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<io.grpc.testing.integration.EmptyProtos.Empty,
       io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod() {

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

@@ -37,8 +37,8 @@ public final class UnimplementedServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.UnimplementedService",
       methodName = "UnimplementedCall",
-      inputType = io.grpc.testing.integration.EmptyProtos.Empty.class,
+      requestType = io.grpc.testing.integration.EmptyProtos.Empty.class,
-      outputType = 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<io.grpc.testing.integration.EmptyProtos.Empty,
       io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod() {

services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java

@@ -37,8 +37,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetTopChannels",
-      inputType = io.grpc.channelz.v1.GetTopChannelsRequest.class,
+      requestType = io.grpc.channelz.v1.GetTopChannelsRequest.class,
-      outputType = io.grpc.channelz.v1.GetTopChannelsResponse.class,
+      responseType = io.grpc.channelz.v1.GetTopChannelsResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetTopChannelsRequest,
       io.grpc.channelz.v1.GetTopChannelsResponse> getGetTopChannelsMethod() {
@@ -70,8 +70,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetServers",
-      inputType = io.grpc.channelz.v1.GetServersRequest.class,
+      requestType = io.grpc.channelz.v1.GetServersRequest.class,
-      outputType = io.grpc.channelz.v1.GetServersResponse.class,
+      responseType = io.grpc.channelz.v1.GetServersResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServersRequest,
       io.grpc.channelz.v1.GetServersResponse> getGetServersMethod() {
@@ -103,8 +103,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetServerSockets",
-      inputType = io.grpc.channelz.v1.GetServerSocketsRequest.class,
+      requestType = io.grpc.channelz.v1.GetServerSocketsRequest.class,
-      outputType = io.grpc.channelz.v1.GetServerSocketsResponse.class,
+      responseType = io.grpc.channelz.v1.GetServerSocketsResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetServerSocketsRequest,
       io.grpc.channelz.v1.GetServerSocketsResponse> getGetServerSocketsMethod() {
@@ -136,8 +136,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetChannel",
-      inputType = io.grpc.channelz.v1.GetChannelRequest.class,
+      requestType = io.grpc.channelz.v1.GetChannelRequest.class,
-      outputType = io.grpc.channelz.v1.GetChannelResponse.class,
+      responseType = io.grpc.channelz.v1.GetChannelResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetChannelRequest,
       io.grpc.channelz.v1.GetChannelResponse> getGetChannelMethod() {
@@ -169,8 +169,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetSubchannel",
-      inputType = io.grpc.channelz.v1.GetSubchannelRequest.class,
+      requestType = io.grpc.channelz.v1.GetSubchannelRequest.class,
-      outputType = io.grpc.channelz.v1.GetSubchannelResponse.class,
+      responseType = io.grpc.channelz.v1.GetSubchannelResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetSubchannelRequest,
       io.grpc.channelz.v1.GetSubchannelResponse> getGetSubchannelMethod() {
@@ -202,8 +202,8 @@ public final class ChannelzGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.channelz.v1.Channelz",
       methodName = "GetSocket",
-      inputType = io.grpc.channelz.v1.GetSocketRequest.class,
+      requestType = io.grpc.channelz.v1.GetSocketRequest.class,
-      outputType = io.grpc.channelz.v1.GetSocketResponse.class,
+      responseType = io.grpc.channelz.v1.GetSocketResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.channelz.v1.GetSocketRequest,
       io.grpc.channelz.v1.GetSocketResponse> getGetSocketMethod() {

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

@@ -33,8 +33,8 @@ public final class HealthGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.health.v1.Health",
       methodName = "Check",
-      inputType = io.grpc.health.v1.HealthCheckRequest.class,
+      requestType = io.grpc.health.v1.HealthCheckRequest.class,
-      outputType = io.grpc.health.v1.HealthCheckResponse.class,
+      responseType = io.grpc.health.v1.HealthCheckResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.health.v1.HealthCheckRequest,
       io.grpc.health.v1.HealthCheckResponse> getCheckMethod() {

services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java

@@ -33,8 +33,8 @@ public final class ServerReflectionGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.reflection.v1alpha.ServerReflection",
       methodName = "ServerReflectionInfo",
-      inputType = io.grpc.reflection.v1alpha.ServerReflectionRequest.class,
+      requestType = io.grpc.reflection.v1alpha.ServerReflectionRequest.class,
-      outputType = io.grpc.reflection.v1alpha.ServerReflectionResponse.class,
+      responseType = io.grpc.reflection.v1alpha.ServerReflectionResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.reflection.v1alpha.ServerReflectionRequest,
       io.grpc.reflection.v1alpha.ServerReflectionResponse> getServerReflectionInfoMethod() {

services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java

@@ -36,8 +36,8 @@ public final class AnotherDynamicServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.reflection.testing.AnotherDynamicService",
       methodName = "Method",
-      inputType = io.grpc.reflection.testing.DynamicRequest.class,
+      requestType = io.grpc.reflection.testing.DynamicRequest.class,
-      outputType = io.grpc.reflection.testing.DynamicReply.class,
+      responseType = io.grpc.reflection.testing.DynamicReply.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.reflection.testing.DynamicRequest,
       io.grpc.reflection.testing.DynamicReply> getMethodMethod() {

services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java

@@ -36,8 +36,8 @@ public final class DynamicServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.reflection.testing.DynamicService",
       methodName = "Method",
-      inputType = io.grpc.reflection.testing.DynamicRequest.class,
+      requestType = io.grpc.reflection.testing.DynamicRequest.class,
-      outputType = io.grpc.reflection.testing.DynamicReply.class,
+      responseType = io.grpc.reflection.testing.DynamicReply.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.reflection.testing.DynamicRequest,
       io.grpc.reflection.testing.DynamicReply> getMethodMethod() {

services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java

@@ -33,8 +33,8 @@ public final class ReflectableServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.reflection.testing.ReflectableService",
       methodName = "Method",
-      inputType = io.grpc.reflection.testing.Request.class,
+      requestType = io.grpc.reflection.testing.Request.class,
-      outputType = io.grpc.reflection.testing.Reply.class,
+      responseType = io.grpc.reflection.testing.Reply.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.reflection.testing.Request,
       io.grpc.reflection.testing.Reply> getMethodMethod() {

stub/src/main/java/io/grpc/stub/annotations/RpcMethod.java

@@ -16,14 +16,24 @@
 
 package io.grpc.stub.annotations;
 
-import io.grpc.MethodDescriptor.MethodType;
+import io.grpc.MethodDescriptor;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotates a method descriptor method to provide metadata for annotation processing.
+ * {@link RpcMethod} contains a limited subset of information about the RPC to assist
+ * <a href="https://docs.oracle.com/javase/6/docs/api/javax/annotation/processing/Processor.html">
+ * Java Annotation Processors.</a>
+ *
+ * <p>
+ *   This annotation is used by the gRPC stub compiler to annotate {@link MethodDescriptor}
+ *   getters.  Users should not annotate their own classes with annotation.  Not all stubs may have
+ *   this annotation, so consumers should not assume that it is present.
+ * </p>
+ *
+ * @since 1.14.0
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
@@ -40,17 +50,17 @@ public @interface RpcMethod {
   String methodName();
 
   /**
-   * The input type of the method
+   * The request type of the method
    */
-  Class<?> inputType();
+  Class<?> requestType();
 
   /**
-   * The output type of the method
+   * The response type of the method
    */
-  Class<?> outputType();
+  Class<?> responseType();
 
   /**
    * The call type of the method
    */
-  MethodType methodType();
+  MethodDescriptor.MethodType methodType();
 }

testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java

@@ -36,8 +36,8 @@ public final class SimpleServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.SimpleService",
       methodName = "UnaryRpc",
-      inputType = io.grpc.testing.protobuf.SimpleRequest.class,
+      requestType = io.grpc.testing.protobuf.SimpleRequest.class,
-      outputType = io.grpc.testing.protobuf.SimpleResponse.class,
+      responseType = io.grpc.testing.protobuf.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
       io.grpc.testing.protobuf.SimpleResponse> getUnaryRpcMethod() {
@@ -69,8 +69,8 @@ public final class SimpleServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.SimpleService",
       methodName = "ClientStreamingRpc",
-      inputType = io.grpc.testing.protobuf.SimpleRequest.class,
+      requestType = io.grpc.testing.protobuf.SimpleRequest.class,
-      outputType = io.grpc.testing.protobuf.SimpleResponse.class,
+      responseType = io.grpc.testing.protobuf.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
       io.grpc.testing.protobuf.SimpleResponse> getClientStreamingRpcMethod() {
@@ -102,8 +102,8 @@ public final class SimpleServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.SimpleService",
       methodName = "ServerStreamingRpc",
-      inputType = io.grpc.testing.protobuf.SimpleRequest.class,
+      requestType = io.grpc.testing.protobuf.SimpleRequest.class,
-      outputType = io.grpc.testing.protobuf.SimpleResponse.class,
+      responseType = io.grpc.testing.protobuf.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
       io.grpc.testing.protobuf.SimpleResponse> getServerStreamingRpcMethod() {
@@ -135,8 +135,8 @@ public final class SimpleServiceGrpc {
   @io.grpc.stub.annotations.RpcMethod(
       fullServiceName = "grpc.testing.SimpleService",
       methodName = "BidiStreamingRpc",
-      inputType = io.grpc.testing.protobuf.SimpleRequest.class,
+      requestType = io.grpc.testing.protobuf.SimpleRequest.class,
-      outputType = io.grpc.testing.protobuf.SimpleResponse.class,
+      responseType = io.grpc.testing.protobuf.SimpleResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
   public static io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
       io.grpc.testing.protobuf.SimpleResponse> getBidiStreamingRpcMethod() {