From 2eaaa8f805fe7b98ab9c7d30c15c6ffee51c65cc Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 25 Oct 2024 12:15:54 +0100 Subject: [PATCH] Ensure server factory is not created in client --- .../grpc/autoconfigure/server/GrpcServerAutoConfiguration.java | 3 --- .../server/GrpcServerFactoryAutoConfiguration.java | 2 ++ 2 files changed, 2 insertions(+), 3 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 afb5a77..103ec97 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 @@ -32,9 +32,6 @@ 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.netty.NettyServerBuilder; /** * {@link EnableAutoConfiguration Auto-configuration} for gRPC server-side components. 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 7b7361a..8182cf0 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 @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; @@ -45,6 +46,7 @@ import io.grpc.servlet.jakarta.GrpcServlet; @AutoConfiguration @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @ConditionalOnClass(BindableService.class) +@ConditionalOnBean(BindableService.class) public class GrpcServerFactoryAutoConfiguration { @Configuration(proxyBeanMethods = false)