compiler, stub: Rename inputType and outputType in @RpcMethod

3 files changed, 26 insertions, 26 deletions

diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 8a55bebde..ecc3df7c3 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/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"
-          "    outputType = $output_type$.class,\n"
+          "    requestType = $input_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"
diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
index 8d40a93ec..d41733f03 100644
--- a/compiler/src/test/golden/TestService.java.txt
+++ b/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,
-      outputType = io.grpc.testing.compiler.Test.SimpleResponse.class,
+      requestType = io.grpc.testing.compiler.Test.SimpleRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.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() {
diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index 7f6ab0ae4..86653f973 100644
--- a/compiler/src/testLite/golden/TestService.java.txt
+++ b/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,
-      outputType = io.grpc.testing.compiler.Test.SimpleResponse.class,
+      requestType = io.grpc.testing.compiler.Test.SimpleRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingOutputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingOutputCallRequest.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,
-      outputType = io.grpc.testing.compiler.Test.StreamingInputCallResponse.class,
+      requestType = io.grpc.testing.compiler.Test.StreamingInputCallRequest.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() {