diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java index 72e2c9efe465..8102f8f9414b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java @@ -113,8 +113,10 @@ public Cluster getCluster() { } private Node asNode(String node) { - String[] components = node.split(":"); - return new Node(components[0], Integer.parseInt(components[1])); + int portSeparatorIndex = node.lastIndexOf(':'); + String host = node.substring(0, portSeparatorIndex); + int port = Integer.parseInt(node.substring(portSeparatorIndex + 1)); + return new Node(host, port); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java index e3d59342d8eb..32eea8d59754 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java @@ -139,7 +139,7 @@ protected final RedisClusterConfiguration getClusterConfiguration() { } private List getNodes(Cluster cluster) { - return cluster.getNodes().stream().map((node) -> "%s:%d".formatted(node.host(), node.port())).toList(); + return cluster.getNodes().stream().map(Node::asString).toList(); } protected final RedisProperties getProperties() { @@ -162,7 +162,7 @@ protected boolean isPoolEnabled(Pool pool) { private List createSentinels(Sentinel sentinel) { List nodes = new ArrayList<>(); for (Node node : sentinel.getNodes()) { - nodes.add(new RedisNode(node.host(), node.port())); + nodes.add(RedisNode.fromString(node.asString())); } return nodes; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionDetails.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionDetails.java index 7aed831582c6..cae5758f017b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionDetails.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionDetails.java @@ -185,6 +185,9 @@ interface Cluster { */ record Node(String host, int port) { + String asString() { + return this.host + ":" + this.port; + } } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetailsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetailsTests.java index e4c325e52415..9c7b42a72536 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetailsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetailsTests.java @@ -119,12 +119,23 @@ void standaloneIsConfiguredFromProperties() { @Test void clusterIsConfigured() { RedisProperties.Cluster cluster = new RedisProperties.Cluster(); - cluster.setNodes(List.of("first:1111", "second:2222", "third:3333")); + cluster.setNodes(List.of("localhost:1111", "127.0.0.1:2222", "[::1]:3333")); this.properties.setCluster(cluster); PropertiesRedisConnectionDetails connectionDetails = new PropertiesRedisConnectionDetails(this.properties); assertThat(connectionDetails.getCluster().getNodes()).containsExactly( - new RedisConnectionDetails.Node("first", 1111), new RedisConnectionDetails.Node("second", 2222), - new RedisConnectionDetails.Node("third", 3333)); + new RedisConnectionDetails.Node("localhost", 1111), new RedisConnectionDetails.Node("127.0.0.1", 2222), + new RedisConnectionDetails.Node("[::1]", 3333)); + } + + @Test + void sentinelIsConfigured() { + RedisProperties.Sentinel sentinel = new RedisProperties.Sentinel(); + sentinel.setNodes(List.of("localhost:1111", "127.0.0.1:2222", "[::1]:3333")); + this.properties.setSentinel(sentinel); + PropertiesRedisConnectionDetails connectionDetails = new PropertiesRedisConnectionDetails(this.properties); + assertThat(connectionDetails.getSentinel().getNodes()).containsExactly( + new RedisConnectionDetails.Node("localhost", 1111), new RedisConnectionDetails.Node("127.0.0.1", 2222), + new RedisConnectionDetails.Node("[::1]", 3333)); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java index 79d33e99f302..babb7a656b30 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java @@ -312,8 +312,14 @@ void testRedisConfigurationWithIpv6Sentinel() { this.contextRunner .withPropertyValues("spring.data.redis.sentinel.master:mymaster", "spring.data.redis.sentinel.nodes:" + StringUtils.collectionToCommaDelimitedString(sentinels)) - .run((context) -> assertThat(context.getBean(LettuceConnectionFactory.class).isRedisSentinelAware()) - .isTrue()); + .run((context) -> { + assertThat(context.getBean(LettuceConnectionFactory.class).isRedisSentinelAware()).isTrue(); + assertThat(context.getBean(LettuceConnectionFactory.class).getSentinelConfiguration()).isNotNull(); + assertThat(context.getBean(LettuceConnectionFactory.class).getSentinelConfiguration().getSentinels()) + .isNotNull() + .extracting(RedisNode::toString) + .containsExactlyInAnyOrder("[0:0:0:0:0:0:0:1]:26379", "[0:0:0:0:0:0:0:1]:26380"); + }); } @Test @@ -398,17 +404,17 @@ void testRedisSentinelUrlConfiguration() { @Test void testRedisConfigurationWithCluster() { - List clusterNodes = Arrays.asList("127.0.0.1:27379", "127.0.0.1:27380"); + List clusterNodes = Arrays.asList("127.0.0.1:27379", "127.0.0.1:27380", "[::1]:27381"); this.contextRunner .withPropertyValues("spring.data.redis.cluster.nodes[0]:" + clusterNodes.get(0), - "spring.data.redis.cluster.nodes[1]:" + clusterNodes.get(1)) + "spring.data.redis.cluster.nodes[1]:" + clusterNodes.get(1), + "spring.data.redis.cluster.nodes[2]:" + clusterNodes.get(2)) .run((context) -> { RedisClusterConfiguration clusterConfiguration = context.getBean(LettuceConnectionFactory.class) .getClusterConfiguration(); - assertThat(clusterConfiguration.getClusterNodes()).hasSize(2); - assertThat(clusterConfiguration.getClusterNodes()) - .extracting((node) -> node.getHost() + ":" + node.getPort()) - .containsExactlyInAnyOrder("127.0.0.1:27379", "127.0.0.1:27380"); + assertThat(clusterConfiguration.getClusterNodes()).hasSize(3); + assertThat(clusterConfiguration.getClusterNodes()).extracting(RedisNode::asString) + .containsExactlyInAnyOrder("127.0.0.1:27379", "127.0.0.1:27380", "[::1]:27381"); }); }