Skip to content

Commit 8854330

Browse files
author
Alexander Furer
committed
release 2.4.2
1 parent f3e589e commit 8854330

File tree

6 files changed

+60
-47
lines changed

6 files changed

+60
-47
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.4.1')
24+
compile('org.lognet:grpc-spring-boot-starter:2.4.2')
2525
}
2626
----
2727

‎ReleaseNotes.adoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
== Version 2.4.2
2+
* gRPC version upgraded to 1.15.0
3+
14
== Version 2.4.1
25
* Gradle 4.10
36
* Fixes #93

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
ext {
44
springBoot_1_X_Version = '1.5.13.RELEASE'
55
springBoot_2_X_Version = '2.0.3.RELEASE'
6-
grpcVersion = '1.13.1'
6+
grpcVersion = '1.15.0'
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.4.2-SNAPSHOT
1+
version=2.4.2
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: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
*/
1212
@javax.annotation.Generated(
13-
value = "by gRPC proto compiler (version 1.13.1)",
13+
value = "by gRPC proto compiler (version 1.15.0)",
1414
comments = "Source: calculator.proto")
1515
public final class CalculatorGrpc {
1616

@@ -22,29 +22,34 @@ private CalculatorGrpc() {}
2222
private static volatile io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
2323
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
2424

25-
public static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
26-
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
27-
io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
28-
if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
29-
synchronized (CalculatorGrpc.class) {
25+
@io.grpc.stub.annotations.RpcMethod(
26+
fullMethodName = SERVICE_NAME + '/' + "Calculate",
27+
requestType = io.grpc.examples.CalculatorOuterClass.CalculatorRequest.class,
28+
responseType = io.grpc.examples.CalculatorOuterClass.CalculatorResponse.class,
29+
methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
30+
public static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
31+
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
32+
io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
3033
if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
31-
CalculatorGrpc.getCalculateMethod = getCalculateMethod =
32-
io.grpc.MethodDescriptor.<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse>newBuilder()
33-
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
34-
.setFullMethodName(generateFullMethodName(
35-
"Calculator", "Calculate"))
36-
.setSampledToLocalTracing(true)
37-
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
38-
io.grpc.examples.CalculatorOuterClass.CalculatorRequest.getDefaultInstance()))
39-
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
40-
io.grpc.examples.CalculatorOuterClass.CalculatorResponse.getDefaultInstance()))
41-
.setSchemaDescriptor(new CalculatorMethodDescriptorSupplier("Calculate"))
42-
.build();
43-
}
34+
synchronized (CalculatorGrpc.class) {
35+
if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
36+
CalculatorGrpc.getCalculateMethod = getCalculateMethod =
37+
io.grpc.MethodDescriptor.<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse>newBuilder()
38+
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
39+
.setFullMethodName(generateFullMethodName(
40+
"Calculator", "Calculate"))
41+
.setSampledToLocalTracing(true)
42+
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
43+
io.grpc.examples.CalculatorOuterClass.CalculatorRequest.getDefaultInstance()))
44+
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
45+
io.grpc.examples.CalculatorOuterClass.CalculatorResponse.getDefaultInstance()))
46+
.setSchemaDescriptor(new CalculatorMethodDescriptorSupplier("Calculate"))
47+
.build();
48+
}
49+
}
4450
}
45-
}
46-
return getCalculateMethod;
47-
}
51+
return getCalculateMethod;
52+
}
4853

4954
/**
5055
* Creates a new async stub that supports all call types for the service

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

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* </pre>
1414
*/
1515
@javax.annotation.Generated(
16-
value = "by gRPC proto compiler (version 1.13.1)",
16+
value = "by gRPC proto compiler (version 1.15.0)",
1717
comments = "Source: greeter.proto")
1818
public final class GreeterGrpc {
1919

@@ -25,29 +25,34 @@ private GreeterGrpc() {}
2525
private static volatile io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
2626
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
2727

28-
public static io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
29-
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod() {
30-
io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
31-
if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
32-
synchronized (GreeterGrpc.class) {
28+
@io.grpc.stub.annotations.RpcMethod(
29+
fullMethodName = SERVICE_NAME + '/' + "SayHello",
30+
requestType = io.grpc.examples.GreeterOuterClass.HelloRequest.class,
31+
responseType = io.grpc.examples.GreeterOuterClass.HelloReply.class,
32+
methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
33+
public static io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
34+
io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod() {
35+
io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
3336
if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
34-
GreeterGrpc.getSayHelloMethod = getSayHelloMethod =
35-
io.grpc.MethodDescriptor.<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply>newBuilder()
36-
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
37-
.setFullMethodName(generateFullMethodName(
38-
"Greeter", "SayHello"))
39-
.setSampledToLocalTracing(true)
40-
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
41-
io.grpc.examples.GreeterOuterClass.HelloRequest.getDefaultInstance()))
42-
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
43-
io.grpc.examples.GreeterOuterClass.HelloReply.getDefaultInstance()))
44-
.setSchemaDescriptor(new GreeterMethodDescriptorSupplier("SayHello"))
45-
.build();
46-
}
37+
synchronized (GreeterGrpc.class) {
38+
if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
39+
GreeterGrpc.getSayHelloMethod = getSayHelloMethod =
40+
io.grpc.MethodDescriptor.<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply>newBuilder()
41+
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
42+
.setFullMethodName(generateFullMethodName(
43+
"Greeter", "SayHello"))
44+
.setSampledToLocalTracing(true)
45+
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
46+
io.grpc.examples.GreeterOuterClass.HelloRequest.getDefaultInstance()))
47+
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
48+
io.grpc.examples.GreeterOuterClass.HelloReply.getDefaultInstance()))
49+
.setSchemaDescriptor(new GreeterMethodDescriptorSupplier("SayHello"))
50+
.build();
51+
}
52+
}
4753
}
48-
}
49-
return getSayHelloMethod;
50-
}
54+
return getSayHelloMethod;
55+
}
5156

5257
/**
5358
* Creates a new async stub that supports all call types for the service

0 commit comments

Comments
 (0)