Autoconfigure only AMQP 1.0 or 0.9

Signed-off-by: Eddú Meléndez <[email protected]>

Author: eddumelendez

module/spring-boot-amqp/build.gradle

@@ -28,7 +28,7 @@ description = "Spring Boot AMQP"
 dependencies {
 	api(project(":core:spring-boot"))
 	api("org.springframework:spring-messaging")
-	api("org.springframework.amqp:spring-rabbit")
+	api("org.springframework.amqp:spring-rabbitmq-client")
 
 	compileOnly("com.fasterxml.jackson.core:jackson-annotations")
 
@@ -41,7 +41,6 @@ dependencies {
 	optional(project(":module:spring-boot-metrics"))
 	optional("io.micrometer:micrometer-core")
 	optional("org.springframework.amqp:spring-rabbit-stream")
-	optional("org.springframework.amqp:spring-rabbitmq-client")
 	optional("org.testcontainers:rabbitmq")
 
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

@@ -65,8 +65,8 @@ RabbitConnectionDetails rabbitConnectionDetails(ObjectProvider<SslBundles> sslBu
 		return new PropertiesRabbitConnectionDetails(this.properties, sslBundles.getIfAvailable());
 	}
 
-	@Bean(name = "rabbitAmqpListenerContainerFactory")
-	@ConditionalOnMissingBean(name = "rabbitAmqpListenerContainerFactory")
+	@Bean(name = "rabbitListenerContainerFactory")
+	@ConditionalOnMissingBean(name = "rabbitListenerContainerFactory")
 	RabbitAmqpListenerContainerFactory rabbitAmqpListenerContainerFactory(AmqpConnectionFactory connectionFactory,
 			ObjectProvider<ContainerCustomizer<RabbitAmqpListenerContainer>> amqpContainerCustomizer,
 			ObjectProvider<RabbitRetryTemplateCustomizer> retryTemplateCustomizers,

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java

@@ -36,6 +36,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ssl.SslBundles;
@@ -71,10 +72,13 @@
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Scott Frederick
+ * @author Eddú Meléndez
  * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ RabbitTemplate.class, Channel.class })
+@ConditionalOnMissingClass({ "com.rabbitmq.client.amqp.Connection",
+		"org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate" })
 @EnableConfigurationProperties(RabbitProperties.class)
 @Import({ RabbitAnnotationDrivenConfiguration.class, RabbitStreamConfiguration.class })
 public final class RabbitAutoConfiguration {

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java

@@ -115,13 +115,15 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Yanming Zhou
+ * @author Eddú Meléndez
  */
 @ExtendWith(OutputCaptureExtension.class)
 class RabbitAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, SslAutoConfiguration.class))
-		.withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream")); // gh-38750
+		.withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream", "com.rabbitmq.client.amqp",
+				"org.springframework.amqp.rabbitmq.client")); // gh-38750
 
 	@Test
 	void testDefaultRabbitConfiguration() {

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java

@@ -33,6 +33,7 @@
 import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -60,7 +61,9 @@
 class RabbitStreamConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class))
+		.withClassLoader(
+				new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
 
 	@Test
 	@SuppressWarnings("unchecked")

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java

@@ -22,6 +22,7 @@
 import org.springframework.boot.amqp.health.RabbitHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,12 +31,15 @@
  * Tests for {@link RabbitHealthContributorAutoConfiguration}.
  *
  * @author Phillip Webb
+ * @author Eddú Meléndez
  */
 class RabbitHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class,
-				RabbitHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
+				RabbitHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class))
+		.withClassLoader(
+				new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
 
 	@Test
 	void runShouldCreateIndicator() {

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java

@@ -24,6 +24,7 @@
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,8 +37,10 @@
  * dependency cycle when used with {@link MeterBinder}.
  *
  * @author Phillip Webb
+ * @author Eddú Meléndez
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/30636">gh-30636</a>
  */
+@ClassPathExclusions(files = "spring-rabbitmq-client-*.jar", packages = "com.rabbitmq.client.amqp")
 class RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests {
 
 	@Test

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java

@@ -25,6 +25,7 @@
 import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,14 +36,17 @@
  * Tests for {@link RabbitMetricsAutoConfiguration}.
  *
  * @author Stephane Nicoll
+ * @author Eddú Meléndez
  */
 class RabbitMetricsAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withBean(SimpleMeterRegistry.class)
 		.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, RabbitMetricsAutoConfiguration.class,
 				MetricsAutoConfiguration.class))
-		.withPropertyValues("management.metrics.use-global-registry=false");
+		.withPropertyValues("management.metrics.use-global-registry=false")
+		.withClassLoader(
+				new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
 
 	@Test
 	void autoConfiguredConnectionFactoryIsInstrumented() {