From d24e80aedd078abf7ae97e7c4bcba3ca9a50090e Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 5 Nov 2024 07:33:18 +0000 Subject: [PATCH] Move codec server config to a central location There was no need for the duplication of netty and shaded netty when the builder is generic anyway. --- .../server/GrpcServerAutoConfiguration.java | 16 ++++++++++ .../GrpcServerFactoryAutoConfiguration.java | 4 +++ .../GrpcServerFactoryConfigurations.java | 29 ------------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java index 70bbbc5..53cff8d 100644 --- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java +++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java @@ -33,6 +33,9 @@ import org.springframework.grpc.server.ServerBuilderCustomizer; import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle; import io.grpc.BindableService; +import io.grpc.CompressorRegistry; +import io.grpc.DecompressorRegistry; +import io.grpc.ServerBuilder; /** * {@link EnableAutoConfiguration Auto-configuration} for gRPC server-side components. @@ -76,4 +79,17 @@ public class GrpcServerAutoConfiguration { return new DefaultGrpcServiceDiscoverer(bindableServicesProvider); } + @ConditionalOnBean(CompressorRegistry.class) + @Bean + > ServerBuilderCustomizer compressionServerConfigurer(CompressorRegistry registry) { + return builder -> builder.compressorRegistry(registry); + } + + @ConditionalOnBean(DecompressorRegistry.class) + @Bean + > ServerBuilderCustomizer decompressionServerConfigurer( + DecompressorRegistry registry) { + return builder -> builder.decompressorRegistry(registry); + } + } diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java index 0c5df78..6d33f4b 100644 --- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java +++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java @@ -19,6 +19,9 @@ import java.util.List; import java.util.stream.Collectors; import io.grpc.BindableService; +import io.grpc.CompressorRegistry; +import io.grpc.DecompressorRegistry; +import io.grpc.ServerBuilder; import io.grpc.servlet.jakarta.GrpcServlet; import io.grpc.servlet.jakarta.ServletServerBuilder; @@ -35,6 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.Ordered; +import org.springframework.grpc.server.ServerBuilderCustomizer; import org.springframework.util.unit.DataSize; /** diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryConfigurations.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryConfigurations.java index 9466a60..079eb56 100644 --- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryConfigurations.java +++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryConfigurations.java @@ -20,7 +20,6 @@ import java.util.List; import javax.net.ssl.KeyManagerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -34,8 +33,6 @@ import org.springframework.grpc.server.NettyGrpcServerFactory; import org.springframework.grpc.server.ServerBuilderCustomizer; import org.springframework.grpc.server.ShadedNettyGrpcServerFactory; -import io.grpc.CompressorRegistry; -import io.grpc.DecompressorRegistry; import io.grpc.netty.NettyServerBuilder; /** @@ -69,20 +66,6 @@ class GrpcServerFactoryConfigurations { return factory; } - @ConditionalOnBean(CompressorRegistry.class) - @Bean - ServerBuilderCustomizer compressionServerConfigurer( - CompressorRegistry registry) { - return builder -> builder.compressorRegistry(registry); - } - - @ConditionalOnBean(DecompressorRegistry.class) - @Bean - ServerBuilderCustomizer decompressionServerConfigurer( - DecompressorRegistry registry) { - return builder -> builder.decompressorRegistry(registry); - } - } @Configuration(proxyBeanMethods = false) @@ -109,18 +92,6 @@ class GrpcServerFactoryConfigurations { return factory; } - @ConditionalOnBean(CompressorRegistry.class) - @Bean - ServerBuilderCustomizer compressionServerConfigurer(CompressorRegistry registry) { - return builder -> builder.compressorRegistry(registry); - } - - @ConditionalOnBean(DecompressorRegistry.class) - @Bean - ServerBuilderCustomizer decompressionServerConfigurer(DecompressorRegistry registry) { - return builder -> builder.decompressorRegistry(registry); - } - } }