Move Amqp Docker Compose support into spring-boot-amqp

Author: philwebb

spring-boot-project/spring-boot-amqp/build.gradle

@@ -17,6 +17,7 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-tx"))
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-docker-compose"))
 	optional(project(":spring-boot-project:spring-boot-testcontainers"))
 	optional("io.micrometer:micrometer-core")
 	optional("org.springframework.amqp:spring-rabbit-stream")
@@ -26,6 +27,7 @@ dependencies {
 
 dependencies {
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
 	dockerTestImplementation("ch.qos.logback:logback-classic")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")

…ctionDetailsFactoryIntegrationTests.java …ctionDetailsFactoryIntegrationTests.javaspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.rabbit;
+package org.springframework.boot.amqp.docker.compose;
 
 import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails;
 import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address;

…ction/rabbit/rabbit-bitnami-compose.yaml …cker/compose/rabbit-bitnami-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-bitnami-compose.yaml renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-bitnami-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-bitnami-compose.yaml renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-bitnami-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.rabbit;
+package org.springframework.boot.amqp.docker.compose;
 
 import java.util.List;
 

…ce/connection/rabbit/rabbit-compose.yaml …/amqp/docker/compose/rabbit-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml renamed to spring-boot-project/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.rabbit;
+package org.springframework.boot.amqp.docker.compose;
 
 import java.util.Map;
 

…ckerComposeConnectionDetailsFactory.java …ckerComposeConnectionDetailsFactory.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Docker Compose RabbitMQ service connections.
+ * Support for Docker Compose RabbitMQ service connections.
  */
-package org.springframework.boot.docker.compose.service.connection.rabbit;
+package org.springframework.boot.amqp.docker.compose;

…connection/rabbit/RabbitEnvironment.java …qp/docker/compose/RabbitEnvironment.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitEnvironment.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitEnvironment.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java

@@ -1,2 +1,4 @@
+# Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.amqp.docker.compose.RabbitDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory

…vice/connection/rabbit/package-info.java …ot/amqp/docker/compose/package-info.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/package-info.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/rabbit/package-info.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.rabbit;
+package org.springframework.boot.amqp.docker.compose;
 
 import java.util.Collections;
 import java.util.Map;

spring-boot-project/spring-boot-amqp/src/main/resources/META-INF/spring.factories

@@ -25,7 +25,6 @@ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryTra
 org.springframework.boot.docker.compose.service.connection.postgres.PostgresJdbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.postgres.PostgresR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.pulsar.PulsarDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.rabbit.RabbitDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.redis.RedisDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerJdbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerR2dbcDockerComposeConnectionDetailsFactory,\