add support for HZ_CLUSTERNAME env variable

Author: nosan

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/hazelcast/HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -16,7 +16,12 @@
 
 package org.springframework.boot.docker.compose.service.connection.hazelcast;
 
+import java.util.UUID;
+import java.util.function.Consumer;
+
 import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.client.impl.clientside.HazelcastClientProxy;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.map.IMap;
 
@@ -37,14 +42,22 @@ class HazelcastDockerComposeConnectionDetailsFactoryIntegrationTests {
 	void runCreatesConnectionDetails(HazelcastConnectionDetails connectionDetails) {
 		HazelcastInstance hazelcastInstance = HazelcastClient.newHazelcastClient(connectionDetails.getClientConfig());
 		try {
-			IMap<Object, Object> map = hazelcastInstance.getMap("spring-boot");
+			assertThat(hazelcastInstance).satisfies(clusterName("spring-boot"));
+			IMap<String, String> map = hazelcastInstance.getMap(UUID.randomUUID().toString());
 			map.put("docker", "compose");
 			assertThat(map.get("docker")).isEqualTo("compose");
 		}
 		finally {
 			hazelcastInstance.shutdown();
 		}
+	}
 
+	private static Consumer<HazelcastInstance> clusterName(String name) {
+		return (hazelcastInstance) -> {
+			assertThat(hazelcastInstance).isInstanceOf(HazelcastClientProxy.class);
+			HazelcastClientProxy proxy = (HazelcastClientProxy) hazelcastInstance;
+			assertThat(proxy.getClientConfig()).extracting(ClientConfig::getClusterName).isEqualTo(name);
+		};
 	}
 
 }

spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/hazelcast/hazelcast-compose.yaml

@@ -1,5 +1,7 @@
 services:
   hazelcast:
     image: '{imageName}'
+    environment:
+      HZ_CLUSTERNAME: "spring-boot"
     ports:
       - '5701'

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/hazelcast/HazelcastDockerComposeConnectionDetailsFactory.java

@@ -16,6 +16,9 @@
 
 package org.springframework.boot.docker.compose.service.connection.hazelcast;
 
+import java.util.Map;
+import java.util.Optional;
+
 import com.hazelcast.client.config.ClientConfig;
 
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastConnectionDetails;
@@ -34,6 +37,8 @@ class HazelcastDockerComposeConnectionDetailsFactory
 
 	private static final int DEFAULT_PORT = 5701;
 
+	private static final String CLUSTER_NAME_ENV = "HZ_CLUSTERNAME";
+
 	protected HazelcastDockerComposeConnectionDetailsFactory() {
 		super("hazelcast/hazelcast", "com.hazelcast.client.config.ClientConfig");
 	}
@@ -58,8 +63,10 @@ static class HazelcastDockerComposeConnectionDetails extends DockerComposeConnec
 
 		}
 
-		private ClientConfig buildClientConfig(RunningService service) {
+		private static ClientConfig buildClientConfig(RunningService service) {
 			ClientConfig config = new ClientConfig();
+			Map<String, String> env = service.env();
+			Optional.ofNullable(env.get(CLUSTER_NAME_ENV)).ifPresent(config::setClusterName);
 			config.getNetworkConfig().addAddress(service.host() + ":" + service.ports().get(DEFAULT_PORT));
 			return config;
 		}

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/hazelcast/HazelcastContainerConnectionDetailsFactoryIntegrationTests.java

@@ -16,6 +16,11 @@
 
 package org.springframework.boot.testcontainers.service.connection.hazelcast;
 
+import java.util.UUID;
+import java.util.function.Consumer;
+
+import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.client.impl.clientside.HazelcastClientProxy;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.map.IMap;
 import org.junit.jupiter.api.Test;
@@ -45,7 +50,8 @@ class HazelcastContainerConnectionDetailsFactoryIntegrationTests {
 
 	@Container
 	@ServiceConnection
-	static final HazelcastContainer hazelcast = TestImage.container(HazelcastContainer.class);
+	static final HazelcastContainer hazelcast = TestImage.container(HazelcastContainer.class)
+		.withEnv("HZ_CLUSTERNAME", "spring-boot");
 
 	@Autowired(required = false)
 	private HazelcastConnectionDetails connectionDetails;
@@ -56,9 +62,18 @@ class HazelcastContainerConnectionDetailsFactoryIntegrationTests {
 	@Test
 	void connectionCanBeMadeToHazelcastContainer() {
 		assertThat(this.connectionDetails).isNotNull();
-		IMap<String, String> map = this.hazelcastInstance.getMap("spring-boot");
-		map.put("hazelcast", "container");
-		assertThat(map.get("hazelcast")).isEqualTo("container");
+		assertThat(this.hazelcastInstance).satisfies(clusterName("spring-boot"));
+		IMap<String, String> map = this.hazelcastInstance.getMap(UUID.randomUUID().toString());
+		map.put("test", "containers");
+		assertThat(map.get("test")).isEqualTo("containers");
+	}
+
+	private static Consumer<HazelcastInstance> clusterName(String name) {
+		return (hazelcastInstance) -> {
+			assertThat(hazelcastInstance).isInstanceOf(HazelcastClientProxy.class);
+			HazelcastClientProxy proxy = (HazelcastClientProxy) hazelcastInstance;
+			assertThat(proxy.getClientConfig()).extracting(ClientConfig::getClusterName).isEqualTo(name);
+		};
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/hazelcast/HazelcastContainerConnectionDetailsFactory.java

@@ -16,6 +16,9 @@
 
 package org.springframework.boot.testcontainers.service.connection.hazelcast;
 
+import java.util.Map;
+import java.util.Optional;
+
 import com.hazelcast.client.config.ClientConfig;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
@@ -37,6 +40,8 @@ class HazelcastContainerConnectionDetailsFactory
 
 	private static final int DEFAULT_PORT = 5701;
 
+	private static final String CLUSTER_NAME_ENV = "HZ_CLUSTERNAME";
+
 	HazelcastContainerConnectionDetailsFactory() {
 		super("hazelcast/hazelcast", "com.hazelcast.client.config.ClientConfig");
 	}
@@ -58,8 +63,10 @@ private HazelcastContainerConnectionDetails(ContainerConnectionSource<Container<
 
 		@Override
 		public ClientConfig getClientConfig() {
-			Container<?> container = getContainer();
 			ClientConfig config = new ClientConfig();
+			Container<?> container = getContainer();
+			Map<String, String> env = container.getEnvMap();
+			Optional.ofNullable(env.get(CLUSTER_NAME_ENV)).ifPresent(config::setClusterName);
 			config.getNetworkConfig().addAddress(container.getHost() + ":" + container.getMappedPort(DEFAULT_PORT));
 			return config;
 		}