From 44bf181ff041f362c1469efa8d2a73226d00a5cc Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Thu, 20 Aug 2015 17:43:37 -0700 Subject: [PATCH] AutoConfigure redisCloud before redis auto-config --- .../binder/redis/config/RedisServiceAutoConfiguration.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 6f6271226..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 @@ -16,11 +16,12 @@ package org.springframework.cloud.stream.binder.redis.config; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration; import org.springframework.cloud.Cloud; import org.springframework.cloud.CloudFactory; import org.springframework.cloud.stream.binder.Binder; -import org.springframework.cloud.stream.binder.redis.RedisMessageChannelBinder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -43,6 +44,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; public class RedisServiceAutoConfiguration { @Configuration + @AutoConfigureBefore(RedisAutoConfiguration.class) @Profile("cloud") protected static class CloudConfig { @Bean @@ -50,6 +52,7 @@ public class RedisServiceAutoConfiguration { return new CloudFactory().getCloud(); } @Bean + @ConditionalOnMissingBean(RedisConnectionFactory.class) RedisConnectionFactory redisConnectionFactory(Cloud cloud) { return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null); }