From f4d4eba2338fb30dd7480f0add40fc7fcefe34a6 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Mon, 15 May 2023 18:18:23 -0400 Subject: [PATCH] * Conditional changes in grpc auto configuration * Modifier changes in GrpcAutoConfiguraiton for extensibility --- .../cloud/function/grpc/GrpcAutoConfiguration.java | 6 ++++-- .../cloud/function/grpc/GrpcServerMessageHandler.java | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcAutoConfiguration.java b/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcAutoConfiguration.java index ba49a9191..005cbaf7f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcAutoConfiguration.java +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcAutoConfiguration.java @@ -20,6 +20,7 @@ import java.util.List; import io.grpc.BindableService; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.function.context.FunctionCatalog; @@ -37,7 +38,7 @@ import org.springframework.util.StringUtils; @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(FunctionGrpcProperties.class) @ConditionalOnProperty(name = "spring.cloud.function.grpc.server", havingValue = "true", matchIfMissing = true) -class GrpcAutoConfiguration { +public class GrpcAutoConfiguration { @Bean public GrpcServer grpcServer(FunctionGrpcProperties grpcProperties, BindableService[] grpcMessagingServices) { @@ -53,8 +54,9 @@ class GrpcAutoConfiguration { } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("rawtypes") @Bean + @ConditionalOnMissingBean public BindableService grpcSpringMessageHandler(MessageHandlingHelper helper) { return new GrpcServerMessageHandler(helper); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcServerMessageHandler.java b/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcServerMessageHandler.java index a34cb6960..f04405846 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcServerMessageHandler.java +++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/src/main/java/org/springframework/cloud/function/grpc/GrpcServerMessageHandler.java @@ -70,7 +70,7 @@ import com.google.protobuf.GeneratedMessageV3; * */ @SuppressWarnings("rawtypes") -class GrpcServerMessageHandler extends MessagingServiceImplBase { +public class GrpcServerMessageHandler extends MessagingServiceImplBase { private Log logger = LogFactory.getLog(GrpcServerMessageHandler.class); @@ -78,8 +78,7 @@ class GrpcServerMessageHandler extends MessagingServiceImplBase { private boolean running; - - GrpcServerMessageHandler(MessageHandlingHelper helper) { + public GrpcServerMessageHandler(MessageHandlingHelper helper) { this.helper = helper; }