Move Hazelcast Docker Compose support into spring-boot-hazelcast

Author: philwebb

spring-boot-project/spring-boot-docker-compose-all/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,6 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
 org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.hazelcast.HazelcastDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.ldap.LLdapDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.ldap.OpenLdapDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbR2dbcDockerComposeConnectionDetailsFactory,\

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

@@ -15,6 +15,7 @@ dependencies {
 	compileOnly("com.fasterxml.jackson.core:jackson-annotations")
 	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-jpa"))
 	optional(project(":spring-boot-project:spring-boot-testcontainers"))
 	optional("com.hazelcast:hazelcast-spring")
@@ -24,6 +25,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:junit-jupiter")
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
 	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/hazelcast/HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/docker/compose/HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests.java spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/hazelcast/HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/docker/compose/HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests.java

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

…cast/hazelcast-cluster-name-compose.yaml …pose/hazelcast-cluster-name-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/hazelcast/hazelcast-cluster-name-compose.yaml renamed to spring-boot-project/spring-boot-hazelcast/src/dockerTest/resources/org/springframework/boot/hazelcast/docker/compose/hazelcast-cluster-name-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/hazelcast/hazelcast-cluster-name-compose.yaml renamed to spring-boot-project/spring-boot-hazelcast/src/dockerTest/resources/org/springframework/boot/hazelcast/docker/compose/hazelcast-cluster-name-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.hazelcast;
+package org.springframework.boot.hazelcast.docker.compose;
 
 import com.hazelcast.client.config.ClientConfig;
 

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

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

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

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

@@ -1,3 +1,4 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.hazelcast.docker.compose.HazelcastDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.hazelcast.testcontainers.HazelcastContainerConnectionDetailsFactory

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

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