Better SslOptions with custom HostnameVerifier

in connectWithCustomHostNameVerifier() test
redis · Nov 28, 2024 · 9e60a8e · 9e60a8e
1 parent ac1de9c
commit 9e60a8e
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java
@@ -148,11 +148,13 @@ public void connectWithCustomHostNameVerifier() {
     HostnameVerifier hostnameVerifier = new BasicHostnameVerifier();
     HostnameVerifier localhostVerifier = new LocalhostVerifier();
 
-    try (JedisCluster jc = new JedisCluster(new HostAndPort("localhost", 8379),
-        DefaultJedisClientConfig.builder().password("cluster")
-            .sslOptions(SslOptions.builder()
+    SslOptions sslOptions = SslOptions.builder()
                 .truststore(new File("src/test/resources/truststore.jceks"))
-                .trustStoreType("jceks").build())
+                .trustStoreType("jceks")
+                .sslVerifyMode(SslVerifyMode.CA).build();
+
+    try (JedisCluster jc = new JedisCluster(new HostAndPort("localhost", 8379),
+        DefaultJedisClientConfig.builder().password("cluster").sslOptions(sslOptions)
             .hostnameVerifier(hostnameVerifier).hostAndPortMapper(portMap).build(),
         DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) {
       jc.get("foo");
@@ -164,22 +166,15 @@ public void connectWithCustomHostNameVerifier() {
     }
 
     try (JedisCluster jc2 = new JedisCluster(new HostAndPort("127.0.0.1", 8379),
-        DefaultJedisClientConfig.builder().password("cluster")
-            .sslOptions(SslOptions.builder()
-                .truststore(new File("src/test/resources/truststore.jceks"))
-                .trustStoreType("jceks").build())
+        DefaultJedisClientConfig.builder().password("cluster").sslOptions(sslOptions)
             .hostnameVerifier(hostnameVerifier).hostAndPortMapper(portMap).build(),
         DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) {
     } catch (JedisClusterOperationException e) {
       assertEquals("Could not initialize cluster slots cache.", e.getMessage());
     }
 
     try (JedisCluster jc3 = new JedisCluster(new HostAndPort("localhost", 8379),
-        DefaultJedisClientConfig.builder().password("cluster")
-            .sslOptions(SslOptions.builder()
-                .truststore(new File("src/test/resources/truststore.jceks"))
-                .trustStoreType("jceks")
-                .sslVerifyMode(SslVerifyMode.CA).build())
+        DefaultJedisClientConfig.builder().password("cluster").sslOptions(sslOptions)
             .hostnameVerifier(localhostVerifier).hostAndPortMapper(portMap).build(),
         DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) {
       jc3.get("foo");