From c816b4987d1a2d9c9c71eb61050a96f03885bb0a Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Wed, 14 Dec 2016 18:33:48 -0500 Subject: [PATCH] Restore ChannelBindingAutoConfiguration Having it renamed has broken backwards compatibility with Sleuth Signed-off-by: Marius Bogoevici --- .../cloud/stream/config/BinderFactoryConfiguration.java | 2 +- ...oConfiguration.java => ChannelBindingAutoConfiguration.java} | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/{BindingAutoConfiguration.java => ChannelBindingAutoConfiguration.java} (98%) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java index c18680ef1..84d1ae87a 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java @@ -105,7 +105,7 @@ public class BinderFactoryConfiguration { Map binderTypes = new HashMap<>(); ClassLoader classLoader = configurableApplicationContext.getClassLoader(); if (classLoader == null) { - classLoader = BindingAutoConfiguration.class.getClassLoader(); + classLoader = BinderFactoryConfiguration.class.getClassLoader(); } try { Enumeration resources = classLoader.getResources("META-INF/spring.binders"); diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java similarity index 98% rename from spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingAutoConfiguration.java rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java index 1e7d633b8..c756aaeb1 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.messaging.MessageChannel; @ConditionalOnBean(BindingService.class) @EnableConfigurationProperties(DefaultPollerProperties.class) @AutoConfigureBefore(EndpointAutoConfiguration.class) -public class BindingAutoConfiguration { +public class ChannelBindingAutoConfiguration { @Autowired private DefaultPollerProperties poller; diff --git a/spring-cloud-stream/src/main/resources/META-INF/spring.factories b/spring-cloud-stream/src/main/resources/META-INF/spring.factories index 257a86e9a..3678aa5d1 100644 --- a/spring-cloud-stream/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-stream/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ -org.springframework.cloud.stream.config.BindingAutoConfiguration +org.springframework.cloud.stream.config.ChannelBindingAutoConfiguration