From b736b4a8fa8d8fb60a69977ce9321d542952afcf Mon Sep 17 00:00:00 2001
From: Soby Chacko <soby.chacko@broadcom.com>
Date: Tue, 9 Apr 2024 18:20:00 -0400
Subject: [PATCH] Remove @AutoConfiguration from TestChannelBinderConfiguration

Backout changes introduced in https://github.com/spring-cloud/spring-cloud-stream/commit/4174657a356478cdb1d7e648a0793dd6d87af19c

Resolves https://github.com/spring-cloud/spring-cloud-stream/issues/2931
---
 .../binder/test/TestChannelBinderConfiguration.java      | 9 ++++++---
 ...ramework.boot.autoconfigure.AutoConfiguration.imports | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 core/spring-cloud-stream-test-binder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/core/spring-cloud-stream-test-binder/src/main/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java b/core/spring-cloud-stream-test-binder/src/main/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
index ef224de54..807b3e8a4 100644
--- a/core/spring-cloud-stream-test-binder/src/main/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
+++ b/core/spring-cloud-stream-test-binder/src/main/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,7 +20,7 @@ import java.util.ArrayList;
 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;
@@ -28,6 +28,7 @@ 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 @@ import org.springframework.integration.config.EnableIntegration;
  * @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/core/spring-cloud-stream-test-binder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/core/spring-cloud-stream-test-binder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 6182334ff..000000000
--- a/core/spring-cloud-stream-test-binder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration