Skip to content

Commit 7bd1516

Browse files
authored
Merge pull request #1052 from Sineaggi/upgrade-grpc
Upgrade grpc and remove unused method
2 parents afa6d3c + 0a5324d commit 7bd1516

File tree

4 files changed

+1
-54
lines changed

4 files changed

+1
-54
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
projectVersion = '3.0.0.RELEASE'
1212

1313
// https://github.com/grpc/grpc-java/releases
14-
grpcVersion = '1.60.1'
14+
grpcVersion = '1.61.1'
1515

1616
// https://github.com/google/guava/releases
1717
guavaVersion = '33.1.0-jre'

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ protected void configure(final T builder, final String name) {
181181
configureKeepAlive(builder, name);
182182
configureSecurity(builder, name);
183183
configureLimits(builder, name);
184-
configureCompression(builder, name);
185184
configureUserAgent(builder, name);
186185
for (final GrpcChannelConfigurer channelConfigurer : this.channelConfigurers) {
187186
channelConfigurer.accept(builder, name);
@@ -251,19 +250,6 @@ protected void configureLimits(final T builder, final String name) {
251250
}
252251
}
253252

254-
/**
255-
* Configures the compression options that should be used by the channel.
256-
*
257-
* @param builder The channel builder to configure.
258-
* @param name The name of the client to configure.
259-
*/
260-
protected void configureCompression(final T builder, final String name) {
261-
final GrpcChannelProperties properties = getPropertiesFor(name);
262-
if (properties.isFullStreamDecompression()) {
263-
builder.enableFullStreamDecompression();
264-
}
265-
}
266-
267253
/**
268254
* Configures custom User-Agent for the channel.
269255
*

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -372,35 +372,6 @@ public void setMaxInboundMetadataSize(DataSize maxInboundMetadataSize) {
372372
}
373373
// --------------------------------------------------
374374

375-
private Boolean fullStreamDecompression;
376-
private static final boolean DEFAULT_FULL_STREAM_DECOMPRESSION = false;
377-
378-
/**
379-
* Gets whether full-stream decompression of inbound streams should be enabled.
380-
*
381-
* @return True, if full-stream decompression of inbound streams should be enabled. False otherwise.
382-
*
383-
* @see #setFullStreamDecompression(Boolean)
384-
*/
385-
public boolean isFullStreamDecompression() {
386-
return this.fullStreamDecompression == null ? DEFAULT_FULL_STREAM_DECOMPRESSION : this.fullStreamDecompression;
387-
}
388-
389-
/**
390-
* Sets whether full-stream decompression of inbound streams should be enabled. This will cause the channel's
391-
* outbound headers to advertise support for GZIP compressed streams, and gRPC servers which support the feature may
392-
* respond with a GZIP compressed stream.
393-
*
394-
* @param fullStreamDecompression Whether full stream decompression should be enabled or null to use the fallback.
395-
*
396-
* @see ManagedChannelBuilder#enableFullStreamDecompression()
397-
*/
398-
public void setFullStreamDecompression(final Boolean fullStreamDecompression) {
399-
this.fullStreamDecompression = fullStreamDecompression;
400-
}
401-
402-
// --------------------------------------------------
403-
404375
private NegotiationType negotiationType;
405376
private static final NegotiationType DEFAULT_NEGOTIATION_TYPE = NegotiationType.TLS;
406377

@@ -530,9 +501,6 @@ public void copyDefaultsFrom(final GrpcChannelProperties config) {
530501
if (this.maxInboundMessageSize == null) {
531502
this.maxInboundMessageSize = config.maxInboundMessageSize;
532503
}
533-
if (this.fullStreamDecompression == null) {
534-
this.fullStreamDecompression = config.fullStreamDecompression;
535-
}
536504
if (this.negotiationType == null) {
537505
this.negotiationType = config.negotiationType;
538506
}

grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@
5353
"description": "Whether keepAlive should be enabled.",
5454
"defaultValue": false
5555
},
56-
{
57-
"name": "grpc.client.GLOBAL.full-stream-decompression",
58-
"type": "java.lang.Boolean",
59-
"sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties",
60-
"description": "Whether full-stream decompression of inbound streams should be enabled.",
61-
"defaultValue": false
62-
},
6356
{
6457
"name": "grpc.client.GLOBAL.keep-alive-time",
6558
"type": "java.time.Duration",

0 commit comments

Comments
 (0)