Polish "Fix handling of Redis nodes with IPv6 addresses"

See gh-39819

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java

@@ -123,8 +123,8 @@ protected final RedisClusterConfiguration getClusterConfiguration() {
 		}
 		RedisProperties.Cluster clusterProperties = this.properties.getCluster();
 		if (this.connectionDetails.getCluster() != null) {
-			RedisClusterConfiguration config = new RedisClusterConfiguration(
-					getNodes(this.connectionDetails.getCluster()));
+			RedisClusterConfiguration config = new RedisClusterConfiguration();
+			config.setClusterNodes(getNodes(this.connectionDetails.getCluster()));
 			if (clusterProperties != null && clusterProperties.getMaxRedirects() != null) {
 				config.setMaxRedirects(clusterProperties.getMaxRedirects());
 			}
@@ -138,8 +138,12 @@ protected final RedisClusterConfiguration getClusterConfiguration() {
 		return null;
 	}
 
-	private List<String> getNodes(Cluster cluster) {
-		return cluster.getNodes().stream().map(Node::asString).toList();
+	private List<RedisNode> getNodes(Cluster cluster) {
+		return cluster.getNodes().stream().map(this::asRedisNode).toList();
+	}
+
+	private RedisNode asRedisNode(Node node) {
+		return new RedisNode(node.host(), node.port());
 	}
 
 	protected final RedisProperties getProperties() {
@@ -162,7 +166,7 @@ protected boolean isPoolEnabled(Pool pool) {
 	private List<RedisNode> createSentinels(Sentinel sentinel) {
 		List<RedisNode> nodes = new ArrayList<>();
 		for (Node node : sentinel.getNodes()) {
-			nodes.add(RedisNode.fromString(node.asString()));
+			nodes.add(asRedisNode(node));
 		}
 		return nodes;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,9 +185,6 @@ interface Cluster {
 	 */
 	record Node(String host, int port) {
 
-		String asString() {
-			return this.host + ":" + this.port;
-		}
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetailsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Node;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -122,9 +124,8 @@ void clusterIsConfigured() {
 		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("localhost", 1111), new RedisConnectionDetails.Node("127.0.0.1", 2222),
-				new RedisConnectionDetails.Node("[::1]", 3333));
+		assertThat(connectionDetails.getCluster().getNodes()).containsExactly(new Node("localhost", 1111),
+				new Node("127.0.0.1", 2222), new Node("[::1]", 3333));
 	}
 
 	@Test
@@ -133,9 +134,8 @@ void sentinelIsConfigured() {
 		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));
+		assertThat(connectionDetails.getSentinel().getNodes()).containsExactly(new Node("localhost", 1111),
+				new Node("127.0.0.1", 2222), new Node("[::1]", 3333));
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -309,12 +309,11 @@ void testRedisConfigurationWithIpv6Sentinel() {
 			.withPropertyValues("spring.data.redis.sentinel.master:mymaster",
 					"spring.data.redis.sentinel.nodes:" + StringUtils.collectionToCommaDelimitedString(sentinels))
 			.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");
+				LettuceConnectionFactory connectionFactory = context.getBean(LettuceConnectionFactory.class);
+				assertThat(connectionFactory.isRedisSentinelAware()).isTrue();
+				assertThat(connectionFactory.getSentinelConfiguration().getSentinels()).isNotNull()
+					.containsExactlyInAnyOrder(new RedisNode("[0:0:0:0:0:0:0:1]", 26379),
+							new RedisNode("[0:0:0:0:0:0:0:1]", 26380));
 			});
 	}
 
@@ -409,10 +408,10 @@ void testRedisConfigurationWithCluster() {
 				RedisClusterConfiguration clusterConfiguration = context.getBean(LettuceConnectionFactory.class)
 					.getClusterConfiguration();
 				assertThat(clusterConfiguration.getClusterNodes()).hasSize(3);
-				assertThat(clusterConfiguration.getClusterNodes()).extracting(RedisNode::asString)
-					.containsExactlyInAnyOrder("127.0.0.1:27379", "127.0.0.1:27380", "[::1]:27381");
+				assertThat(clusterConfiguration.getClusterNodes()).containsExactlyInAnyOrder(
+						new RedisNode("127.0.0.1", 27379), new RedisNode("127.0.0.1", 27380),
+						new RedisNode("[::1]", 27381));
 			});
-
 	}
 
 	@Test