Skip to content

Commit 8d536a1

Browse files
author
Alexander Furer
committed
2.4.0 release with :
springBoot_1_X_Version = '1.5.13.RELEASE' springBoot_2_X_Version = '2.0.3.RELEASE' grpcVersion = '1.13.1'
1 parent 68fa890 commit 8d536a1

File tree

6 files changed

+25
-57
lines changed

6 files changed

+25
-57
lines changed

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121
2222
}
2323
dependencies {
24-
compile('org.lognet:grpc-spring-boot-starter:2.3.2')
24+
compile('org.lognet:grpc-spring-boot-starter:2.4.0')
2525
}
2626
----
2727

‎ReleaseNotes.adoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
== Version 2.4.0
2+
* gRPC version upgraded to 1.13.1
3+
* Tested with
4+
** springBoot_1_X_Version = '1.5.13.RELEASE'
5+
** springBoot_2_X_Version = '2.0.3.RELEASE'
6+
17
== Version 2.3.2
28
* Server reflection support
39

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
buildscript {
33
ext {
4-
springBoot_1_X_Version = '1.5.11.RELEASE'
5-
springBoot_2_X_Version = '2.0.1.RELEASE'
6-
grpcVersion = '1.11.0'
4+
springBoot_1_X_Version = '1.5.13.RELEASE'
5+
springBoot_2_X_Version = '2.0.3.RELEASE'
6+
grpcVersion = '1.13.1'
77
}
88
repositories {
99
mavenCentral()

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.3.3-SNAPSHOT
1+
version=2.4.0
22
#group=io.github.lognet
33
group=org.lognet
44
description=Spring Boot starter for Google RPC.

‎grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
package io.grpc.examples;
22

33
import static io.grpc.MethodDescriptor.generateFullMethodName;
4-
import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
5-
import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
6-
import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
74
import static io.grpc.stub.ClientCalls.asyncUnaryCall;
8-
import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
95
import static io.grpc.stub.ClientCalls.blockingUnaryCall;
106
import static io.grpc.stub.ClientCalls.futureUnaryCall;
11-
import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
12-
import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
13-
import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
147
import static io.grpc.stub.ServerCalls.asyncUnaryCall;
15-
import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
168
import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
179

1810
/**
1911
*/
2012
@javax.annotation.Generated(
21-
value = "by gRPC proto compiler (version 1.11.0)",
13+
value = "by gRPC proto compiler (version 1.13.1)",
2214
comments = "Source: calculator.proto")
2315
public final class CalculatorGrpc {
2416

@@ -27,22 +19,11 @@ private CalculatorGrpc() {}
2719
public static final String SERVICE_NAME = "Calculator";
2820

2921
// Static method descriptors that strictly reflect the proto.
30-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
31-
@java.lang.Deprecated // Use {@link #getCalculateMethod()} instead.
32-
public static final io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
33-
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> METHOD_CALCULATE = getCalculateMethodHelper();
34-
3522
private static volatile io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
3623
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
3724

38-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
3925
public static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
4026
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
41-
return getCalculateMethodHelper();
42-
}
43-
44-
private static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
45-
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethodHelper() {
4627
io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
4728
if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
4829
synchronized (CalculatorGrpc.class) {
@@ -96,13 +77,13 @@ public static abstract class CalculatorImplBase implements io.grpc.BindableServi
9677
*/
9778
public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
9879
io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
99-
asyncUnimplementedUnaryCall(getCalculateMethodHelper(), responseObserver);
80+
asyncUnimplementedUnaryCall(getCalculateMethod(), responseObserver);
10081
}
10182

10283
@java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
10384
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
10485
.addMethod(
105-
getCalculateMethodHelper(),
86+
getCalculateMethod(),
10687
asyncUnaryCall(
10788
new MethodHandlers<
10889
io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
@@ -135,7 +116,7 @@ protected CalculatorStub build(io.grpc.Channel channel,
135116
public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
136117
io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
137118
asyncUnaryCall(
138-
getChannel().newCall(getCalculateMethodHelper(), getCallOptions()), request, responseObserver);
119+
getChannel().newCall(getCalculateMethod(), getCallOptions()), request, responseObserver);
139120
}
140121
}
141122

@@ -161,7 +142,7 @@ protected CalculatorBlockingStub build(io.grpc.Channel channel,
161142
*/
162143
public io.grpc.examples.CalculatorOuterClass.CalculatorResponse calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
163144
return blockingUnaryCall(
164-
getChannel(), getCalculateMethodHelper(), getCallOptions(), request);
145+
getChannel(), getCalculateMethod(), getCallOptions(), request);
165146
}
166147
}
167148

@@ -188,7 +169,7 @@ protected CalculatorFutureStub build(io.grpc.Channel channel,
188169
public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> calculate(
189170
io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
190171
return futureUnaryCall(
191-
getChannel().newCall(getCalculateMethodHelper(), getCallOptions()), request);
172+
getChannel().newCall(getCalculateMethod(), getCallOptions()), request);
192173
}
193174
}
194175

@@ -276,7 +257,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
276257
if (result == null) {
277258
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
278259
.setSchemaDescriptor(new CalculatorFileDescriptorSupplier())
279-
.addMethod(getCalculateMethodHelper())
260+
.addMethod(getCalculateMethod())
280261
.build();
281262
}
282263
}

‎grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
package io.grpc.examples;
22

33
import static io.grpc.MethodDescriptor.generateFullMethodName;
4-
import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
5-
import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
6-
import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
74
import static io.grpc.stub.ClientCalls.asyncUnaryCall;
8-
import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
95
import static io.grpc.stub.ClientCalls.blockingUnaryCall;
106
import static io.grpc.stub.ClientCalls.futureUnaryCall;
11-
import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
12-
import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
13-
import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
147
import static io.grpc.stub.ServerCalls.asyncUnaryCall;
15-
import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
168
import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
179

1810
/**
@@ -21,7 +13,7 @@
2113
* </pre>
2214
*/
2315
@javax.annotation.Generated(
24-
value = "by gRPC proto compiler (version 1.11.0)",
16+
value = "by gRPC proto compiler (version 1.13.1)",
2517
comments = "Source: greeter.proto")
2618
public final class GreeterGrpc {
2719

@@ -30,22 +22,11 @@ private GreeterGrpc() {}
3022
public static final String SERVICE_NAME = "Greeter";
3123

3224
// Static method descriptors that strictly reflect the proto.
33-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
34-
@java.lang.Deprecated // Use {@link #getSayHelloMethod()} instead.
35-
public static final io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
36-
io.grpc.examples.GreeterOuterClass.HelloReply> METHOD_SAY_HELLO = getSayHelloMethodHelper();
37-
3825
private static volatile io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
3926
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
4027

41-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
4228
public static io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
4329
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod() {
44-
return getSayHelloMethodHelper();
45-
}
46-
47-
private static io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
48-
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethodHelper() {
4930
io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
5031
if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
5132
synchronized (GreeterGrpc.class) {
@@ -105,13 +86,13 @@ public static abstract class GreeterImplBase implements io.grpc.BindableService
10586
*/
10687
public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
10788
io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver) {
108-
asyncUnimplementedUnaryCall(getSayHelloMethodHelper(), responseObserver);
89+
asyncUnimplementedUnaryCall(getSayHelloMethod(), responseObserver);
10990
}
11091

11192
@java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
11293
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
11394
.addMethod(
114-
getSayHelloMethodHelper(),
95+
getSayHelloMethod(),
11596
asyncUnaryCall(
11697
new MethodHandlers<
11798
io.grpc.examples.GreeterOuterClass.HelloRequest,
@@ -150,7 +131,7 @@ protected GreeterStub build(io.grpc.Channel channel,
150131
public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
151132
io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver) {
152133
asyncUnaryCall(
153-
getChannel().newCall(getSayHelloMethodHelper(), getCallOptions()), request, responseObserver);
134+
getChannel().newCall(getSayHelloMethod(), getCallOptions()), request, responseObserver);
154135
}
155136
}
156137

@@ -182,7 +163,7 @@ protected GreeterBlockingStub build(io.grpc.Channel channel,
182163
*/
183164
public io.grpc.examples.GreeterOuterClass.HelloReply sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request) {
184165
return blockingUnaryCall(
185-
getChannel(), getSayHelloMethodHelper(), getCallOptions(), request);
166+
getChannel(), getSayHelloMethod(), getCallOptions(), request);
186167
}
187168
}
188169

@@ -215,7 +196,7 @@ protected GreeterFutureStub build(io.grpc.Channel channel,
215196
public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.GreeterOuterClass.HelloReply> sayHello(
216197
io.grpc.examples.GreeterOuterClass.HelloRequest request) {
217198
return futureUnaryCall(
218-
getChannel().newCall(getSayHelloMethodHelper(), getCallOptions()), request);
199+
getChannel().newCall(getSayHelloMethod(), getCallOptions()), request);
219200
}
220201
}
221202

@@ -303,7 +284,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
303284
if (result == null) {
304285
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
305286
.setSchemaDescriptor(new GreeterFileDescriptorSupplier())
306-
.addMethod(getSayHelloMethodHelper())
287+
.addMethod(getSayHelloMethod())
307288
.build();
308289
}
309290
}

0 commit comments

Comments
 (0)