Skip to content

Commit 2eaaa8f

Browse files
author
Dave Syer
committed
Ensure server factory is not created in client
1 parent 42b5470 commit 2eaaa8f

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle;
3333

3434
import io.grpc.BindableService;
35-
import io.grpc.CompressorRegistry;
36-
import io.grpc.DecompressorRegistry;
37-
import io.grpc.netty.NettyServerBuilder;
3835

3936
/**
4037
* {@link EnableAutoConfiguration Auto-configuration} for gRPC server-side components.

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
24+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2425
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -45,6 +46,7 @@
4546
@AutoConfiguration
4647
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
4748
@ConditionalOnClass(BindableService.class)
49+
@ConditionalOnBean(BindableService.class)
4850
public class GrpcServerFactoryAutoConfiguration {
4951

5052
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)