Skip to content

Commit 9e643ae

Browse files
author
Alexander Furer
committed
release version=3.5.2
1 parent 5089b0d commit 9e643ae

File tree

7 files changed

+94
-72
lines changed

7 files changed

+94
-72
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repositories {
2727
2828
}
2929
dependencies {
30-
compile 'io.github.lognet:grpc-spring-boot-starter:3.5.1'
30+
compile 'io.github.lognet:grpc-spring-boot-starter:3.5.2'
3131
}
3232
3333

ReleaseNotes.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
== Version 3.5.2
2+
* gRPC version upgraded to 1.27.2
3+
* Gradle 5.6.3
4+
15
== Version 3.5.1
26
* Graceful shutdown timeout setting
37
* Fixed potential race condition issue when defining running port.

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext {
33
springBoot_1_X_Version = '1.5.13.RELEASE'
44
springBoot_2_X_Version = '2.1.3.RELEASE'
5-
grpcVersion = '1.25.0'
5+
grpcVersion = '1.27.2'
66
}
77
repositories {
88
mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414
dependencies {
1515
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"
16-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
16+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
1717
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.0.0"
1818
classpath 'com.palantir:jacoco-coverage:0.4.0'
1919
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1"
@@ -59,9 +59,10 @@ subprojects {
5959

6060

6161
dependencies {
62-
compileOnly('org.projectlombok:lombok:1.16.20')
63-
testCompileOnly('org.projectlombok:lombok:1.16.20')
64-
}
62+
["annotationProcessor", "testAnnotationProcessor", "compileOnly", "testCompileOnly"].each { conf ->
63+
add(conf, "org.projectlombok:lombok:1.18.12")
64+
}
65+
}
6566

6667
}
6768

@@ -76,7 +77,7 @@ task codeCoverageReport(type: JacocoReport) {
7677

7778
reports {
7879
xml.enabled true
79-
xml.destination "${buildDir}/reports/jacoco/report.xml"
80+
xml.destination = new File(buildDir,"reports/jacoco/report.xml")
8081
html.enabled false
8182
csv.enabled false
8283
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.5.2-SNAPSHOT
1+
version=3.5.2
22
group=io.github.lognet
33
description=Spring Boot starter for Google RPC.
44
gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Sep 12 11:15:37 IDT 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

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

Lines changed: 40 additions & 31 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.25.0)",
13+
value = "by gRPC proto compiler (version 1.27.2)",
1414
comments = "Source: calculator.proto")
1515
public final class CalculatorGrpc {
1616

@@ -54,23 +54,44 @@ io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
5454
* Creates a new async stub that supports all call types for the service
5555
*/
5656
public static CalculatorStub newStub(io.grpc.Channel channel) {
57-
return new CalculatorStub(channel);
57+
io.grpc.stub.AbstractStub.StubFactory<CalculatorStub> factory =
58+
new io.grpc.stub.AbstractStub.StubFactory<CalculatorStub>() {
59+
@java.lang.Override
60+
public CalculatorStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
61+
return new CalculatorStub(channel, callOptions);
62+
}
63+
};
64+
return CalculatorStub.newStub(factory, channel);
5865
}
5966

6067
/**
6168
* Creates a new blocking-style stub that supports unary and streaming output calls on the service
6269
*/
6370
public static CalculatorBlockingStub newBlockingStub(
6471
io.grpc.Channel channel) {
65-
return new CalculatorBlockingStub(channel);
72+
io.grpc.stub.AbstractStub.StubFactory<CalculatorBlockingStub> factory =
73+
new io.grpc.stub.AbstractStub.StubFactory<CalculatorBlockingStub>() {
74+
@java.lang.Override
75+
public CalculatorBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
76+
return new CalculatorBlockingStub(channel, callOptions);
77+
}
78+
};
79+
return CalculatorBlockingStub.newStub(factory, channel);
6680
}
6781

6882
/**
6983
* Creates a new ListenableFuture-style stub that supports unary calls on the service
7084
*/
7185
public static CalculatorFutureStub newFutureStub(
7286
io.grpc.Channel channel) {
73-
return new CalculatorFutureStub(channel);
87+
io.grpc.stub.AbstractStub.StubFactory<CalculatorFutureStub> factory =
88+
new io.grpc.stub.AbstractStub.StubFactory<CalculatorFutureStub>() {
89+
@java.lang.Override
90+
public CalculatorFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
91+
return new CalculatorFutureStub(channel, callOptions);
92+
}
93+
};
94+
return CalculatorFutureStub.newStub(factory, channel);
7495
}
7596

7697
/**
@@ -99,19 +120,15 @@ public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest re
99120

100121
/**
101122
*/
102-
public static final class CalculatorStub extends io.grpc.stub.AbstractStub<CalculatorStub> {
103-
private CalculatorStub(io.grpc.Channel channel) {
104-
super(channel);
105-
}
106-
107-
private CalculatorStub(io.grpc.Channel channel,
108-
io.grpc.CallOptions callOptions) {
123+
public static final class CalculatorStub extends io.grpc.stub.AbstractAsyncStub<CalculatorStub> {
124+
private CalculatorStub(
125+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
109126
super(channel, callOptions);
110127
}
111128

112129
@java.lang.Override
113-
protected CalculatorStub build(io.grpc.Channel channel,
114-
io.grpc.CallOptions callOptions) {
130+
protected CalculatorStub build(
131+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
115132
return new CalculatorStub(channel, callOptions);
116133
}
117134

@@ -126,19 +143,15 @@ public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest re
126143

127144
/**
128145
*/
129-
public static final class CalculatorBlockingStub extends io.grpc.stub.AbstractStub<CalculatorBlockingStub> {
130-
private CalculatorBlockingStub(io.grpc.Channel channel) {
131-
super(channel);
132-
}
133-
134-
private CalculatorBlockingStub(io.grpc.Channel channel,
135-
io.grpc.CallOptions callOptions) {
146+
public static final class CalculatorBlockingStub extends io.grpc.stub.AbstractBlockingStub<CalculatorBlockingStub> {
147+
private CalculatorBlockingStub(
148+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
136149
super(channel, callOptions);
137150
}
138151

139152
@java.lang.Override
140-
protected CalculatorBlockingStub build(io.grpc.Channel channel,
141-
io.grpc.CallOptions callOptions) {
153+
protected CalculatorBlockingStub build(
154+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
142155
return new CalculatorBlockingStub(channel, callOptions);
143156
}
144157

@@ -152,19 +165,15 @@ public io.grpc.examples.CalculatorOuterClass.CalculatorResponse calculate(io.grp
152165

153166
/**
154167
*/
155-
public static final class CalculatorFutureStub extends io.grpc.stub.AbstractStub<CalculatorFutureStub> {
156-
private CalculatorFutureStub(io.grpc.Channel channel) {
157-
super(channel);
158-
}
159-
160-
private CalculatorFutureStub(io.grpc.Channel channel,
161-
io.grpc.CallOptions callOptions) {
168+
public static final class CalculatorFutureStub extends io.grpc.stub.AbstractFutureStub<CalculatorFutureStub> {
169+
private CalculatorFutureStub(
170+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
162171
super(channel, callOptions);
163172
}
164173

165174
@java.lang.Override
166-
protected CalculatorFutureStub build(io.grpc.Channel channel,
167-
io.grpc.CallOptions callOptions) {
175+
protected CalculatorFutureStub build(
176+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
168177
return new CalculatorFutureStub(channel, callOptions);
169178
}
170179

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

Lines changed: 40 additions & 31 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.25.0)",
16+
value = "by gRPC proto compiler (version 1.27.2)",
1717
comments = "Source: greeter.proto")
1818
public final class GreeterGrpc {
1919

@@ -57,23 +57,44 @@ io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod() {
5757
* Creates a new async stub that supports all call types for the service
5858
*/
5959
public static GreeterStub newStub(io.grpc.Channel channel) {
60-
return new GreeterStub(channel);
60+
io.grpc.stub.AbstractStub.StubFactory<GreeterStub> factory =
61+
new io.grpc.stub.AbstractStub.StubFactory<GreeterStub>() {
62+
@java.lang.Override
63+
public GreeterStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
64+
return new GreeterStub(channel, callOptions);
65+
}
66+
};
67+
return GreeterStub.newStub(factory, channel);
6168
}
6269

6370
/**
6471
* Creates a new blocking-style stub that supports unary and streaming output calls on the service
6572
*/
6673
public static GreeterBlockingStub newBlockingStub(
6774
io.grpc.Channel channel) {
68-
return new GreeterBlockingStub(channel);
75+
io.grpc.stub.AbstractStub.StubFactory<GreeterBlockingStub> factory =
76+
new io.grpc.stub.AbstractStub.StubFactory<GreeterBlockingStub>() {
77+
@java.lang.Override
78+
public GreeterBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
79+
return new GreeterBlockingStub(channel, callOptions);
80+
}
81+
};
82+
return GreeterBlockingStub.newStub(factory, channel);
6983
}
7084

7185
/**
7286
* Creates a new ListenableFuture-style stub that supports unary calls on the service
7387
*/
7488
public static GreeterFutureStub newFutureStub(
7589
io.grpc.Channel channel) {
76-
return new GreeterFutureStub(channel);
90+
io.grpc.stub.AbstractStub.StubFactory<GreeterFutureStub> factory =
91+
new io.grpc.stub.AbstractStub.StubFactory<GreeterFutureStub>() {
92+
@java.lang.Override
93+
public GreeterFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
94+
return new GreeterFutureStub(channel, callOptions);
95+
}
96+
};
97+
return GreeterFutureStub.newStub(factory, channel);
7798
}
7899

79100
/**
@@ -111,19 +132,15 @@ public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
111132
* The greeter service definition.
112133
* </pre>
113134
*/
114-
public static final class GreeterStub extends io.grpc.stub.AbstractStub<GreeterStub> {
115-
private GreeterStub(io.grpc.Channel channel) {
116-
super(channel);
117-
}
118-
119-
private GreeterStub(io.grpc.Channel channel,
120-
io.grpc.CallOptions callOptions) {
135+
public static final class GreeterStub extends io.grpc.stub.AbstractAsyncStub<GreeterStub> {
136+
private GreeterStub(
137+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
121138
super(channel, callOptions);
122139
}
123140

124141
@java.lang.Override
125-
protected GreeterStub build(io.grpc.Channel channel,
126-
io.grpc.CallOptions callOptions) {
142+
protected GreeterStub build(
143+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
127144
return new GreeterStub(channel, callOptions);
128145
}
129146

@@ -144,19 +161,15 @@ public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
144161
* The greeter service definition.
145162
* </pre>
146163
*/
147-
public static final class GreeterBlockingStub extends io.grpc.stub.AbstractStub<GreeterBlockingStub> {
148-
private GreeterBlockingStub(io.grpc.Channel channel) {
149-
super(channel);
150-
}
151-
152-
private GreeterBlockingStub(io.grpc.Channel channel,
153-
io.grpc.CallOptions callOptions) {
164+
public static final class GreeterBlockingStub extends io.grpc.stub.AbstractBlockingStub<GreeterBlockingStub> {
165+
private GreeterBlockingStub(
166+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
154167
super(channel, callOptions);
155168
}
156169

157170
@java.lang.Override
158-
protected GreeterBlockingStub build(io.grpc.Channel channel,
159-
io.grpc.CallOptions callOptions) {
171+
protected GreeterBlockingStub build(
172+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
160173
return new GreeterBlockingStub(channel, callOptions);
161174
}
162175

@@ -176,19 +189,15 @@ public io.grpc.examples.GreeterOuterClass.HelloReply sayHello(io.grpc.examples.G
176189
* The greeter service definition.
177190
* </pre>
178191
*/
179-
public static final class GreeterFutureStub extends io.grpc.stub.AbstractStub<GreeterFutureStub> {
180-
private GreeterFutureStub(io.grpc.Channel channel) {
181-
super(channel);
182-
}
183-
184-
private GreeterFutureStub(io.grpc.Channel channel,
185-
io.grpc.CallOptions callOptions) {
192+
public static final class GreeterFutureStub extends io.grpc.stub.AbstractFutureStub<GreeterFutureStub> {
193+
private GreeterFutureStub(
194+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
186195
super(channel, callOptions);
187196
}
188197

189198
@java.lang.Override
190-
protected GreeterFutureStub build(io.grpc.Channel channel,
191-
io.grpc.CallOptions callOptions) {
199+
protected GreeterFutureStub build(
200+
io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
192201
return new GreeterFutureStub(channel, callOptions);
193202
}
194203

0 commit comments

Comments
 (0)