Autoconfigure rabbitCloud before rabbit auto-config

- This ordering is required to avoid having 2 beans created for rabbit `ConnectionFactory`
This commit is contained in:
Ilayaperumal Gopinathan
2015-08-20 20:14:59 -07:00
parent 2e4fd84f93
commit 56469353b3

View File

@@ -17,13 +17,12 @@
package org.springframework.cloud.stream.binder.rabbit.config;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.Cloud;
import org.springframework.cloud.CloudFactory;
import org.springframework.cloud.stream.binder.Binder;
import org.springframework.cloud.stream.binder.rabbit.RabbitMessageChannelBinder;
import org.springframework.cloud.stream.binder.rabbit.config.RabbitMessageChannelBinderConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -45,6 +44,7 @@ import org.springframework.context.annotation.PropertySource;
@PropertySource("classpath:/META-INF/spring-cloud-stream/rabbit-binder.properties")
public class RabbitServiceAutoConfiguration {
@Configuration
@AutoConfigureBefore(RabbitAutoConfiguration.class)
@Profile("cloud")
protected static class CloudConfig {
@Bean