Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add service connection support for Hazelcast"

Browse Source 
See gh-42416
This commit is contained in:
Moritz Halbritter
2024-09-26 14:30:42 +02:00
parent cee7439dbe
commit 33def6d6b4
9 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/hazelcast/CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTests.java
View File

@@ -52,7 +52,7 @@ class CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTest
@Container
@ServiceConnection
static final HazelcastContainer hazelcast = TestImage.container(HazelcastContainer.class)
.withEnv("HZ_CLUSTERNAME", "spring-boot");
.withClusterName("spring-boot");
@Autowired(required = false)
private HazelcastConnectionDetails connectionDetails;

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

@@ -17,7 +17,6 @@
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;
@@ -66,7 +65,10 @@ class HazelcastContainerConnectionDetailsFactory
ClientConfig config = new ClientConfig();
Container<?> container = getContainer();
Map<String, String> env = container.getEnvMap();
Optional.ofNullable(env.get(CLUSTER_NAME_ENV)).ifPresent(config::setClusterName);
String clusterName = env.get(CLUSTER_NAME_ENV);
if (clusterName != null) {
config.setClusterName(clusterName);
}
config.getNetworkConfig().addAddress(container.getHost() + ":" + container.getMappedPort(DEFAULT_PORT));
return config;
}