Redis Cluster: fix CompleteHostAndPortMapper.getHostAndPort + Utils.adjustHost

Author: Veirisa

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

@@ -267,10 +267,12 @@ public CompleteHostAndPortMapper(@NotNull Map<HostAndPort, HostAndPort> mapping)
         @Override
         public HostAndPort getHostAndPort(HostAndPort hap) throws JedisConnectionException {
             if (hap == null) return null;
-            HostAndPort mappedHsp = mapping.get(hap);
-            if (mappedHsp == null)
+            HostAndPort mappedHap = mapping.get(hap);
+            if (mappedHap == null) {
+                if (mapping.containsValue(hap)) return hap;
                 throw new JedisConnectionException(String.format("Port forwarding is not specified for %s", hap));
-            return mappedHsp;
+            }
+            return mappedHap;
         }
     }
 }

driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterURI.java

@@ -14,6 +14,7 @@
 
 import static jdbc.properties.RedisDefaultConfig.CONFIG;
 import static jdbc.properties.RedisDriverPropertyInfoHelper.MAX_ATTEMPTS;
+import static jdbc.utils.Utils.adjustHost;
 
 public class RedisJedisClusterURI extends RedisJedisURIBase {
 
@@ -60,7 +61,7 @@ protected void setHostAndPort(@NotNull String nodesBlock) {
                 }
             }
 
-            nodes.add(new HostAndPort(host, port));
+            nodes.add(new HostAndPort(adjustHost(host), port));
         }
 
         this.nodes = nodes;

driver/src/main/java/jdbc/client/impl/standalone/RedisJedisURI.java

@@ -8,6 +8,8 @@
 import java.sql.SQLException;
 import java.util.Properties;
 
+import static jdbc.utils.Utils.adjustHost;
+
 public class RedisJedisURI extends RedisJedisURIBase {
 
     private static final String PREFIX = "jdbc:redis://";
@@ -46,7 +48,7 @@ protected void setHostAndPort(@NotNull String hostAndPortBlock) {
             }
         }
 
-        this.hostAndPort = new HostAndPort(host, port);
+        this.hostAndPort = new HostAndPort(adjustHost(host), port);
     }
 
 

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

@@ -109,12 +109,18 @@ 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();
+        String host = hostAndPort.getHost();
+        String adjustedHost = adjustHost(host);
+        if (adjustedHost.equals(host)) return hostAndPort;
+        return new HostAndPort(adjustedHost, hostAndPort.getPort());
+    }
+
+    public static @NotNull String adjustHost(@NotNull String host) {
+        String adjustedHost = host.trim();
         if ("localhost".equalsIgnoreCase(adjustedHost)) {
-            adjustedHost = Protocol.DEFAULT_HOST;
+            return Protocol.DEFAULT_HOST;
         }
-        if (adjustedHost.equals(hostAndPort.getHost())) return hostAndPort;
-        return new HostAndPort(adjustedHost, hostAndPort.getPort());
+        return adjustedHost;
     }