Merge branch '2.6.x' into 2.7.x

Closes gh-32836
spring-projects · Oct 21, 2022 · 0324871 · 0324871
2 parents d8c4aec + fe51e03
commit 0324871
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.../java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java b/.../java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java
@@ -28,7 +28,6 @@
 import org.springframework.data.redis.connection.RedisPassword;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -145,9 +144,7 @@ private List<RedisNode> createSentinels(RedisProperties.Sentinel sentinel) {
 		List<RedisNode> nodes = new ArrayList<>();
 		for (String node : sentinel.getNodes()) {
 			try {
-				String[] parts = StringUtils.split(node, ":");
-				Assert.state(parts.length == 2, "Must be defined as 'host:port'");
-				nodes.add(new RedisNode(parts[0], Integer.parseInt(parts[1])));
+				nodes.add(RedisNode.fromString(node));
 			}
 			catch (RuntimeException ex) {
 				throw new IllegalStateException("Invalid redis sentinel property '" + node + "'", ex);

diff --git a/...t/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/...t/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
@@ -280,6 +280,16 @@ void testRedisConfigurationWithSentinel() {
 						.isTrue());
 	}
 
+	@Test
+	void testRedisConfigurationWithIpv6Sentinel() {
+		List<String> sentinels = Arrays.asList("[0:0:0:0:0:0:0:1]:26379", "[0:0:0:0:0:0:0:1]:26380");
+		this.contextRunner
+				.withPropertyValues("spring.redis.sentinel.master:mymaster",
+						"spring.redis.sentinel.nodes:" + StringUtils.collectionToCommaDelimitedString(sentinels))
+				.run((context) -> assertThat(context.getBean(LettuceConnectionFactory.class).isRedisSentinelAware())
+						.isTrue());
+	}
+
 	@Test
 	void testRedisConfigurationWithSentinelAndDatabase() {
 		this.contextRunner.withPropertyValues("spring.redis.database:1", "spring.redis.sentinel.master:mymaster",