RedisNode creation from bare hostname assigns default port

src/main/java/org/springframework/data/redis/connection/RedisNode.java

@@ -24,10 +24,13 @@
  * @author Christoph Strobl
  * @author Thomas Darimont
  * @author Mark Paluch
+ * @author LeeHyungGeol
  * @since 1.4
  */
 public class RedisNode implements NamedNode {
 
+	private static final int DEFAULT_PORT = 6379;
+
 	@Nullable String id;
 	@Nullable String name;
 	@Nullable String host;
@@ -94,7 +97,17 @@ public static RedisNode fromString(String hostPortString) {
 				portString = hostPortString.substring(colonPos + 1);
 			} else {
 				// 0 or 2+ colons. Bare hostname or IPv6 literal.
-				host = hostPortString;
+				int lastColonIndex = hostPortString.lastIndexOf(':');
+
+				// IPv6 literal
+				if (lastColonIndex > hostPortString.indexOf(']')) {
+					host = hostPortString.substring(0, lastColonIndex);
+					portString = hostPortString.substring(lastColonIndex + 1);
+				} else {
+					// bare hostname
+					host = hostPortString;
+					portString = Integer.toString(DEFAULT_PORT);
+				}
 			}
 		}
 

src/test/java/org/springframework/data/redis/connection/RedisNodeUnitTests.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.connection;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.*;
+
+/**
+ * Unit tests for {@link RedisNode}.
+ * referred to the test code in ConversionUnitTests.java
+ *
+ * @author LeeHyungGeol
+ */
+public class RedisNodeUnitTests {
+	private static final int DEFAULT_PORT = 6379;
+
+	@Test // GH-2928
+	void shouldParseIPv4AddressWithPort() {
+		RedisNode node = RedisNode.fromString("127.0.0.1:6379");
+		assertThat(node.getHost()).isEqualTo("127.0.0.1");
+		assertThat(node.getPort()).isEqualTo(6379);
+	}
+
+	@Test // GH-2928
+	void shouldParseIPv6AddressWithPort() {
+		RedisNode node = RedisNode.fromString("[aaaa:bbbb::dddd:eeee]:6379");
+		assertThat(node.getHost()).isEqualTo("aaaa:bbbb::dddd:eeee");
+		assertThat(node.getPort()).isEqualTo(6379);
+	}
+
+	@Test // GH-2928
+	void shouldParseBareHostnameWithPort() {
+		RedisNode node = RedisNode.fromString("my.redis.server:6379");
+		assertThat(node.getHost()).isEqualTo("my.redis.server");
+		assertThat(node.getPort()).isEqualTo(6379);
+	}
+
+	@Test // GH-2928
+	void shouldThrowExceptionForInvalidPort() {
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> RedisNode.fromString("127.0.0.1:invalidPort"));
+	}
+
+	@Test // GH-2928
+	void shouldParseBareIPv6WithoutPort() {
+		RedisNode node = RedisNode.fromString("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
+		assertThat(node.getHost()).isEqualTo("2001:0db8:85a3:0000:0000:8a2e:0370");
+		assertThat(node.getPort()).isEqualTo(7334);
+	}
+
+	@Test // GH-2928
+	void shouldParseBareHostnameWithoutPort() {
+		RedisNode node = RedisNode.fromString("my.redis.server");
+		assertThat(node.getHost()).isEqualTo("my.redis.server");
+		assertThat(node.getPort()).isEqualTo(DEFAULT_PORT);
+	}
+}
+