Increase code reuse for LocalhostVerifier

redis · Nov 24, 2024 · 1fa23f2 · 1fa23f2
1 parent bcce93b
commit 1fa23f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java
@@ -7,7 +7,6 @@
 import java.util.Map;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.junit.AfterClass;
@@ -17,6 +16,7 @@
 
 import redis.clients.jedis.exceptions.JedisClusterOperationException;
 import redis.clients.jedis.SSLJedisTest.BasicHostnameVerifier;
+import redis.clients.jedis.SSLJedisTest.LocalhostVerifier;
 
 public class SSLJedisClusterTest extends JedisClusterTestBase {
 
@@ -237,14 +237,4 @@ public void defaultHostAndPortUsedIfMapReturnsNull() {
       assertTrue(clusterNodes.containsKey("127.0.0.1:7381"));
     }
   }
-
-  public class LocalhostVerifier extends BasicHostnameVerifier {
-    @Override
-    public boolean verify(String hostname, SSLSession session) {
-      if (hostname.equals("127.0.0.1")) {
-        hostname = "localhost";
-      }
-      return super.verify(hostname, session);
-    }
-  }
 }
diff --git a/src/test/java/redis/clients/jedis/SSLJedisTest.java b/src/test/java/redis/clients/jedis/SSLJedisTest.java
@@ -186,4 +186,14 @@ private String getCommonName(X509Certificate peerCertificate) {
       throw new IllegalArgumentException("The certificate has no common name.");
     }
   }
+
+  static class LocalhostVerifier extends BasicHostnameVerifier {
+    @Override
+    public boolean verify(String hostname, SSLSession session) {
+      if (hostname.equals("127.0.0.1")) {
+        hostname = "localhost";
+      }
+      return super.verify(hostname, session);
+    }
+  }
 }
diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java
@@ -8,14 +8,14 @@
 import java.util.Map;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import redis.clients.jedis.exceptions.JedisClusterOperationException;
 import redis.clients.jedis.SSLJedisTest.BasicHostnameVerifier;
+import redis.clients.jedis.SSLJedisTest.LocalhostVerifier;
 
 public class SSLOptionsJedisClusterTest extends JedisClusterTestBase {
 
@@ -203,14 +203,4 @@ public void connectWithEmptyTrustStore() throws Exception {
       assertEquals("Could not initialize cluster slots cache.", e.getMessage());
     }
   }
-
-  public class LocalhostVerifier extends BasicHostnameVerifier {
-    @Override
-    public boolean verify(String hostname, SSLSession session) {
-      if (hostname.equals("127.0.0.1")) {
-        hostname = "localhost";
-      }
-      return super.verify(hostname, session);
-    }
-  }
 }