From 6a1343672374c3f8c1d9d38e4f650ab3ca0f9057 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 31 Aug 2020 13:58:23 +0200 Subject: [PATCH] Annotate FunctionRSocketMessageHandler @Primary --- .../cloud/function/rsocket/RSocketAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java index 7c501d47e..0c3440a0c 100644 --- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java +++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java @@ -29,6 +29,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.messaging.rsocket.RSocketStrategies; import org.springframework.util.StringUtils; @@ -55,6 +56,7 @@ class RSocketAutoConfiguration implements ApplicationContextAware { @Bean @ConditionalOnMissingBean + @Primary public FunctionRSocketMessageHandler functionRSocketMessageHandler(RSocketStrategies rSocketStrategies, ObjectProvider customizers, FunctionCatalog functionCatalog, FunctionProperties functionProperties) {