From b60ccd142767c54a3fd889630edfd27b31d51868 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Fri, 28 Aug 2015 12:33:09 -0700 Subject: [PATCH] Re-add bean conditions for cloud config - Re-add `@ConditionalOnMissingBean` to connection factory beans in cloud configurations - This is needed at least for CF case where auto-reconfiguration sets up connection factory beans --- .../binder/rabbit/config/RabbitServiceAutoConfiguration.java | 1 + .../binder/redis/config/RedisServiceAutoConfiguration.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java index 609f218e8..100c086e2 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java @@ -53,6 +53,7 @@ public class RabbitServiceAutoConfiguration { } @Bean + @ConditionalOnMissingBean(ConnectionFactory.class) ConnectionFactory rabbitConnectionFactory(Cloud cloud) { return cloud.getSingletonServiceConnector(ConnectionFactory.class, null); } diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java index 4c919cf87..e8bbcf13c 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java @@ -52,6 +52,7 @@ public class RedisServiceAutoConfiguration { return new CloudFactory().getCloud(); } @Bean + @ConditionalOnMissingBean(RedisConnectionFactory.class) RedisConnectionFactory redisConnectionFactory(Cloud cloud) { return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null); }