From c08d58a599baa5b986da32dfae88c73f76917dd5 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 6 Oct 2022 13:16:18 -0700 Subject: [PATCH] Bump version to 1.36.3 --- build.gradle | 2 +- .../golden/TestDeprecatedService.java.txt | 2 +- compiler/src/test/golden/TestService.java.txt | 2 +- .../golden/TestDeprecatedService.java.txt | 2 +- .../src/testLite/golden/TestService.java.txt | 2 +- .../main/java/io/grpc/internal/GrpcUtil.java | 2 +- examples/android/clientcache/app/build.gradle | 10 ++++---- examples/android/helloworld/app/build.gradle | 8 +++--- examples/android/routeguide/app/build.gradle | 8 +++--- examples/android/strictmode/app/build.gradle | 8 +++--- examples/build.gradle | 2 +- examples/example-alts/build.gradle | 2 +- examples/example-gauth/build.gradle | 2 +- examples/example-gauth/pom.xml | 4 +-- examples/example-hostname/build.gradle | 2 +- examples/example-hostname/pom.xml | 4 +-- examples/example-jwt-auth/build.gradle | 2 +- examples/example-jwt-auth/pom.xml | 4 +-- examples/example-tls/build.gradle | 2 +- examples/example-tls/pom.xml | 4 +-- examples/example-xds/build.gradle | 2 +- examples/pom.xml | 4 +-- .../LoadBalancerStatsServiceGrpc.java | 1 + .../integration/MetricsServiceGrpc.java | 1 + .../integration/ReconnectServiceGrpc.java | 25 ++++++++++--------- .../testing/integration/TestServiceGrpc.java | 1 + .../integration/UnimplementedServiceGrpc.java | 1 + .../XdsUpdateClientConfigureServiceGrpc.java | 1 + .../XdsUpdateHealthServiceGrpc.java | 1 + .../testing/AnotherDynamicServiceGrpc.java | 1 + .../AnotherReflectableServiceGrpc.java | 1 + .../testing/DynamicServiceGrpc.java | 1 + .../testing/ReflectableServiceGrpc.java | 1 + 33 files changed, 63 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index c9297227d0d..59161f49f4e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ subprojects { apply plugin: "net.ltgt.errorprone" group = "io.grpc" - version = "1.36.3-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.36.3" // CURRENT_GRPC_VERSION repositories { maven { // The google mirror is less flaky than mavenCentral() diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index ccfea2d2209..d8e1c1ee9b4 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.36.3-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.36.3)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 5ef3171fd68..fc4e78090b8 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.36.3-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.36.3)", comments = "Source: grpc/testing/compiler/test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index 6980adfc71d..74b6d148477 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.36.3-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.36.3)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 7482c6f9fb8..70e4aaed0f4 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.36.3-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.36.3)", comments = "Source: grpc/testing/compiler/test.proto") public final class TestServiceGrpc { diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index b9aa225abb4..f545f179b34 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -197,7 +197,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.36.3-SNAPSHOT"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.36.3"; // CURRENT_GRPC_VERSION /** * The default timeout in nanos for a keepalive ping request. diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle index 6551c1a8872..be8ef35d50d 100644 --- a/examples/android/clientcache/app/build.gradle +++ b/examples/android/clientcache/app/build.gradle @@ -30,7 +30,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.16.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -50,12 +50,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.36.3' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' testImplementation 'junit:junit:4.12' testImplementation 'com.google.truth:truth:1.0.1' - testImplementation 'io.grpc:grpc-testing:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.36.3' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index bebc304423a..6f743611bf1 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -28,7 +28,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.16.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.36.3' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 2ece8f73d38..a19232fe160 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -28,7 +28,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.16.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.36.3' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index 6304b233833..508df602d39 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -29,7 +29,7 @@ android { protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.16.3' } plugins { - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -49,8 +49,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.36.3' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.36.3' // CURRENT_GRPC_VERSION implementation 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/examples/build.gradle b/examples/build.gradle index 3f8790bfa7b..cd162b369ed 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def protobufVersion = '3.16.3' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 4b4262cdb4c..7547717591a 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def protocVersion = '3.16.3' dependencies { diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 2d91807a46a..9be4d974f92 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def protobufVersion = '3.16.3' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index e07cdaaf5dc..f9af646e787 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.36.3-SNAPSHOT + 1.36.3 example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.36.3-SNAPSHOT + 1.36.3 3.16.3 1.7 diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index ad878e20e1b..632ee43bdc2 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def protobufVersion = '3.16.3' dependencies { diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 037c2328809..e7b2e980d8f 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -6,13 +6,13 @@ jar - 1.36.3-SNAPSHOT + 1.36.3 example-hostname https://github.com/grpc/grpc-java UTF-8 - 1.36.3-SNAPSHOT + 1.36.3 3.16.3 1.7 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index ea08946a3c2..515eb321411 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def protobufVersion = '3.16.3' def protocVersion = protobufVersion diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 2b5a94155cc..7df05417da7 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -7,13 +7,13 @@ jar - 1.36.3-SNAPSHOT + 1.36.3 example-jwt-auth https://github.com/grpc/grpc-java UTF-8 - 1.36.3-SNAPSHOT + 1.36.3 3.16.3 3.16.1 diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 2e80fad4f21..074486c2a02 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.34.Final' def protocVersion = '3.16.3' diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 3962d8cc204..90444d17848 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.36.3-SNAPSHOT + 1.36.3 example-tls https://github.com/grpc/grpc-java UTF-8 - 1.36.3-SNAPSHOT + 1.36.3 3.16.3 2.0.34.Final diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 135dce7ac26..875b4e19a48 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.36.3-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.36.3' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.31.Final' def protocVersion = '3.16.3' diff --git a/examples/pom.xml b/examples/pom.xml index b6d2ff3f8a3..814bdfcb340 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.36.3-SNAPSHOT + 1.36.3 examples https://github.com/grpc/grpc-java UTF-8 - 1.36.3-SNAPSHOT + 1.36.3 3.16.3 3.16.3 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 2d5a62b4da9..42db108ce7e 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class LoadBalancerStatsServiceGrpc { private LoadBalancerStatsServiceGrpc() {} 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 cbc13a2dfe3..5cae4aa8183 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 @@ -7,6 +7,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/metrics.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class MetricsServiceGrpc { private MetricsServiceGrpc() {} 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 5af70fdddae..be88c76b2fd 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class ReconnectServiceGrpc { private ReconnectServiceGrpc() {} @@ -17,27 +18,27 @@ private ReconnectServiceGrpc() {} public static final String SERVICE_NAME = "grpc.testing.ReconnectService"; // Static method descriptors that strictly reflect the proto. - private static volatile io.grpc.MethodDescriptor getStartMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "Start", - requestType = io.grpc.testing.integration.EmptyProtos.Empty.class, + requestType = io.grpc.testing.integration.Messages.ReconnectParams.class, responseType = io.grpc.testing.integration.EmptyProtos.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getStartMethod() { - io.grpc.MethodDescriptor getStartMethod; + io.grpc.MethodDescriptor getStartMethod; if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) { synchronized (ReconnectServiceGrpc.class) { if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) { ReconnectServiceGrpc.getStartMethod = getStartMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Start")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) + io.grpc.testing.integration.Messages.ReconnectParams.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Start")) @@ -132,7 +133,7 @@ public static abstract class ReconnectServiceImplBase implements io.grpc.Bindabl /** */ - public void start(io.grpc.testing.integration.EmptyProtos.Empty request, + public void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getStartMethod(), responseObserver); } @@ -150,7 +151,7 @@ public void stop(io.grpc.testing.integration.EmptyProtos.Empty request, getStartMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - io.grpc.testing.integration.EmptyProtos.Empty, + io.grpc.testing.integration.Messages.ReconnectParams, io.grpc.testing.integration.EmptyProtos.Empty>( this, METHODID_START))) .addMethod( @@ -183,7 +184,7 @@ protected ReconnectServiceStub build( /** */ - public void start(io.grpc.testing.integration.EmptyProtos.Empty request, + public void start(io.grpc.testing.integration.Messages.ReconnectParams request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getStartMethod(), getCallOptions()), request, responseObserver); @@ -217,7 +218,7 @@ protected ReconnectServiceBlockingStub build( /** */ - public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.EmptyProtos.Empty request) { + 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); } @@ -250,7 +251,7 @@ protected ReconnectServiceFutureStub build( /** */ public com.google.common.util.concurrent.ListenableFuture start( - io.grpc.testing.integration.EmptyProtos.Empty request) { + io.grpc.testing.integration.Messages.ReconnectParams request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getStartMethod(), getCallOptions()), request); } @@ -285,7 +286,7 @@ private static final class MethodHandlers implements public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { case METHODID_START: - serviceImpl.start((io.grpc.testing.integration.EmptyProtos.Empty) request, + serviceImpl.start((io.grpc.testing.integration.Messages.ReconnectParams) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_STOP: 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 b2289d19cd5..a380a5b6303 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 @@ -11,6 +11,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class TestServiceGrpc { private TestServiceGrpc() {} 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 a7c5058dc32..d8e680cdf0a 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 @@ -11,6 +11,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class UnimplementedServiceGrpc { private UnimplementedServiceGrpc() {} 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 582f0841a80..14e77497b64 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class XdsUpdateClientConfigureServiceGrpc { private XdsUpdateClientConfigureServiceGrpc() {} 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 6d1a67a52bd..946a3825bb1 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: grpc/testing/test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class XdsUpdateHealthServiceGrpc { private XdsUpdateHealthServiceGrpc() {} 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 30cd9a62a20..d4e910fd1a4 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class AnotherDynamicServiceGrpc { private AnotherDynamicServiceGrpc() {} 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 0d5a7a13722..6aee82f01ec 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 @@ -7,6 +7,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: io/grpc/reflection/testing/reflection_test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class AnotherReflectableServiceGrpc { private AnotherReflectableServiceGrpc() {} 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 996bf7003b4..f53cf02de1c 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 @@ -10,6 +10,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class DynamicServiceGrpc { private DynamicServiceGrpc() {} 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 80c86c12d30..9bdff6205f6 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 @@ -7,6 +7,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: io/grpc/reflection/testing/reflection_test.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class ReflectableServiceGrpc { private ReflectableServiceGrpc() {}