Rename MultiDatabaseConnectionProvider to MultiDbConnectionProvider

Author: ggivo

src/main/java/redis/clients/jedis/MultiDbClient.java

@@ -9,7 +9,7 @@
 import redis.clients.jedis.mcf.MultiClusterPipeline;
 import redis.clients.jedis.mcf.MultiClusterTransaction;
 import redis.clients.jedis.providers.ConnectionProvider;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 
 import java.util.Set;
 
@@ -76,7 +76,7 @@
  * </p>
  * @author Ivo Gaydazhiev
  * @since 5.2.0
- * @see MultiDatabaseConnectionProvider
+ * @see MultiDbConnectionProvider
  * @see CircuitBreakerCommandExecutor
  * @see MultiDbConfig
  */
@@ -91,7 +91,7 @@ public class MultiDbClient extends UnifiedJedis {
    * {@link #builder()} to create instances.
    * </p>
    * @param commandExecutor the command executor (typically CircuitBreakerCommandExecutor)
-   * @param connectionProvider the connection provider (typically MultiDatabaseConnectionProvider)
+   * @param connectionProvider the connection provider (typically MultiDbConnectionProvider)
    * @param commandObjects the command objects
    * @param redisProtocol the Redis protocol version
    * @param cache the client-side cache (may be null)
@@ -102,16 +102,16 @@ public class MultiDbClient extends UnifiedJedis {
   }
 
   /**
-   * Returns the underlying MultiDatabaseConnectionProvider.
+   * Returns the underlying MultiDbConnectionProvider.
    * <p>
    * This provides access to multi-cluster specific operations like manual failover, health status
    * monitoring, and cluster switch event handling.
    * </p>
    * @return the multi-cluster connection provider
-   * @throws ClassCastException if the provider is not a MultiDatabaseConnectionProvider
+   * @throws ClassCastException if the provider is not a MultiDbConnectionProvider
    */
-  private MultiDatabaseConnectionProvider getMultiDatabaseConnectionProvider() {
-    return (MultiDatabaseConnectionProvider) this.provider;
+  private MultiDbConnectionProvider getMultiDbConnectionProvider() {
+    return (MultiDbConnectionProvider) this.provider;
   }
 
   /**
@@ -123,7 +123,7 @@ private MultiDatabaseConnectionProvider getMultiDatabaseConnectionProvider() {
    * @param endpoint the endpoint to switch to
    */
   public void setActiveDatabase(Endpoint endpoint) {
-    getMultiDatabaseConnectionProvider().setActiveDatabase(endpoint);
+    getMultiDbConnectionProvider().setActiveDatabase(endpoint);
   }
 
   /**
@@ -136,7 +136,7 @@ public void setActiveDatabase(Endpoint endpoint) {
    * @param databaseConfig the pre-configured database configuration
    */
   public void addEndpoint(DatabaseConfig databaseConfig) {
-    getMultiDatabaseConnectionProvider().add(databaseConfig);
+    getMultiDbConnectionProvider().add(databaseConfig);
   }
 
   /**
@@ -155,7 +155,7 @@ public void addEndpoint(Endpoint endpoint, float weight, JedisClientConfig clien
     DatabaseConfig databaseConfig = DatabaseConfig.builder(endpoint, clientConfig).weight(weight)
         .build();
 
-    getMultiDatabaseConnectionProvider().add(databaseConfig);
+    getMultiDbConnectionProvider().add(databaseConfig);
   }
 
   /**
@@ -166,7 +166,7 @@ public void addEndpoint(Endpoint endpoint, float weight, JedisClientConfig clien
    * @return the set of all configured endpoints
    */
   public Set<Endpoint> getEndpoints() {
-    return getMultiDatabaseConnectionProvider().getEndpoints();
+    return getMultiDbConnectionProvider().getEndpoints();
   }
 
   /**
@@ -178,7 +178,7 @@ public Set<Endpoint> getEndpoints() {
    * @return the health status of the endpoint
    */
   public boolean isHealthy(Endpoint endpoint) {
-    return getMultiDatabaseConnectionProvider().isHealthy(endpoint);
+    return getMultiDbConnectionProvider().isHealthy(endpoint);
   }
 
   /**
@@ -194,7 +194,7 @@ public boolean isHealthy(Endpoint endpoint) {
    *           healthy clusters available
    */
   public void removeEndpoint(Endpoint endpoint) {
-    getMultiDatabaseConnectionProvider().remove(endpoint);
+    getMultiDbConnectionProvider().remove(endpoint);
   }
 
   /**
@@ -210,7 +210,7 @@ public void removeEndpoint(Endpoint endpoint) {
    *           or doesn't exist
    */
   public void forceActiveEndpoint(Endpoint endpoint, long forcedActiveDurationMs) {
-    getMultiDatabaseConnectionProvider().forceActiveDatabase(endpoint, forcedActiveDurationMs);
+    getMultiDbConnectionProvider().forceActiveDatabase(endpoint, forcedActiveDurationMs);
   }
 
   /**
@@ -223,7 +223,7 @@ public void forceActiveEndpoint(Endpoint endpoint, long forcedActiveDurationMs)
    */
   @Override
   public MultiClusterPipeline pipelined() {
-    return new MultiClusterPipeline(getMultiDatabaseConnectionProvider(), commandObjects);
+    return new MultiClusterPipeline(getMultiDbConnectionProvider(), commandObjects);
   }
 
   /**
@@ -236,8 +236,7 @@ public MultiClusterPipeline pipelined() {
    */
   @Override
   public MultiClusterTransaction multi() {
-    return new MultiClusterTransaction((MultiDatabaseConnectionProvider) provider, true,
-        commandObjects);
+    return new MultiClusterTransaction((MultiDbConnectionProvider) provider, true, commandObjects);
   }
 
   /**
@@ -251,12 +250,11 @@ public MultiClusterTransaction transaction(boolean doMulti) {
           "It is not allowed to create Transaction from this " + getClass());
     }
 
-    return new MultiClusterTransaction(getMultiDatabaseConnectionProvider(), doMulti,
-        commandObjects);
+    return new MultiClusterTransaction(getMultiDbConnectionProvider(), doMulti, commandObjects);
   }
 
   public Endpoint getActiveEndpoint() {
-    return getMultiDatabaseConnectionProvider().getDatabase().getEndpoint();
+    return getMultiDbConnectionProvider().getDatabase().getEndpoint();
   }
 
   /**

src/main/java/redis/clients/jedis/MultiDbConfig.java

@@ -21,7 +21,7 @@
  * This configuration enables seamless failover between multiple Redis clusters, databases, or
  * endpoints by providing comprehensive settings for retry logic, circuit breaker behavior, health
  * checks, and failback mechanisms. It is designed to work with
- * {@link redis.clients.jedis.mcf.MultiDatabaseConnectionProvider} to provide high availability and
+ * {@link redis.clients.jedis.mcf.MultiDbConnectionProvider} to provide high availability and
  * disaster recovery capabilities.
  * </p>
  * <p>
@@ -61,14 +61,14 @@
  *       .gracePeriod(10000).build();
  *
  *   // Use with connection provider
- *   MultiDatabaseConnectionProvider provider = new MultiDatabaseConnectionProvider(config);
+ *   MultiDbConnectionProvider provider = new MultiDbConnectionProvider(config);
  * }
  * </pre>
  * <p>
  * The configuration leverages <a href="https://resilience4j.readme.io/docs">Resilience4j</a> for
  * circuit breaker and retry implementations, providing battle-tested fault tolerance patterns.
  * </p>
- * @see redis.clients.jedis.mcf.MultiDatabaseConnectionProvider
+ * @see redis.clients.jedis.mcf.MultiDbConnectionProvider
  * @see redis.clients.jedis.mcf.HealthCheckStrategy
  * @see redis.clients.jedis.mcf.EchoStrategy
  * @see redis.clients.jedis.mcf.LagAwareStrategy
@@ -451,7 +451,7 @@ public static interface StrategySupplier {
   public MultiDbConfig(DatabaseConfig[] databaseConfigs) {
 
     if (databaseConfigs == null || databaseConfigs.length < 1) throw new JedisValidationException(
-        "DatabaseClientConfigs are required for MultiDatabaseConnectionProvider");
+        "DatabaseClientConfigs are required for MultiDbConnectionProvider");
 
     for (DatabaseConfig databaseConfig : databaseConfigs) {
       if (databaseConfig == null)
@@ -976,8 +976,7 @@ public DatabaseConfig build() {
   }
 
   /**
-   * Builder class for creating MultiDbConfig instances with comprehensive configuration
-   * options.
+   * Builder class for creating MultiDbConfig instances with comprehensive configuration options.
    * <p>
    * The Builder provides a fluent API for configuring all aspects of multi-cluster failover
    * behavior, including retry logic, circuit breaker settings, and failback mechanisms. It uses
@@ -1509,8 +1508,7 @@ public Builder delayInBetweenFailoverAttempts(int delayInBetweenFailoverAttempts
      */
     public MultiDbConfig build() {
 
-      MultiDbConfig config = new MultiDbConfig(
-          this.databaseConfigs.toArray(new DatabaseConfig[0]));
+      MultiDbConfig config = new MultiDbConfig(this.databaseConfigs.toArray(new DatabaseConfig[0]));
 
       // Copy retry configuration
       config.retryMaxAttempts = this.retryMaxAttempts;

src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -34,7 +34,7 @@
 import redis.clients.jedis.json.JsonObjectMapper;
 import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
 import redis.clients.jedis.mcf.MultiClusterPipeline;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.mcf.MultiClusterTransaction;
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.providers.*;
@@ -240,7 +240,7 @@ public UnifiedJedis(ConnectionProvider provider, int maxAttempts, Duration maxTo
    * <p>
    */
   @Experimental
-  public UnifiedJedis(MultiDatabaseConnectionProvider provider) {
+  public UnifiedJedis(MultiDbConnectionProvider provider) {
     this(new CircuitBreakerCommandExecutor(provider), provider);
   }
 
@@ -5099,8 +5099,8 @@ public List<Double> tdigestByRevRank(String key, long... ranks) {
   public PipelineBase pipelined() {
     if (provider == null) {
       throw new IllegalStateException("It is not allowed to create Pipeline from this " + getClass());
-    } else if (provider instanceof MultiDatabaseConnectionProvider) {
-      return new MultiClusterPipeline((MultiDatabaseConnectionProvider) provider, commandObjects);
+    } else if (provider instanceof MultiDbConnectionProvider) {
+      return new MultiClusterPipeline((MultiDbConnectionProvider) provider, commandObjects);
     } else {
       return new Pipeline(provider.getConnection(), true, commandObjects);
     }
@@ -5120,8 +5120,8 @@ public AbstractTransaction multi() {
   public AbstractTransaction transaction(boolean doMulti) {
     if (provider == null) {
       throw new IllegalStateException("It is not allowed to create Transaction from this " + getClass());
-    } else if (provider instanceof MultiDatabaseConnectionProvider) {
-      return new MultiClusterTransaction((MultiDatabaseConnectionProvider) provider, doMulti, commandObjects);
+    } else if (provider instanceof MultiDbConnectionProvider) {
+      return new MultiClusterTransaction((MultiDbConnectionProvider) provider, doMulti, commandObjects);
     } else {
       return new Transaction(provider.getConnection(), doMulti, true, commandObjects);
     }

src/main/java/redis/clients/jedis/builders/MultiDbClientBuilder.java

@@ -7,7 +7,7 @@
 import redis.clients.jedis.executors.CommandExecutor;
 import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
 import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.providers.ConnectionProvider;
 
 /**
@@ -113,7 +113,7 @@ protected ConnectionProvider createDefaultConnectionProvider() {
     }
 
     // Create the multi-cluster connection provider
-    MultiDatabaseConnectionProvider provider = new MultiDatabaseConnectionProvider(multiDbConfig);
+    MultiDbConnectionProvider provider = new MultiDbConnectionProvider(multiDbConfig);
 
     // Set database switch listener if provided
     if (this.databaseSwitchListener != null) {
@@ -126,8 +126,7 @@ protected ConnectionProvider createDefaultConnectionProvider() {
   @Override
   protected CommandExecutor createDefaultCommandExecutor() {
     // For multi-db clients, we always use CircuitBreakerCommandExecutor
-    return new CircuitBreakerCommandExecutor(
-        (MultiDatabaseConnectionProvider) this.connectionProvider);
+    return new CircuitBreakerCommandExecutor((MultiDbConnectionProvider) this.connectionProvider);
   }
 
   @Override

src/main/java/redis/clients/jedis/mcf/CircuitBreakerCommandExecutor.java

@@ -9,7 +9,7 @@
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.executors.CommandExecutor;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider.Database;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider.Database;
 
 /**
  * @author Allen Terleto (aterleto)
@@ -24,7 +24,7 @@
 public class CircuitBreakerCommandExecutor extends CircuitBreakerFailoverBase
     implements CommandExecutor {
 
-  public CircuitBreakerCommandExecutor(MultiDatabaseConnectionProvider provider) {
+  public CircuitBreakerCommandExecutor(MultiDbConnectionProvider provider) {
     super(provider);
   }
 

src/main/java/redis/clients/jedis/mcf/CircuitBreakerFailoverBase.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import redis.clients.jedis.annots.Experimental;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider.Database;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider.Database;
 import redis.clients.jedis.util.IOUtils;
 
 /**
@@ -23,9 +23,9 @@
 public class CircuitBreakerFailoverBase implements AutoCloseable {
   private final Lock lock = new ReentrantLock(true);
 
-  protected final MultiDatabaseConnectionProvider provider;
+  protected final MultiDbConnectionProvider provider;
 
-  public CircuitBreakerFailoverBase(MultiDatabaseConnectionProvider provider) {
+  public CircuitBreakerFailoverBase(MultiDbConnectionProvider provider) {
     this.provider = provider;
   }
 

src/main/java/redis/clients/jedis/mcf/CircuitBreakerFailoverConnectionProvider.java

@@ -6,7 +6,7 @@
 
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.annots.Experimental;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider.Database;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider.Database;
 
 /**
  * ConnectionProvider with built-in retry, circuit-breaker, and failover to another cluster/database
@@ -16,7 +16,7 @@
 @Experimental
 public class CircuitBreakerFailoverConnectionProvider extends CircuitBreakerFailoverBase {
 
-  public CircuitBreakerFailoverConnectionProvider(MultiDatabaseConnectionProvider provider) {
+  public CircuitBreakerFailoverConnectionProvider(MultiDbConnectionProvider provider) {
     super(provider);
   }
 

src/main/java/redis/clients/jedis/mcf/CircuitBreakerThresholdsAdapter.java

@@ -9,10 +9,10 @@
  * <p>
  * This adapter sets maximum values for failure rate (100%) and minimum calls (Integer.MAX_VALUE) to
  * effectively disable Resilience4j's automatic circuit breaker transitions, allowing
- * {@link MultiDatabaseConnectionProvider.Database#evaluateThresholds(boolean)} to control when the
+ * {@link MultiDbConnectionProvider.Database#evaluateThresholds(boolean)} to control when the
  * circuit breaker opens based on both minimum failure count AND failure rate.
  * </p>
- * @see MultiDatabaseConnectionProvider.Database#evaluateThresholds(boolean)
+ * @see MultiDbConnectionProvider.Database#evaluateThresholds(boolean)
  */
 class CircuitBreakerThresholdsAdapter {
   /** Maximum failure rate threshold (100%) to disable Resilience4j evaluation */

src/main/java/redis/clients/jedis/mcf/ClusterSwitchEventArgs.java

@@ -1,7 +1,7 @@
 package redis.clients.jedis.mcf;
 
 import redis.clients.jedis.Endpoint;
-import redis.clients.jedis.mcf.MultiDatabaseConnectionProvider.Database;
+import redis.clients.jedis.mcf.MultiDbConnectionProvider.Database;
 
 public class ClusterSwitchEventArgs {
 

src/main/java/redis/clients/jedis/mcf/JedisFailoverException.java

@@ -29,8 +29,7 @@ public JedisFailoverException() {
    * <p>
    * See the configuration properties
    * {@link redis.clients.jedis.MultiDbConfig#maxNumFailoverAttempts} and
-   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more
-   * details.
+   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more details.
    */
   public static class JedisPermanentlyNotAvailableException extends JedisFailoverException {
     public JedisPermanentlyNotAvailableException(String s) {
@@ -50,8 +49,7 @@ public JedisPermanentlyNotAvailableException() {
    * <p>
    * See the configuration properties
    * {@link redis.clients.jedis.MultiDbConfig#maxNumFailoverAttempts} and
-   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more
-   * details.
+   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more details.
    */
   public static class JedisTemporarilyNotAvailableException extends JedisFailoverException {