Remove @autoConfiguration from TestChannelBinderConfiguration

Backout changes introduced in 4174657 Resolves #2931
spring-cloud · Apr 9, 2024 · b736b4a · b736b4a
1 parent a636eec
commit b736b4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...ain/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java b/...ain/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,15 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.stream.binder.Binder;
 import org.springframework.cloud.stream.binder.ConsumerProperties;
 import org.springframework.cloud.stream.binder.ProducerProperties;
 import org.springframework.cloud.stream.config.BinderFactoryAutoConfiguration;
 import org.springframework.cloud.stream.config.BindingServiceConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.integration.config.EnableIntegration;
 
@@ -39,9 +40,11 @@
  * @param <T> binding type
  * @author Oleg Zhurakousky
  * @author David Turanski
+ * @author Soby Chacko
  * @see TestChannelBinder
  */
-@AutoConfiguration
+@Configuration
+@ConditionalOnMissingBean(Binder.class)
 @Import(BinderFactoryAutoConfiguration.class)
 @EnableIntegration
 public class TestChannelBinderConfiguration<T> {

diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports