Skip to content

Commit e109125

Browse files
dapengzhang0dapengzhang0
authored
compiler: add build option to enable deprecated generated code
partially resolving grpc#1469 The added option for java_plugin `enable_deprecated` is `true` by default in `java_plugin.cpp`, so the generated code for `TestService.java` (`compiler/build.gradle` not setting this option) has all deprecated interfaces and static bindService method. `./build.gradle` and `examples/build.gradle` set this option explicitly to `false`, so all the other generated classes do not have deprecated code. Will set `enable_deprecated` to `false` by default in future PR when we are ready.
1 parent e23d7ec commit e109125

File tree

16 files changed

+1479
-1142
lines changed

16 files changed

+1479
-1142
lines changed

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

Lines changed: 53 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static BenchmarkServiceFutureStub newFutureStub(
7171

7272
/**
7373
*/
74-
@java.lang.Deprecated public static interface BenchmarkService {
74+
public static abstract class BenchmarkServiceImplBase implements io.grpc.BindableService {
7575

7676
/**
7777
* <pre>
@@ -80,67 +80,44 @@ public static BenchmarkServiceFutureStub newFutureStub(
8080
* </pre>
8181
*/
8282
public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request,
83-
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver);
83+
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver) {
84+
asyncUnimplementedUnaryCall(METHOD_UNARY_CALL, responseObserver);
85+
}
8486

8587
/**
8688
* <pre>
8789
* One request followed by one response.
8890
* The server returns the client payload as-is.
8991
* </pre>
9092
*/
91-
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleRequest> streamingCall(
92-
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver);
93-
}
94-
95-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1469")
96-
public static abstract class BenchmarkServiceImplBase implements BenchmarkService, io.grpc.BindableService {
97-
98-
@java.lang.Override
99-
public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request,
100-
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver) {
101-
asyncUnimplementedUnaryCall(METHOD_UNARY_CALL, responseObserver);
102-
}
103-
104-
@java.lang.Override
10593
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleRequest> streamingCall(
10694
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver) {
10795
return asyncUnimplementedStreamingCall(METHOD_STREAMING_CALL, responseObserver);
10896
}
10997

11098
@java.lang.Override public io.grpc.ServerServiceDefinition bindService() {
111-
return BenchmarkServiceGrpc.bindService(this);
99+
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
100+
.addMethod(
101+
METHOD_UNARY_CALL,
102+
asyncUnaryCall(
103+
new MethodHandlers<
104+
io.grpc.benchmarks.proto.Messages.SimpleRequest,
105+
io.grpc.benchmarks.proto.Messages.SimpleResponse>(
106+
this, METHODID_UNARY_CALL)))
107+
.addMethod(
108+
METHOD_STREAMING_CALL,
109+
asyncBidiStreamingCall(
110+
new MethodHandlers<
111+
io.grpc.benchmarks.proto.Messages.SimpleRequest,
112+
io.grpc.benchmarks.proto.Messages.SimpleResponse>(
113+
this, METHODID_STREAMING_CALL)))
114+
.build();
112115
}
113116
}
114117

115118
/**
116119
*/
117-
@java.lang.Deprecated public static interface BenchmarkServiceBlockingClient {
118-
119-
/**
120-
* <pre>
121-
* One request followed by one response.
122-
* The server returns the client payload as-is.
123-
* </pre>
124-
*/
125-
public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request);
126-
}
127-
128-
/**
129-
*/
130-
@java.lang.Deprecated public static interface BenchmarkServiceFutureClient {
131-
132-
/**
133-
* <pre>
134-
* One request followed by one response.
135-
* The server returns the client payload as-is.
136-
* </pre>
137-
*/
138-
public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.proto.Messages.SimpleResponse> unaryCall(
139-
io.grpc.benchmarks.proto.Messages.SimpleRequest request);
140-
}
141-
142-
public static class BenchmarkServiceStub extends io.grpc.stub.AbstractStub<BenchmarkServiceStub>
143-
implements BenchmarkService {
120+
public static class BenchmarkServiceStub extends io.grpc.stub.AbstractStub<BenchmarkServiceStub> {
144121
private BenchmarkServiceStub(io.grpc.Channel channel) {
145122
super(channel);
146123
}
@@ -156,23 +133,34 @@ protected BenchmarkServiceStub build(io.grpc.Channel channel,
156133
return new BenchmarkServiceStub(channel, callOptions);
157134
}
158135

159-
@java.lang.Override
136+
/**
137+
* <pre>
138+
* One request followed by one response.
139+
* The server returns the client payload as-is.
140+
* </pre>
141+
*/
160142
public void unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request,
161143
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver) {
162144
asyncUnaryCall(
163145
getChannel().newCall(METHOD_UNARY_CALL, getCallOptions()), request, responseObserver);
164146
}
165147

166-
@java.lang.Override
148+
/**
149+
* <pre>
150+
* One request followed by one response.
151+
* The server returns the client payload as-is.
152+
* </pre>
153+
*/
167154
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleRequest> streamingCall(
168155
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Messages.SimpleResponse> responseObserver) {
169156
return asyncBidiStreamingCall(
170157
getChannel().newCall(METHOD_STREAMING_CALL, getCallOptions()), responseObserver);
171158
}
172159
}
173160

174-
public static class BenchmarkServiceBlockingStub extends io.grpc.stub.AbstractStub<BenchmarkServiceBlockingStub>
175-
implements BenchmarkServiceBlockingClient {
161+
/**
162+
*/
163+
public static class BenchmarkServiceBlockingStub extends io.grpc.stub.AbstractStub<BenchmarkServiceBlockingStub> {
176164
private BenchmarkServiceBlockingStub(io.grpc.Channel channel) {
177165
super(channel);
178166
}
@@ -188,15 +176,21 @@ protected BenchmarkServiceBlockingStub build(io.grpc.Channel channel,
188176
return new BenchmarkServiceBlockingStub(channel, callOptions);
189177
}
190178

191-
@java.lang.Override
179+
/**
180+
* <pre>
181+
* One request followed by one response.
182+
* The server returns the client payload as-is.
183+
* </pre>
184+
*/
192185
public io.grpc.benchmarks.proto.Messages.SimpleResponse unaryCall(io.grpc.benchmarks.proto.Messages.SimpleRequest request) {
193186
return blockingUnaryCall(
194187
getChannel(), METHOD_UNARY_CALL, getCallOptions(), request);
195188
}
196189
}
197190

198-
public static class BenchmarkServiceFutureStub extends io.grpc.stub.AbstractStub<BenchmarkServiceFutureStub>
199-
implements BenchmarkServiceFutureClient {
191+
/**
192+
*/
193+
public static class BenchmarkServiceFutureStub extends io.grpc.stub.AbstractStub<BenchmarkServiceFutureStub> {
200194
private BenchmarkServiceFutureStub(io.grpc.Channel channel) {
201195
super(channel);
202196
}
@@ -212,16 +206,19 @@ protected BenchmarkServiceFutureStub build(io.grpc.Channel channel,
212206
return new BenchmarkServiceFutureStub(channel, callOptions);
213207
}
214208

215-
@java.lang.Override
209+
/**
210+
* <pre>
211+
* One request followed by one response.
212+
* The server returns the client payload as-is.
213+
* </pre>
214+
*/
216215
public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.proto.Messages.SimpleResponse> unaryCall(
217216
io.grpc.benchmarks.proto.Messages.SimpleRequest request) {
218217
return futureUnaryCall(
219218
getChannel().newCall(METHOD_UNARY_CALL, getCallOptions()), request);
220219
}
221220
}
222221

223-
@java.lang.Deprecated public static abstract class AbstractBenchmarkService extends BenchmarkServiceImplBase {}
224-
225222
private static final int METHODID_UNARY_CALL = 0;
226223
private static final int METHODID_STREAMING_CALL = 1;
227224

@@ -230,10 +227,10 @@ private static class MethodHandlers<Req, Resp> implements
230227
io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
231228
io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
232229
io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
233-
private final BenchmarkService serviceImpl;
230+
private final BenchmarkServiceImplBase serviceImpl;
234231
private final int methodId;
235232

236-
public MethodHandlers(BenchmarkService serviceImpl, int methodId) {
233+
public MethodHandlers(BenchmarkServiceImplBase serviceImpl, int methodId) {
237234
this.serviceImpl = serviceImpl;
238235
this.methodId = methodId;
239236
}
@@ -271,23 +268,4 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
271268
METHOD_STREAMING_CALL);
272269
}
273270

274-
@java.lang.Deprecated public static io.grpc.ServerServiceDefinition bindService(
275-
final BenchmarkService serviceImpl) {
276-
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
277-
.addMethod(
278-
METHOD_UNARY_CALL,
279-
asyncUnaryCall(
280-
new MethodHandlers<
281-
io.grpc.benchmarks.proto.Messages.SimpleRequest,
282-
io.grpc.benchmarks.proto.Messages.SimpleResponse>(
283-
serviceImpl, METHODID_UNARY_CALL)))
284-
.addMethod(
285-
METHOD_STREAMING_CALL,
286-
asyncBidiStreamingCall(
287-
new MethodHandlers<
288-
io.grpc.benchmarks.proto.Messages.SimpleRequest,
289-
io.grpc.benchmarks.proto.Messages.SimpleResponse>(
290-
serviceImpl, METHODID_STREAMING_CALL)))
291-
.build();
292-
}
293271
}

0 commit comments

Comments
 (0)