Move Cassandra Docker Compose support into spring-boot-cassandra

Author: philwebb

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

@@ -14,6 +14,7 @@ dependencies {
 	api("org.apache.cassandra:java-driver-core")
 	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.projectreactor:reactor-core")
 	optional("org.testcontainers:cassandra")
@@ -22,6 +23,7 @@ dependencies {
 dependencies {
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
 	dockerTestImplementation("org.testcontainers:cassandra")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	testImplementation(project(":spring-boot-project:spring-boot-test"))

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

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

…cassandra/cassandra-bitnami-compose.yaml …r/compose/cassandra-bitnami-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-bitnami-compose.yaml renamed to spring-boot-project/spring-boot-cassandra/src/dockerTest/resources/org/springframework/boot/cassandra/docker/compose/cassandra-bitnami-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-bitnami-compose.yaml renamed to spring-boot-project/spring-boot-cassandra/src/dockerTest/resources/org/springframework/boot/cassandra/docker/compose/cassandra-bitnami-compose.yaml

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

…nection/cassandra/cassandra-compose.yaml …ra/docker/compose/cassandra-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml renamed to spring-boot-project/spring-boot-cassandra/src/dockerTest/resources/org/springframework/boot/cassandra/docker/compose/cassandra-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml renamed to spring-boot-project/spring-boot-cassandra/src/dockerTest/resources/org/springframework/boot/cassandra/docker/compose/cassandra-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.cassandra;
+package org.springframework.boot.cassandra.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/cassandra/CassandraDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraDockerComposeConnectionDetailsFactory.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraDockerComposeConnectionDetailsFactory.java

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

…tion/cassandra/CassandraEnvironment.java …docker/compose/CassandraEnvironment.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraEnvironment.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraEnvironment.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraEnvironment.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraEnvironment.java

@@ -1,4 +1,5 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.cassandra.docker.compose.CassandraDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.cassandra.testcontainers.CassandraContainerConnectionDetailsFactory,\
 org.springframework.boot.cassandra.testcontainers.DeprecatedCassandraContainerConnectionDetailsFactory

…e/connection/cassandra/package-info.java …ssandra/docker/compose/package-info.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/package-info.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/package-info.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/cassandra/package-info.java renamed to spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/package-info.java

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

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

@@ -1,6 +1,5 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
-org.springframework.boot.docker.compose.service.connection.cassandra.CassandraDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseJdbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.elasticsearch.ElasticsearchDockerComposeConnectionDetailsFactory,\