From 47b11ab7a141d619a7e70a2a2005d28ad903635a Mon Sep 17 00:00:00 2001 From: liym <43025881+ijliym@users.noreply.github.com> Date: Thu, 25 Jul 2019 01:37:13 +0800 Subject: [PATCH] =?UTF-8?q?compiler:=20Use=20'SERVICE=5FNAME'=20instead=20?= =?UTF-8?q?of=20duplicated=20'$Package$$service=E2=80=A6=20(#5943)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * compiler: Use 'SERVICE_NAME' instead of duplicated '$Package$$service_name$' * compiler: Align indentation * Fix typo * Add modified golden files and all re-generated code to meet Travis CI and Windows build requirements See PR #5943 * Polishing --- .../alts/internal/HandshakerServiceGrpc.java | 15 +-- .../proto/BenchmarkServiceGrpc.java | 75 +++++------ .../proto/ReportQpsScenarioServiceGrpc.java | 15 +-- .../benchmarks/proto/WorkerServiceGrpc.java | 60 ++++----- compiler/README.md | 4 +- .../src/java_plugin/cpp/java_generator.cpp | 15 +-- .../golden/TestDeprecatedService.java.txt | 15 +-- compiler/src/test/golden/TestService.java.txt | 90 ++++++------- .../golden/TestDeprecatedService.java.txt | 13 +- .../src/testLite/golden/TestService.java.txt | 78 ++++++------ .../grpc/io/grpc/lb/v1/LoadBalancerGrpc.java | 15 +-- .../integration/MetricsServiceGrpc.java | 30 ++--- .../integration/ReconnectServiceGrpc.java | 30 ++--- .../testing/integration/TestServiceGrpc.java | 120 ++++++++---------- .../integration/UnimplementedServiceGrpc.java | 15 +-- .../io/grpc/channelz/v1/ChannelzGrpc.java | 105 +++++++-------- .../grpc/io/grpc/health/v1/HealthGrpc.java | 30 ++--- .../v1alpha/ServerReflectionGrpc.java | 15 +-- .../testing/AnotherDynamicServiceGrpc.java | 15 +-- .../testing/DynamicServiceGrpc.java | 15 +-- .../testing/ReflectableServiceGrpc.java | 15 +-- .../testing/protobuf/SimpleServiceGrpc.java | 60 ++++----- .../api/v2/ClusterDiscoveryServiceGrpc.java | 45 +++---- .../api/v2/EndpointDiscoveryServiceGrpc.java | 45 +++---- .../v2/AggregatedDiscoveryServiceGrpc.java | 30 ++--- .../v2/LoadReportingServiceGrpc.java | 15 +-- .../service/orca/v1/OpenRcaServiceGrpc.java | 15 +-- 27 files changed, 464 insertions(+), 531 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 79643affaf..a792853a45 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 @@ -41,22 +41,21 @@ public final class HandshakerServiceGrpc { if ((getDoHandshakeMethod = HandshakerServiceGrpc.getDoHandshakeMethod) == null) { synchronized (HandshakerServiceGrpc.class) { if ((getDoHandshakeMethod = HandshakerServiceGrpc.getDoHandshakeMethod) == null) { - HandshakerServiceGrpc.getDoHandshakeMethod = getDoHandshakeMethod = + HandshakerServiceGrpc.getDoHandshakeMethod = getDoHandshakeMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.gcp.HandshakerService", "DoHandshake")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DoHandshake")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.alts.internal.HandshakerReq.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.alts.internal.HandshakerResp.getDefaultInstance())) - .setSchemaDescriptor(new HandshakerServiceMethodDescriptorSupplier("DoHandshake")) - .build(); - } + .setSchemaDescriptor(new HandshakerServiceMethodDescriptorSupplier("DoHandshake")) + .build(); } - } - return getDoHandshakeMethod; + } + } + return getDoHandshakeMethod; } /** 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 6a9da0e8dd..c761453216 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 @@ -41,22 +41,21 @@ public final class BenchmarkServiceGrpc { if ((getUnaryCallMethod = BenchmarkServiceGrpc.getUnaryCallMethod) == null) { synchronized (BenchmarkServiceGrpc.class) { if ((getUnaryCallMethod = BenchmarkServiceGrpc.getUnaryCallMethod) == null) { - BenchmarkServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = + BenchmarkServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.BenchmarkService", "UnaryCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("UnaryCall")) - .build(); - } + .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("UnaryCall")) + .build(); } - } - return getUnaryCallMethod; + } + } + return getUnaryCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.BenchmarkService", "StreamingCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingCall")) - .build(); - } + .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingCall")) + .build(); } - } - return getStreamingCallMethod; + } + } + return getStreamingCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.BenchmarkService", "StreamingFromClient")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingFromClient")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromClient")) - .build(); - } + .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromClient")) + .build(); } - } - return getStreamingFromClientMethod; + } + } + return getStreamingFromClientMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.BenchmarkService", "StreamingFromServer")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingFromServer")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromServer")) - .build(); - } + .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromServer")) + .build(); } - } - return getStreamingFromServerMethod; + } + } + return getStreamingFromServerMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.BenchmarkService", "StreamingBothWays")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingBothWays")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingBothWays")) - .build(); - } + .setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingBothWays")) + .build(); } - } - return getStreamingBothWaysMethod; + } + } + return getStreamingBothWaysMethod; } /** 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 4c03b373ce..3bd2bdb96b 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 @@ -41,22 +41,21 @@ public final class ReportQpsScenarioServiceGrpc { if ((getReportScenarioMethod = ReportQpsScenarioServiceGrpc.getReportScenarioMethod) == null) { synchronized (ReportQpsScenarioServiceGrpc.class) { if ((getReportScenarioMethod = ReportQpsScenarioServiceGrpc.getReportScenarioMethod) == null) { - ReportQpsScenarioServiceGrpc.getReportScenarioMethod = getReportScenarioMethod = + ReportQpsScenarioServiceGrpc.getReportScenarioMethod = getReportScenarioMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.ReportQpsScenarioService", "ReportScenario")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ReportScenario")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.ScenarioResult.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.Void.getDefaultInstance())) - .setSchemaDescriptor(new ReportQpsScenarioServiceMethodDescriptorSupplier("ReportScenario")) - .build(); - } + .setSchemaDescriptor(new ReportQpsScenarioServiceMethodDescriptorSupplier("ReportScenario")) + .build(); } - } - return getReportScenarioMethod; + } + } + return 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 0213533289..05e85553c4 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 @@ -41,22 +41,21 @@ public final class WorkerServiceGrpc { if ((getRunServerMethod = WorkerServiceGrpc.getRunServerMethod) == null) { synchronized (WorkerServiceGrpc.class) { if ((getRunServerMethod = WorkerServiceGrpc.getRunServerMethod) == null) { - WorkerServiceGrpc.getRunServerMethod = getRunServerMethod = + WorkerServiceGrpc.getRunServerMethod = getRunServerMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.WorkerService", "RunServer")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "RunServer")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.ServerArgs.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.ServerStatus.getDefaultInstance())) - .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunServer")) - .build(); - } + .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunServer")) + .build(); } - } - return getRunServerMethod; + } + } + return getRunServerMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.WorkerService", "RunClient")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "RunClient")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.ClientArgs.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.ClientStatus.getDefaultInstance())) - .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunClient")) - .build(); - } + .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunClient")) + .build(); } - } - return getRunClientMethod; + } + } + return getRunClientMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.WorkerService", "CoreCount")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CoreCount")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.CoreRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.CoreResponse.getDefaultInstance())) - .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("CoreCount")) - .build(); - } + .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("CoreCount")) + .build(); } - } - return getCoreCountMethod; + } + } + return getCoreCountMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.WorkerService", "QuitWorker")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "QuitWorker")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.Void.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.benchmarks.proto.Control.Void.getDefaultInstance())) - .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("QuitWorker")) - .build(); - } + .setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("QuitWorker")) + .build(); } - } - return getQuitWorkerMethod; + } + } + return getQuitWorkerMethod; } /** diff --git a/compiler/README.md b/compiler/README.md index 676b0cbf4d..4971232d55 100644 --- a/compiler/README.md +++ b/compiler/README.md @@ -46,11 +46,11 @@ $ protoc --plugin=protoc-gen-grpc-java=build/exe/java_plugin/protoc-gen-grpc-jav ## Installing the codegen to Maven local repository This will compile a codegen and put it under your ``~/.m2/repository``. This will make it available to any build tool that pulls codegens from Maven -repostiories. +repositories. ``` $ ../gradlew publishToMavenLocal ``` -## Creating a release of GRPC Java +## Creating a release of gRPC Java Please follow the instructions in ``RELEASING.md`` under the root directory for details on how to create a new release. diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 4ef7b8e437..8110f3d55f 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -407,11 +407,10 @@ static void PrintMethodFields( " if (($method_new_field_name$ = $service_class_name$.$method_new_field_name$) == null) {\n" " synchronized ($service_class_name$.class) {\n" " if (($method_new_field_name$ = $service_class_name$.$method_new_field_name$) == null) {\n" - " $service_class_name$.$method_new_field_name$ = $method_new_field_name$ = \n" + " $service_class_name$.$method_new_field_name$ = $method_new_field_name$ =\n" " $MethodDescriptor$.<$input_type$, $output_type$>newBuilder()\n" " .setType($MethodType$.$method_type$)\n" - " .setFullMethodName(generateFullMethodName(\n" - " \"$Package$$service_name$\", \"$method_name$\"))\n" + " .setFullMethodName(generateFullMethodName(SERVICE_NAME, \"$method_name$\"))\n" " .setSampledToLocalTracing(true)\n" " .setRequestMarshaller($ProtoUtils$.marshaller(\n" " $input_type$.getDefaultInstance()))\n" @@ -422,17 +421,17 @@ static void PrintMethodFields( if (flavor == ProtoFlavor::NORMAL) { p->Print( *vars, - " .setSchemaDescriptor(new $proto_method_descriptor_supplier$(\"$method_name$\"))\n"); + " .setSchemaDescriptor(new $proto_method_descriptor_supplier$(\"$method_name$\"))\n"); } p->Print( *vars, - " .build();\n"); + " .build();\n"); p->Print(*vars, - " }\n" " }\n" - " }\n" - " return $method_new_field_name$;\n" + " }\n" + " }\n" + " return $method_new_field_name$;\n" "}\n" "\n"); } diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index 21b774645a..23b34a0760 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -45,22 +45,21 @@ public final class TestDeprecatedServiceGrpc { if ((getDeprecatedMethodMethod = TestDeprecatedServiceGrpc.getDeprecatedMethodMethod) == null) { synchronized (TestDeprecatedServiceGrpc.class) { if ((getDeprecatedMethodMethod = TestDeprecatedServiceGrpc.getDeprecatedMethodMethod) == null) { - TestDeprecatedServiceGrpc.getDeprecatedMethodMethod = getDeprecatedMethodMethod = + TestDeprecatedServiceGrpc.getDeprecatedMethodMethod = getDeprecatedMethodMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestDeprecatedService", "DeprecatedMethod")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeprecatedMethod")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestDeprecatedServiceMethodDescriptorSupplier("DeprecatedMethod")) - .build(); - } + .setSchemaDescriptor(new TestDeprecatedServiceMethodDescriptorSupplier("DeprecatedMethod")) + .build(); } - } - return getDeprecatedMethodMethod; + } + } + return getDeprecatedMethodMethod; } /** diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index 1d43ef1fad..0ea51f557b 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -44,22 +44,21 @@ public final class TestServiceGrpc { if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { - TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = + TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "UnaryCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall")) + .build(); } - } - return getUnaryCallMethod; + } + } + return getUnaryCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "StreamingOutputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall")) + .build(); } - } - return getStreamingOutputCallMethod; + } + } + return getStreamingOutputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "StreamingInputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall")) + .build(); } - } - return getStreamingInputCallMethod; + } + } + return getStreamingInputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "FullBidiCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullBidiCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullBidiCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullBidiCall")) + .build(); } - } - return getFullBidiCallMethod; + } + } + return getFullBidiCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "HalfBidiCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfBidiCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfBidiCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfBidiCall")) + .build(); } - } - return getHalfBidiCallMethod; + } + } + return getHalfBidiCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "Import")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Import")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("Import")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("Import")) + .build(); } - } - return getImportMethod; + } + } + return getImportMethod; } /** diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index dfc9da3c36..307e29a887 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -45,21 +45,20 @@ public final class TestDeprecatedServiceGrpc { if ((getDeprecatedMethodMethod = TestDeprecatedServiceGrpc.getDeprecatedMethodMethod) == null) { synchronized (TestDeprecatedServiceGrpc.class) { if ((getDeprecatedMethodMethod = TestDeprecatedServiceGrpc.getDeprecatedMethodMethod) == null) { - TestDeprecatedServiceGrpc.getDeprecatedMethodMethod = getDeprecatedMethodMethod = + TestDeprecatedServiceGrpc.getDeprecatedMethodMethod = getDeprecatedMethodMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestDeprecatedService", "DeprecatedMethod")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeprecatedMethod")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.SimpleResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getDeprecatedMethodMethod; + } + } + return getDeprecatedMethodMethod; } /** diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 439ad79ba5..cd50433855 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -44,21 +44,20 @@ public final class TestServiceGrpc { if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getUnaryCallMethod = TestServiceGrpc.getUnaryCallMethod) == null) { - TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = + TestServiceGrpc.getUnaryCallMethod = getUnaryCallMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "UnaryCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.SimpleResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getUnaryCallMethod; + } + } + return getUnaryCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "StreamingOutputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getStreamingOutputCallMethod; + } + } + return getStreamingOutputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "StreamingInputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getStreamingInputCallMethod; + } + } + return getStreamingInputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "FullBidiCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullBidiCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getFullBidiCallMethod; + } + } + return getFullBidiCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "HalfBidiCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfBidiCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingOutputCallResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getHalfBidiCallMethod; + } + } + return getHalfBidiCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.compiler.TestService", "Import")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Import")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.lite.ProtoLiteUtils.marshaller( io.grpc.testing.compiler.Test.StreamingInputCallResponse.getDefaultInstance())) - .build(); - } + .build(); } - } - return getImportMethod; + } + } + return getImportMethod; } /** 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 9604415f56..4d3ad18be2 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 @@ -41,22 +41,21 @@ public final class LoadBalancerGrpc { if ((getBalanceLoadMethod = LoadBalancerGrpc.getBalanceLoadMethod) == null) { synchronized (LoadBalancerGrpc.class) { if ((getBalanceLoadMethod = LoadBalancerGrpc.getBalanceLoadMethod) == null) { - LoadBalancerGrpc.getBalanceLoadMethod = getBalanceLoadMethod = + LoadBalancerGrpc.getBalanceLoadMethod = getBalanceLoadMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.lb.v1.LoadBalancer", "BalanceLoad")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "BalanceLoad")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.lb.v1.LoadBalanceRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.lb.v1.LoadBalanceResponse.getDefaultInstance())) - .setSchemaDescriptor(new LoadBalancerMethodDescriptorSupplier("BalanceLoad")) - .build(); - } + .setSchemaDescriptor(new LoadBalancerMethodDescriptorSupplier("BalanceLoad")) + .build(); } - } - return getBalanceLoadMethod; + } + } + return getBalanceLoadMethod; } /** 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 124d31e24a..2978f9c8cc 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 @@ -41,22 +41,21 @@ public final class MetricsServiceGrpc { if ((getGetAllGaugesMethod = MetricsServiceGrpc.getGetAllGaugesMethod) == null) { synchronized (MetricsServiceGrpc.class) { if ((getGetAllGaugesMethod = MetricsServiceGrpc.getGetAllGaugesMethod) == null) { - MetricsServiceGrpc.getGetAllGaugesMethod = getGetAllGaugesMethod = + MetricsServiceGrpc.getGetAllGaugesMethod = getGetAllGaugesMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.MetricsService", "GetAllGauges")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetAllGauges")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Metrics.EmptyMessage.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Metrics.GaugeResponse.getDefaultInstance())) - .setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetAllGauges")) - .build(); - } + .setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetAllGauges")) + .build(); } - } - return getGetAllGaugesMethod; + } + } + return getGetAllGaugesMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.MetricsService", "GetGauge")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetGauge")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Metrics.GaugeRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Metrics.GaugeResponse.getDefaultInstance())) - .setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetGauge")) - .build(); - } + .setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetGauge")) + .build(); } - } - return getGetGaugeMethod; + } + } + return getGetGaugeMethod; } /** 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 595aa2a9f0..6ecd3208e3 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 @@ -44,22 +44,21 @@ public final class ReconnectServiceGrpc { if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) { synchronized (ReconnectServiceGrpc.class) { if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) { - ReconnectServiceGrpc.getStartMethod = getStartMethod = + ReconnectServiceGrpc.getStartMethod = getStartMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.ReconnectService", "Start")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Start")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) - .setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Start")) - .build(); - } + .setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Start")) + .build(); } - } - return getStartMethod; + } + } + return getStartMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.ReconnectService", "Stop")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Stop")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.ReconnectInfo.getDefaultInstance())) - .setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Stop")) - .build(); - } + .setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Stop")) + .build(); } - } - return getStopMethod; + } + } + return getStopMethod; } /** 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 727afa039c..faa8925faa 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 @@ -45,22 +45,21 @@ public final class TestServiceGrpc { if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) { synchronized (TestServiceGrpc.class) { if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) { - TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod = + TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "EmptyCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EmptyCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall")) + .build(); } - } - return getEmptyCallMethod; + } + } + return getEmptyCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "UnaryCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall")) + .build(); } - } - return getUnaryCallMethod; + } + } + return getUnaryCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "CacheableUnaryCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CacheableUnaryCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("CacheableUnaryCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("CacheableUnaryCall")) + .build(); } - } - return getCacheableUnaryCallMethod; + } + } + return getCacheableUnaryCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "StreamingOutputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingOutputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall")) + .build(); } - } - return getStreamingOutputCallMethod; + } + } + return getStreamingOutputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "StreamingInputCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamingInputCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingInputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingInputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall")) + .build(); } - } - return getStreamingInputCallMethod; + } + } + return getStreamingInputCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "FullDuplexCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FullDuplexCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullDuplexCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullDuplexCall")) + .build(); } - } - return getFullDuplexCallMethod; + } + } + return getFullDuplexCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "HalfDuplexCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "HalfDuplexCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfDuplexCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfDuplexCall")) + .build(); } - } - return getHalfDuplexCallMethod; + } + } + return getHalfDuplexCallMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.TestService", "UnimplementedCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnimplementedCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) - .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall")) - .build(); - } + .setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall")) + .build(); } - } - return getUnimplementedCallMethod; + } + } + return getUnimplementedCallMethod; } /** 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 0fe86875c4..156321975d 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 @@ -45,22 +45,21 @@ public final class UnimplementedServiceGrpc { if ((getUnimplementedCallMethod = UnimplementedServiceGrpc.getUnimplementedCallMethod) == null) { synchronized (UnimplementedServiceGrpc.class) { if ((getUnimplementedCallMethod = UnimplementedServiceGrpc.getUnimplementedCallMethod) == null) { - UnimplementedServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod = + UnimplementedServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.UnimplementedService", "UnimplementedCall")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnimplementedCall")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance())) - .setSchemaDescriptor(new UnimplementedServiceMethodDescriptorSupplier("UnimplementedCall")) - .build(); - } + .setSchemaDescriptor(new UnimplementedServiceMethodDescriptorSupplier("UnimplementedCall")) + .build(); } - } - return getUnimplementedCallMethod; + } + } + return getUnimplementedCallMethod; } /** 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 66dda20c66..165eec264e 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 @@ -45,22 +45,21 @@ public final class ChannelzGrpc { if ((getGetTopChannelsMethod = ChannelzGrpc.getGetTopChannelsMethod) == null) { synchronized (ChannelzGrpc.class) { if ((getGetTopChannelsMethod = ChannelzGrpc.getGetTopChannelsMethod) == null) { - ChannelzGrpc.getGetTopChannelsMethod = getGetTopChannelsMethod = + ChannelzGrpc.getGetTopChannelsMethod = getGetTopChannelsMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetTopChannels")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetTopChannels")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetTopChannelsRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetTopChannelsResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetTopChannels")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetTopChannels")) + .build(); } - } - return getGetTopChannelsMethod; + } + } + return getGetTopChannelsMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetServers")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetServers")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServersRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServersResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServers")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServers")) + .build(); } - } - return getGetServersMethod; + } + } + return getGetServersMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetServer")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetServer")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServerRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServerResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServer")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServer")) + .build(); } - } - return getGetServerMethod; + } + } + return getGetServerMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetServerSockets")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetServerSockets")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServerSocketsRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetServerSocketsResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServerSockets")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetServerSockets")) + .build(); } - } - return getGetServerSocketsMethod; + } + } + return getGetServerSocketsMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetChannel")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetChannel")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetChannelRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetChannelResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetChannel")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetChannel")) + .build(); } - } - return getGetChannelMethod; + } + } + return getGetChannelMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetSubchannel")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetSubchannel")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetSubchannelRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetSubchannelResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetSubchannel")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetSubchannel")) + .build(); } - } - return getGetSubchannelMethod; + } + } + return getGetSubchannelMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.channelz.v1.Channelz", "GetSocket")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetSocket")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetSocketRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.channelz.v1.GetSocketResponse.getDefaultInstance())) - .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetSocket")) - .build(); - } + .setSchemaDescriptor(new ChannelzMethodDescriptorSupplier("GetSocket")) + .build(); } - } - return getGetSocketMethod; + } + } + return getGetSocketMethod; } /** 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 4a4f9fba78..93b8abb28e 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 @@ -41,22 +41,21 @@ public final class HealthGrpc { if ((getCheckMethod = HealthGrpc.getCheckMethod) == null) { synchronized (HealthGrpc.class) { if ((getCheckMethod = HealthGrpc.getCheckMethod) == null) { - HealthGrpc.getCheckMethod = getCheckMethod = + HealthGrpc.getCheckMethod = getCheckMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.health.v1.Health", "Check")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Check")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.health.v1.HealthCheckRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.health.v1.HealthCheckResponse.getDefaultInstance())) - .setSchemaDescriptor(new HealthMethodDescriptorSupplier("Check")) - .build(); - } + .setSchemaDescriptor(new HealthMethodDescriptorSupplier("Check")) + .build(); } - } - return getCheckMethod; + } + } + return getCheckMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.health.v1.Health", "Watch")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Watch")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.health.v1.HealthCheckRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.health.v1.HealthCheckResponse.getDefaultInstance())) - .setSchemaDescriptor(new HealthMethodDescriptorSupplier("Watch")) - .build(); - } + .setSchemaDescriptor(new HealthMethodDescriptorSupplier("Watch")) + .build(); } - } - return getWatchMethod; + } + } + return getWatchMethod; } /** 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 80f45a69cd..035d177e2d 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 @@ -41,22 +41,21 @@ public final class ServerReflectionGrpc { if ((getServerReflectionInfoMethod = ServerReflectionGrpc.getServerReflectionInfoMethod) == null) { synchronized (ServerReflectionGrpc.class) { if ((getServerReflectionInfoMethod = ServerReflectionGrpc.getServerReflectionInfoMethod) == null) { - ServerReflectionGrpc.getServerReflectionInfoMethod = getServerReflectionInfoMethod = + ServerReflectionGrpc.getServerReflectionInfoMethod = getServerReflectionInfoMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.reflection.v1alpha.ServerReflection", "ServerReflectionInfo")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ServerReflectionInfo")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.v1alpha.ServerReflectionRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.v1alpha.ServerReflectionResponse.getDefaultInstance())) - .setSchemaDescriptor(new ServerReflectionMethodDescriptorSupplier("ServerReflectionInfo")) - .build(); - } + .setSchemaDescriptor(new ServerReflectionMethodDescriptorSupplier("ServerReflectionInfo")) + .build(); } - } - return getServerReflectionInfoMethod; + } + } + return 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 f50f2b182a..1b5ab5c12c 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 @@ -44,22 +44,21 @@ public final class AnotherDynamicServiceGrpc { if ((getMethodMethod = AnotherDynamicServiceGrpc.getMethodMethod) == null) { synchronized (AnotherDynamicServiceGrpc.class) { if ((getMethodMethod = AnotherDynamicServiceGrpc.getMethodMethod) == null) { - AnotherDynamicServiceGrpc.getMethodMethod = getMethodMethod = + AnotherDynamicServiceGrpc.getMethodMethod = getMethodMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.reflection.testing.AnotherDynamicService", "Method")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Method")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.DynamicRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.DynamicReply.getDefaultInstance())) - .setSchemaDescriptor(new AnotherDynamicServiceMethodDescriptorSupplier("Method")) - .build(); - } + .setSchemaDescriptor(new AnotherDynamicServiceMethodDescriptorSupplier("Method")) + .build(); } - } - return getMethodMethod; + } + } + return 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 80d28b1b44..1b5e7c78c8 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 @@ -44,22 +44,21 @@ public final class DynamicServiceGrpc { if ((getMethodMethod = DynamicServiceGrpc.getMethodMethod) == null) { synchronized (DynamicServiceGrpc.class) { if ((getMethodMethod = DynamicServiceGrpc.getMethodMethod) == null) { - DynamicServiceGrpc.getMethodMethod = getMethodMethod = + DynamicServiceGrpc.getMethodMethod = getMethodMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.reflection.testing.DynamicService", "Method")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Method")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.DynamicRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.DynamicReply.getDefaultInstance())) - .setSchemaDescriptor(new DynamicServiceMethodDescriptorSupplier("Method")) - .build(); - } + .setSchemaDescriptor(new DynamicServiceMethodDescriptorSupplier("Method")) + .build(); } - } - return getMethodMethod; + } + } + return 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 239f944acb..f88764670d 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 @@ -41,22 +41,21 @@ public final class ReflectableServiceGrpc { if ((getMethodMethod = ReflectableServiceGrpc.getMethodMethod) == null) { synchronized (ReflectableServiceGrpc.class) { if ((getMethodMethod = ReflectableServiceGrpc.getMethodMethod) == null) { - ReflectableServiceGrpc.getMethodMethod = getMethodMethod = + ReflectableServiceGrpc.getMethodMethod = getMethodMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.reflection.testing.ReflectableService", "Method")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Method")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.Request.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.reflection.testing.Reply.getDefaultInstance())) - .setSchemaDescriptor(new ReflectableServiceMethodDescriptorSupplier("Method")) - .build(); - } + .setSchemaDescriptor(new ReflectableServiceMethodDescriptorSupplier("Method")) + .build(); } - } - return getMethodMethod; + } + } + return 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 96745314f8..f976e7587f 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 @@ -44,22 +44,21 @@ public final class SimpleServiceGrpc { if ((getUnaryRpcMethod = SimpleServiceGrpc.getUnaryRpcMethod) == null) { synchronized (SimpleServiceGrpc.class) { if ((getUnaryRpcMethod = SimpleServiceGrpc.getUnaryRpcMethod) == null) { - SimpleServiceGrpc.getUnaryRpcMethod = getUnaryRpcMethod = + SimpleServiceGrpc.getUnaryRpcMethod = getUnaryRpcMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "grpc.testing.SimpleService", "UnaryRpc")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UnaryRpc")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("UnaryRpc")) - .build(); - } + .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("UnaryRpc")) + .build(); } - } - return getUnaryRpcMethod; + } + } + return getUnaryRpcMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.SimpleService", "ClientStreamingRpc")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ClientStreamingRpc")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ClientStreamingRpc")) - .build(); - } + .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ClientStreamingRpc")) + .build(); } - } - return getClientStreamingRpcMethod; + } + } + return getClientStreamingRpcMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.SimpleService", "ServerStreamingRpc")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ServerStreamingRpc")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ServerStreamingRpc")) - .build(); - } + .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ServerStreamingRpc")) + .build(); } - } - return getServerStreamingRpcMethod; + } + } + return getServerStreamingRpcMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "grpc.testing.SimpleService", "BidiStreamingRpc")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "BidiStreamingRpc")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance())) - .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("BidiStreamingRpc")) - .build(); - } + .setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("BidiStreamingRpc")) + .build(); } - } - return getBidiStreamingRpcMethod; + } + } + return getBidiStreamingRpcMethod; } /** diff --git a/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java b/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java index 790b671ea7..e476e83c0e 100644 --- a/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java +++ b/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java @@ -44,22 +44,21 @@ public final class ClusterDiscoveryServiceGrpc { if ((getStreamClustersMethod = ClusterDiscoveryServiceGrpc.getStreamClustersMethod) == null) { synchronized (ClusterDiscoveryServiceGrpc.class) { if ((getStreamClustersMethod = ClusterDiscoveryServiceGrpc.getStreamClustersMethod) == null) { - ClusterDiscoveryServiceGrpc.getStreamClustersMethod = getStreamClustersMethod = + ClusterDiscoveryServiceGrpc.getStreamClustersMethod = getStreamClustersMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.ClusterDiscoveryService", "StreamClusters")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamClusters")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("StreamClusters")) - .build(); - } + .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("StreamClusters")) + .build(); } - } - return getStreamClustersMethod; + } + } + return getStreamClustersMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.ClusterDiscoveryService", "DeltaClusters")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeltaClusters")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("DeltaClusters")) - .build(); - } + .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("DeltaClusters")) + .build(); } - } - return getDeltaClustersMethod; + } + } + return getDeltaClustersMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.ClusterDiscoveryService", "FetchClusters")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FetchClusters")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("FetchClusters")) - .build(); - } + .setSchemaDescriptor(new ClusterDiscoveryServiceMethodDescriptorSupplier("FetchClusters")) + .build(); } - } - return getFetchClustersMethod; + } + } + return getFetchClustersMethod; } /** diff --git a/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java b/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java index 694cd7b3c2..2726b2bf3a 100644 --- a/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java +++ b/xds/src/generated/main/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java @@ -41,22 +41,21 @@ public final class EndpointDiscoveryServiceGrpc { if ((getStreamEndpointsMethod = EndpointDiscoveryServiceGrpc.getStreamEndpointsMethod) == null) { synchronized (EndpointDiscoveryServiceGrpc.class) { if ((getStreamEndpointsMethod = EndpointDiscoveryServiceGrpc.getStreamEndpointsMethod) == null) { - EndpointDiscoveryServiceGrpc.getStreamEndpointsMethod = getStreamEndpointsMethod = + EndpointDiscoveryServiceGrpc.getStreamEndpointsMethod = getStreamEndpointsMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.EndpointDiscoveryService", "StreamEndpoints")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamEndpoints")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("StreamEndpoints")) - .build(); - } + .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("StreamEndpoints")) + .build(); } - } - return getStreamEndpointsMethod; + } + } + return getStreamEndpointsMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.EndpointDiscoveryService", "DeltaEndpoints")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeltaEndpoints")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("DeltaEndpoints")) - .build(); - } + .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("DeltaEndpoints")) + .build(); } - } - return getDeltaEndpointsMethod; + } + } + return getDeltaEndpointsMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName( - "envoy.api.v2.EndpointDiscoveryService", "FetchEndpoints")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "FetchEndpoints")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("FetchEndpoints")) - .build(); - } + .setSchemaDescriptor(new EndpointDiscoveryServiceMethodDescriptorSupplier("FetchEndpoints")) + .build(); } - } - return getFetchEndpointsMethod; + } + } + return getFetchEndpointsMethod; } /** diff --git a/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java b/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java index 681b5031f0..65a23fff75 100644 --- a/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java +++ b/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java @@ -49,22 +49,21 @@ public final class AggregatedDiscoveryServiceGrpc { if ((getStreamAggregatedResourcesMethod = AggregatedDiscoveryServiceGrpc.getStreamAggregatedResourcesMethod) == null) { synchronized (AggregatedDiscoveryServiceGrpc.class) { if ((getStreamAggregatedResourcesMethod = AggregatedDiscoveryServiceGrpc.getStreamAggregatedResourcesMethod) == null) { - AggregatedDiscoveryServiceGrpc.getStreamAggregatedResourcesMethod = getStreamAggregatedResourcesMethod = + AggregatedDiscoveryServiceGrpc.getStreamAggregatedResourcesMethod = getStreamAggregatedResourcesMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.service.discovery.v2.AggregatedDiscoveryService", "StreamAggregatedResources")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamAggregatedResources")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new AggregatedDiscoveryServiceMethodDescriptorSupplier("StreamAggregatedResources")) - .build(); - } + .setSchemaDescriptor(new AggregatedDiscoveryServiceMethodDescriptorSupplier("StreamAggregatedResources")) + .build(); } - } - return getStreamAggregatedResourcesMethod; + } + } + return getStreamAggregatedResourcesMethod; } private static volatile io.grpc.MethodDescriptornewBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.service.discovery.v2.AggregatedDiscoveryService", "DeltaAggregatedResources")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeltaAggregatedResources")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse.getDefaultInstance())) - .setSchemaDescriptor(new AggregatedDiscoveryServiceMethodDescriptorSupplier("DeltaAggregatedResources")) - .build(); - } + .setSchemaDescriptor(new AggregatedDiscoveryServiceMethodDescriptorSupplier("DeltaAggregatedResources")) + .build(); } - } - return getDeltaAggregatedResourcesMethod; + } + } + return getDeltaAggregatedResourcesMethod; } /** diff --git a/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java b/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java index a1d8c34c02..f00828aa3f 100644 --- a/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java +++ b/xds/src/generated/main/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java @@ -41,22 +41,21 @@ public final class LoadReportingServiceGrpc { if ((getStreamLoadStatsMethod = LoadReportingServiceGrpc.getStreamLoadStatsMethod) == null) { synchronized (LoadReportingServiceGrpc.class) { if ((getStreamLoadStatsMethod = LoadReportingServiceGrpc.getStreamLoadStatsMethod) == null) { - LoadReportingServiceGrpc.getStreamLoadStatsMethod = getStreamLoadStatsMethod = + LoadReportingServiceGrpc.getStreamLoadStatsMethod = getStreamLoadStatsMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) - .setFullMethodName(generateFullMethodName( - "envoy.service.load_stats.v2.LoadReportingService", "StreamLoadStats")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamLoadStats")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.service.load_stats.v2.LoadStatsRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.envoy.service.load_stats.v2.LoadStatsResponse.getDefaultInstance())) - .setSchemaDescriptor(new LoadReportingServiceMethodDescriptorSupplier("StreamLoadStats")) - .build(); - } + .setSchemaDescriptor(new LoadReportingServiceMethodDescriptorSupplier("StreamLoadStats")) + .build(); } - } - return getStreamLoadStatsMethod; + } + } + return getStreamLoadStatsMethod; } /** diff --git a/xds/src/generated/main/grpc/io/envoyproxy/udpa/service/orca/v1/OpenRcaServiceGrpc.java b/xds/src/generated/main/grpc/io/envoyproxy/udpa/service/orca/v1/OpenRcaServiceGrpc.java index f8d5aa85d4..86666b2552 100644 --- a/xds/src/generated/main/grpc/io/envoyproxy/udpa/service/orca/v1/OpenRcaServiceGrpc.java +++ b/xds/src/generated/main/grpc/io/envoyproxy/udpa/service/orca/v1/OpenRcaServiceGrpc.java @@ -51,22 +51,21 @@ public final class OpenRcaServiceGrpc { if ((getStreamCoreMetricsMethod = OpenRcaServiceGrpc.getStreamCoreMetricsMethod) == null) { synchronized (OpenRcaServiceGrpc.class) { if ((getStreamCoreMetricsMethod = OpenRcaServiceGrpc.getStreamCoreMetricsMethod) == null) { - OpenRcaServiceGrpc.getStreamCoreMetricsMethod = getStreamCoreMetricsMethod = + OpenRcaServiceGrpc.getStreamCoreMetricsMethod = getStreamCoreMetricsMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName( - "udpa.service.orca.v1.OpenRcaService", "StreamCoreMetrics")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StreamCoreMetrics")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.udpa.service.orca.v1.OrcaLoadReportRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( io.envoyproxy.udpa.data.orca.v1.OrcaLoadReport.getDefaultInstance())) - .setSchemaDescriptor(new OpenRcaServiceMethodDescriptorSupplier("StreamCoreMetrics")) - .build(); - } + .setSchemaDescriptor(new OpenRcaServiceMethodDescriptorSupplier("StreamCoreMetrics")) + .build(); } - } - return getStreamCoreMetricsMethod; + } + } + return getStreamCoreMetricsMethod; } /**