SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore ChannelBindingAutoConfiguration

Browse Source 
Having it renamed has broken backwards compatibility with Sleuth

Signed-off-by: Marius Bogoevici <mbogoevici@pivotal.io>
This commit is contained in:
Marius Bogoevici
2016-12-14 18:33:48 -05:00
parent c5b9a9f3e7
commit c816b4987d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java
View File

@@ -105,7 +105,7 @@ public class BinderFactoryConfiguration {
Map<String, BinderType> binderTypes = new HashMap<>();
ClassLoader classLoader = configurableApplicationContext.getClassLoader();
if (classLoader == null) {
classLoader = BindingAutoConfiguration.class.getClassLoader();
classLoader = BinderFactoryConfiguration.class.getClassLoader();
}
try {
Enumeration<URL> resources = classLoader.getResources("META-INF/spring.binders");

2
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingAutoConfiguration.java → spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java
View File

@@ -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;

2
spring-cloud-stream/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration:\
org.springframework.cloud.stream.config.BindingAutoConfiguration
org.springframework.cloud.stream.config.ChannelBindingAutoConfiguration