Remove autoconfig

Ensure that the autoconfig and the cloud config don't overlap

Removed SeedConfiguration
This commit is contained in:
Marius Bogoevici
2015-12-10 12:36:53 -05:00
committed by Mark Fisher
parent 029cacb419
commit bf178360ee
6 changed files with 25 additions and 10 deletions

View File

@@ -17,11 +17,15 @@
package org.springframework.cloud.stream.binder.redis.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.stream.binder.redis.RedisMessageChannelBinder;
import org.springframework.cloud.stream.config.codec.kryo.KryoCodecAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.integration.codec.Codec;
@@ -30,6 +34,7 @@ import org.springframework.integration.codec.Codec;
*/
@Configuration
@EnableConfigurationProperties(RedisBinderConfigurationProperties.class)
@Import({PropertyPlaceholderAutoConfiguration.class, KryoCodecAutoConfiguration.class})
@ConfigurationProperties(prefix = "spring.cloud.stream.binder.redis")
public class RedisMessageChannelBinderConfiguration {

View File

@@ -61,4 +61,9 @@ public class RedisServiceAutoConfiguration {
}
}
@Profile("!cloud")
@Import(RedisAutoConfiguration.class)
protected static class NoCloudConfig {
}
}