Redis Cluster: extract parseHostAndPort

Author: Veirisa

driver/src/main/java/jdbc/client/helpers/query/parser/QueryParser.java

@@ -244,8 +244,7 @@ private static class NodeHintLine extends CommentLine implements HintLine {
             if (!accepts(tokens)) throw new AssertionError(String.format("Incorrect node hint tokens: %s.", tokens));
             HostAndPort hostAndPort = null;
             try {
-                // TODO (cluster): improve parsing (URL too)
-                hostAndPort = HostAndPort.from(tokens.get(3));
+                hostAndPort = parseHostAndPort(tokens.get(3));
             } catch (Exception ignored) {
             }
             this.hostAndPort = hostAndPort;

driver/src/main/java/jdbc/client/impl/RedisJedisURIBase.java

@@ -6,7 +6,6 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.HostAndPortMapper;
 import redis.clients.jedis.JedisClientConfig;
-import redis.clients.jedis.Protocol;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import javax.net.ssl.SSLContext;
@@ -202,19 +201,10 @@ protected boolean getBoolean(Map<String, String> parameters, Properties info, St
 
 
     private void setHostAndPortMapping(Properties info) {
-        Map<HostAndPort, HostAndPort> mapping = getMap(info, HOST_AND_PORT_MAPPING, this::parseHostAndPort, this::parseHostAndPort);
+        Map<HostAndPort, HostAndPort> mapping = getMap(info, HOST_AND_PORT_MAPPING, Utils::parseHostAndPort, Utils::parseHostAndPort);
         this.hostAndPortMapper = mapping == null ? null : new CompleteHostAndPortMapper(mapping);
     }
 
-    // TODO (cluster): improvements + tests
-    @NotNull
-    private HostAndPort parseHostAndPort(@NotNull String hostAndPortStr) {
-        HostAndPort hostAndPort = HostAndPort.from(hostAndPortStr);
-        if ("localhost".equalsIgnoreCase(hostAndPort.getHost()))
-            return new HostAndPort(Protocol.DEFAULT_HOST, hostAndPort.getPort());
-        return hostAndPort;
-    }
-
 
     @Override
     public String getUser() {

driver/src/main/java/jdbc/utils/Utils.java

@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.Protocol.Keyword;
 import redis.clients.jedis.args.Rawable;
@@ -106,6 +107,17 @@ private static <T> T getObject(Map<?, ?> map, String name, T defaultValue, Funct
     }
 
 
+    public static @NotNull HostAndPort parseHostAndPort(@NotNull String hostAndPortStr) {
+        HostAndPort hostAndPort = HostAndPort.from(hostAndPortStr);
+        String adjustedHost = hostAndPort.getHost().trim();
+        if ("localhost".equalsIgnoreCase(adjustedHost)) {
+            adjustedHost = Protocol.DEFAULT_HOST;
+        }
+        if (adjustedHost.equals(hostAndPort.getHost())) return hostAndPort;
+        return new HostAndPort(adjustedHost, hostAndPort.getPort());
+    }
+
+
     public static int parseSqlDbIndex(@Nullable String db) throws SQLException {
         if (db == null) throw new SQLException("Database should be specified.");
         try {