From 9b4c12b517414b79ada3717adc638462fd6463ba Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 29 Aug 2015 10:17:22 +0100 Subject: [PATCH] Fix ordering for rabbit autoconfig --- .../binder/rabbit/config/RabbitServiceAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 100c086e2..5b171a085 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 @@ -19,6 +19,7 @@ package org.springframework.cloud.stream.binder.rabbit.config; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; +import org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.cloud.Cloud; import org.springframework.cloud.CloudFactory; @@ -41,10 +42,10 @@ import org.springframework.context.annotation.PropertySource; @Configuration @ConditionalOnMissingBean(Binder.class) @Import(RabbitMessageChannelBinderConfiguration.class) +@AutoConfigureBefore({CloudAutoConfiguration.class, RabbitAutoConfiguration.class}) @PropertySource("classpath:/META-INF/spring-cloud-stream/rabbit-binder.properties") public class RabbitServiceAutoConfiguration { @Configuration - @AutoConfigureBefore(RabbitAutoConfiguration.class) @Profile("cloud") protected static class CloudConfig { @Bean