update with config pattern

redis · Mar 14, 2021 · 16bcd37 · 16bcd37
1 parent 5b6163f
commit 16bcd37
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/main/java/redis/clients/jedis/DefaultJedisClientConfig.java b/src/main/java/redis/clients/jedis/DefaultJedisClientConfig.java
@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import java.util.Objects;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
@@ -11,7 +12,7 @@ public final class DefaultJedisClientConfig implements JedisClientConfig {
   private final int infiniteSoTimeoutMillis;
 
   private final String user;
-  private final String password;
+  private volatile String password;
   private final int database;
   private final String clientName;
 
@@ -65,6 +66,21 @@ public String getPassword() {
     return password;
   }
 
+  /**
+   * @param user has to be the same one with which the factory is created
+   * @param password
+   * @throws IllegalArgumentException if the user is not the original user
+   */
+  @Override
+  public synchronized void updatePassword(String user, String password) {
+    if (!Objects.equals(this.user, user)) {
+      throw new IllegalArgumentException();
+    }
+    if (!Objects.equals(this.password, password)) {
+      this.password = password;
+    }
+  }
+
   @Override
   public int getDatabase() {
     return database;

diff --git a/src/main/java/redis/clients/jedis/JedisClientConfig.java b/src/main/java/redis/clients/jedis/JedisClientConfig.java
@@ -39,6 +39,9 @@ default String getPassword() {
     return null;
   }
 
+  default void updatePassword(String user, String password) {
+  }
+
   default int getDatabase() {
     return Protocol.DEFAULT_DATABASE;
   }

diff --git a/src/main/java/redis/clients/jedis/JedisFactory.java b/src/main/java/redis/clients/jedis/JedisFactory.java
@@ -122,25 +122,12 @@ public void setHostAndPort(final HostAndPort hostAndPort) {
     this.hostAndPort.set(hostAndPort);
   }
 
-  /**
-   * @param password
-   * @throws IllegalArgumentException
-   * @see #setPassword(java.lang.String, java.lang.String)
-   */
   public void setPassword(final String password) throws IllegalArgumentException {
     setPassword(null, password);
   }
 
-  /**
-   * @param user has to be the same one with which the factory is created
-   * @param password
-   * @throws IllegalArgumentException if the user is not the original user
-   */
   public void setPassword(final String user, final String password) throws IllegalArgumentException {
-    if (!java.util.Objects.equals(this.user, user)) {
-      throw new IllegalArgumentException();
-    }
-    this.password = password;
+    this.config.updatePassword(user, password);
   }
 
   @Override