Skip to content

Commit a6621da

Browse files
ejona86ejona86
committed
Private ServerMethodDefinition constructor; avoid create() in codegen
There is no need to use ServerMethodDefinition in codegen. The create() method itself could be helpful to a dynamic HandlerRegistry implementation, so we won't remove it.
1 parent e045fd6 commit a6621da

File tree

12 files changed

+365
-367
lines changed

12 files changed

+365
-367
lines changed

‎benchmarks/src/generated/main/grpc/io/grpc/testing/TestServiceGrpc.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -158,30 +158,30 @@ public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.Simple
158158
public static io.grpc.ServerServiceDefinition bindService(
159159
final TestService serviceImpl) {
160160
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME)
161-
.addMethod(io.grpc.ServerMethodDefinition.create(
162-
METHOD_UNARY_CALL,
163-
asyncUnaryCall(
164-
new io.grpc.stub.ServerCalls.UnaryMethod<
165-
io.grpc.testing.SimpleRequest,
166-
io.grpc.testing.SimpleResponse>() {
167-
@java.lang.Override
168-
public void invoke(
169-
io.grpc.testing.SimpleRequest request,
170-
io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
171-
serviceImpl.unaryCall(request, responseObserver);
172-
}
173-
})))
174-
.addMethod(io.grpc.ServerMethodDefinition.create(
175-
METHOD_STREAMING_CALL,
176-
asyncBidiStreamingCall(
177-
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
178-
io.grpc.testing.SimpleRequest,
179-
io.grpc.testing.SimpleResponse>() {
180-
@java.lang.Override
181-
public io.grpc.stub.StreamObserver<io.grpc.testing.SimpleRequest> invoke(
182-
io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
183-
return serviceImpl.streamingCall(responseObserver);
184-
}
185-
}))).build();
161+
.addMethod(
162+
METHOD_UNARY_CALL,
163+
asyncUnaryCall(
164+
new io.grpc.stub.ServerCalls.UnaryMethod<
165+
io.grpc.testing.SimpleRequest,
166+
io.grpc.testing.SimpleResponse>() {
167+
@java.lang.Override
168+
public void invoke(
169+
io.grpc.testing.SimpleRequest request,
170+
io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
171+
serviceImpl.unaryCall(request, responseObserver);
172+
}
173+
}))
174+
.addMethod(
175+
METHOD_STREAMING_CALL,
176+
asyncBidiStreamingCall(
177+
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
178+
io.grpc.testing.SimpleRequest,
179+
io.grpc.testing.SimpleResponse>() {
180+
@java.lang.Override
181+
public io.grpc.stub.StreamObserver<io.grpc.testing.SimpleRequest> invoke(
182+
io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
183+
return serviceImpl.streamingCall(responseObserver);
184+
}
185+
})).build();
186186
}
187187
}

‎benchmarks/src/generated/main/grpc/io/grpc/testing/WorkerGrpc.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -140,29 +140,29 @@ protected WorkerFutureStub build(io.grpc.Channel channel,
140140
public static io.grpc.ServerServiceDefinition bindService(
141141
final Worker serviceImpl) {
142142
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME)
143-
.addMethod(io.grpc.ServerMethodDefinition.create(
144-
METHOD_RUN_TEST,
145-
asyncBidiStreamingCall(
146-
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
147-
io.grpc.testing.ClientArgs,
148-
io.grpc.testing.ClientStatus>() {
149-
@java.lang.Override
150-
public io.grpc.stub.StreamObserver<io.grpc.testing.ClientArgs> invoke(
151-
io.grpc.stub.StreamObserver<io.grpc.testing.ClientStatus> responseObserver) {
152-
return serviceImpl.runTest(responseObserver);
153-
}
154-
})))
155-
.addMethod(io.grpc.ServerMethodDefinition.create(
156-
METHOD_RUN_SERVER,
157-
asyncBidiStreamingCall(
158-
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
159-
io.grpc.testing.ServerArgs,
160-
io.grpc.testing.ServerStatus>() {
161-
@java.lang.Override
162-
public io.grpc.stub.StreamObserver<io.grpc.testing.ServerArgs> invoke(
163-
io.grpc.stub.StreamObserver<io.grpc.testing.ServerStatus> responseObserver) {
164-
return serviceImpl.runServer(responseObserver);
165-
}
166-
}))).build();
143+
.addMethod(
144+
METHOD_RUN_TEST,
145+
asyncBidiStreamingCall(
146+
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
147+
io.grpc.testing.ClientArgs,
148+
io.grpc.testing.ClientStatus>() {
149+
@java.lang.Override
150+
public io.grpc.stub.StreamObserver<io.grpc.testing.ClientArgs> invoke(
151+
io.grpc.stub.StreamObserver<io.grpc.testing.ClientStatus> responseObserver) {
152+
return serviceImpl.runTest(responseObserver);
153+
}
154+
}))
155+
.addMethod(
156+
METHOD_RUN_SERVER,
157+
asyncBidiStreamingCall(
158+
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
159+
io.grpc.testing.ServerArgs,
160+
io.grpc.testing.ServerStatus>() {
161+
@java.lang.Override
162+
public io.grpc.stub.StreamObserver<io.grpc.testing.ServerArgs> invoke(
163+
io.grpc.stub.StreamObserver<io.grpc.testing.ServerStatus> responseObserver) {
164+
return serviceImpl.runServer(responseObserver);
165+
}
166+
})).build();
167167
}
168168
}

‎compiler/src/java_plugin/cpp/java_generator.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service,
452452
"io.grpc.stub.ServerCalls.UnaryMethod";
453453
}
454454
}
455-
p->Print(*vars, ".addMethod($ServerMethodDefinition$.create(\n");
456-
p->Indent();
455+
p->Print(*vars, ".addMethod(\n");
457456
p->Indent();
458457
p->Print(
459458
*vars,
@@ -486,14 +485,13 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service,
486485
"}\n");
487486
}
488487
p->Outdent();
489-
p->Print("})))");
488+
p->Print("}))");
490489
if (i == service->method_count() - 1) {
491490
p->Print(".build();");
492491
}
493492
p->Print("\n");
494493
p->Outdent();
495494
p->Outdent();
496-
p->Outdent();
497495
}
498496
p->Outdent();
499497
p->Outdent();

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

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -225,67 +225,67 @@ public class TestServiceGrpc {
225225
public static io.grpc.ServerServiceDefinition bindService(
226226
final TestService serviceImpl) {
227227
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME)
228-
.addMethod(io.grpc.ServerMethodDefinition.create(
229-
METHOD_UNARY_CALL,
230-
asyncUnaryCall(
231-
new io.grpc.stub.ServerCalls.UnaryMethod<
232-
io.grpc.testing.integration.Test.SimpleRequest,
233-
io.grpc.testing.integration.Test.SimpleResponse>() {
234-
@java.lang.Override
235-
public void invoke(
236-
io.grpc.testing.integration.Test.SimpleRequest request,
237-
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.SimpleResponse> responseObserver) {
238-
serviceImpl.unaryCall(request, responseObserver);
239-
}
240-
})))
241-
.addMethod(io.grpc.ServerMethodDefinition.create(
242-
METHOD_STREAMING_OUTPUT_CALL,
243-
asyncServerStreamingCall(
244-
new io.grpc.stub.ServerCalls.ServerStreamingMethod<
245-
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
246-
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
247-
@java.lang.Override
248-
public void invoke(
249-
io.grpc.testing.integration.Test.StreamingOutputCallRequest request,
250-
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
251-
serviceImpl.streamingOutputCall(request, responseObserver);
252-
}
253-
})))
254-
.addMethod(io.grpc.ServerMethodDefinition.create(
255-
METHOD_STREAMING_INPUT_CALL,
256-
asyncClientStreamingCall(
257-
new io.grpc.stub.ServerCalls.ClientStreamingMethod<
258-
io.grpc.testing.integration.Test.StreamingInputCallRequest,
259-
io.grpc.testing.integration.Test.StreamingInputCallResponse>() {
260-
@java.lang.Override
261-
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingInputCallRequest> invoke(
262-
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingInputCallResponse> responseObserver) {
263-
return serviceImpl.streamingInputCall(responseObserver);
264-
}
265-
})))
266-
.addMethod(io.grpc.ServerMethodDefinition.create(
267-
METHOD_FULL_BIDI_CALL,
268-
asyncBidiStreamingCall(
269-
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
270-
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
271-
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
272-
@java.lang.Override
273-
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallRequest> invoke(
274-
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
275-
return serviceImpl.fullBidiCall(responseObserver);
276-
}
277-
})))
278-
.addMethod(io.grpc.ServerMethodDefinition.create(
279-
METHOD_HALF_BIDI_CALL,
280-
asyncBidiStreamingCall(
281-
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
282-
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
283-
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
284-
@java.lang.Override
285-
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallRequest> invoke(
286-
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
287-
return serviceImpl.halfBidiCall(responseObserver);
288-
}
289-
}))).build();
228+
.addMethod(
229+
METHOD_UNARY_CALL,
230+
asyncUnaryCall(
231+
new io.grpc.stub.ServerCalls.UnaryMethod<
232+
io.grpc.testing.integration.Test.SimpleRequest,
233+
io.grpc.testing.integration.Test.SimpleResponse>() {
234+
@java.lang.Override
235+
public void invoke(
236+
io.grpc.testing.integration.Test.SimpleRequest request,
237+
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.SimpleResponse> responseObserver) {
238+
serviceImpl.unaryCall(request, responseObserver);
239+
}
240+
}))
241+
.addMethod(
242+
METHOD_STREAMING_OUTPUT_CALL,
243+
asyncServerStreamingCall(
244+
new io.grpc.stub.ServerCalls.ServerStreamingMethod<
245+
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
246+
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
247+
@java.lang.Override
248+
public void invoke(
249+
io.grpc.testing.integration.Test.StreamingOutputCallRequest request,
250+
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
251+
serviceImpl.streamingOutputCall(request, responseObserver);
252+
}
253+
}))
254+
.addMethod(
255+
METHOD_STREAMING_INPUT_CALL,
256+
asyncClientStreamingCall(
257+
new io.grpc.stub.ServerCalls.ClientStreamingMethod<
258+
io.grpc.testing.integration.Test.StreamingInputCallRequest,
259+
io.grpc.testing.integration.Test.StreamingInputCallResponse>() {
260+
@java.lang.Override
261+
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingInputCallRequest> invoke(
262+
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingInputCallResponse> responseObserver) {
263+
return serviceImpl.streamingInputCall(responseObserver);
264+
}
265+
}))
266+
.addMethod(
267+
METHOD_FULL_BIDI_CALL,
268+
asyncBidiStreamingCall(
269+
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
270+
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
271+
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
272+
@java.lang.Override
273+
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallRequest> invoke(
274+
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
275+
return serviceImpl.fullBidiCall(responseObserver);
276+
}
277+
}))
278+
.addMethod(
279+
METHOD_HALF_BIDI_CALL,
280+
asyncBidiStreamingCall(
281+
new io.grpc.stub.ServerCalls.BidiStreamingMethod<
282+
io.grpc.testing.integration.Test.StreamingOutputCallRequest,
283+
io.grpc.testing.integration.Test.StreamingOutputCallResponse>() {
284+
@java.lang.Override
285+
public io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallRequest> invoke(
286+
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Test.StreamingOutputCallResponse> responseObserver) {
287+
return serviceImpl.halfBidiCall(responseObserver);
288+
}
289+
})).build();
290290
}
291291
}

0 commit comments

Comments
 (0)