Rename MultiDatabaseConfig to MultiDbConfig

Author: ggivo

pom.xml

@@ -488,7 +488,7 @@
 						<include>**/Health*.java</include>
 						<include>**/*IT.java</include>
 						<include>**/scenario/RestEndpointUtil.java</include>
-						<include>src/main/java/redis/clients/jedis/MultiDatabaseConfig.java</include>
+						<include>src/main/java/redis/clients/jedis/MultiDbConfig.java</include>
 						<include>src/main/java/redis/clients/jedis/HostAndPort.java</include>
 						<include>**/builders/*.java</include>
 						<include>**/MultiDb*.java</include>

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

@@ -1,6 +1,6 @@
 package redis.clients.jedis;
 
-import redis.clients.jedis.MultiDatabaseConfig.DatabaseConfig;
+import redis.clients.jedis.MultiDbConfig.DatabaseConfig;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.builders.MultiDbClientBuilder;
 import redis.clients.jedis.csc.Cache;
@@ -43,7 +43,7 @@
  *
  * MultiDbClient client = MultiDbClient.builder()
  *                 .multiDbConfig(
- *                         MultiDatabaseConfig.builder()
+ *                         MultiDbConfig.builder()
  *                                 .endpoint(
  *                                         DatabaseConfig.builder(
  *                                                         primary,
@@ -78,7 +78,7 @@
  * @since 5.2.0
  * @see MultiDatabaseConnectionProvider
  * @see CircuitBreakerCommandExecutor
- * @see MultiDatabaseConfig
+ * @see MultiDbConfig
  */
 @Experimental
 public class MultiDbClient extends UnifiedJedis {

src/main/java/redis/clients/jedis/MultiDatabaseConfig.java renamed to src/main/java/redis/clients/jedis/MultiDbConfig.java

@@ -56,7 +56,7 @@
  *       .healthCheckEnabled(true).build();
  *
  *   // Build multi-cluster configuration
- *   MultiDatabaseConfig config = MultiDatabaseConfig.builder(primary, secondary)
+ *   MultiDbConfig config = MultiDbConfig.builder(primary, secondary)
  *       .circuitBreakerFailureRateThreshold(10.0f).retryMaxAttempts(3).failbackSupported(true)
  *       .gracePeriod(10000).build();
  *
@@ -76,7 +76,7 @@
  */
 // TODO: move
 @Experimental
-public final class MultiDatabaseConfig {
+public final class MultiDbConfig {
 
   /**
    * Functional interface for creating {@link HealthCheckStrategy} instances for specific Redis
@@ -437,7 +437,7 @@ public static interface StrategySupplier {
   private int delayInBetweenFailoverAttempts;
 
   /**
-   * Constructs a new MultiDatabaseConfig with the specified cluster configurations.
+   * Constructs a new MultiDbConfig with the specified cluster configurations.
    * <p>
    * This constructor validates that at least one cluster configuration is provided and that all
    * configurations are non-null. Use the {@link Builder} class for more convenient configuration
@@ -448,7 +448,7 @@ public static interface StrategySupplier {
    * @throws IllegalArgumentException if any cluster configuration is null
    * @see Builder#Builder(DatabaseConfig[])
    */
-  public MultiDatabaseConfig(DatabaseConfig[] databaseConfigs) {
+  public MultiDbConfig(DatabaseConfig[] databaseConfigs) {
 
     if (databaseConfigs == null || databaseConfigs.length < 1) throw new JedisValidationException(
         "DatabaseClientConfigs are required for MultiDatabaseConnectionProvider");
@@ -636,7 +636,7 @@ public boolean isFastFailover() {
   }
 
   /**
-   * Creates a new Builder instance for configuring MultiDatabaseConfig.
+   * Creates a new Builder instance for configuring MultiDbConfig.
    * <p>
    * At least one cluster configuration must be added to the builder before calling build(). Use the
    * endpoint() methods to add cluster configurations.
@@ -650,7 +650,7 @@ public static Builder builder() {
   }
 
   /**
-   * Creates a new Builder instance for configuring MultiDatabaseConfig.
+   * Creates a new Builder instance for configuring MultiDbConfig.
    * @param databaseConfigs array of cluster configurations defining available Redis endpoints
    * @return new Builder instance
    * @throws JedisValidationException if databaseConfigs is null or empty
@@ -661,7 +661,7 @@ public static Builder builder(DatabaseConfig[] databaseConfigs) {
   }
 
   /**
-   * Creates a new Builder instance for configuring MultiDatabaseConfig.
+   * Creates a new Builder instance for configuring MultiDbConfig.
    * @param databaseConfigs list of cluster configurations defining available Redis endpoints
    * @return new Builder instance
    * @throws JedisValidationException if databaseConfigs is null or empty
@@ -976,15 +976,15 @@ public DatabaseConfig build() {
   }
 
   /**
-   * Builder class for creating MultiDatabaseConfig instances with comprehensive configuration
+   * 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
    * sensible defaults based on production best practices while allowing fine-tuning for specific
    * requirements.
    * </p>
-   * @see MultiDatabaseConfig
+   * @see MultiDbConfig
    * @see DatabaseConfig
    */
   public static class Builder {
@@ -1499,17 +1499,17 @@ public Builder delayInBetweenFailoverAttempts(int delayInBetweenFailoverAttempts
     }
 
     /**
-     * Builds and returns a new MultiDatabaseConfig instance with all configured settings.
+     * Builds and returns a new MultiDbConfig instance with all configured settings.
      * <p>
      * This method creates the final configuration object by copying all builder settings to the
      * configuration instance. The builder can be reused after calling build() to create additional
      * configurations with different settings.
      * </p>
-     * @return a new MultiDatabaseConfig instance with the configured settings
+     * @return a new MultiDbConfig instance with the configured settings
      */
-    public MultiDatabaseConfig build() {
+    public MultiDbConfig build() {
 
-      MultiDatabaseConfig config = new MultiDatabaseConfig(
+      MultiDbConfig config = new MultiDbConfig(
           this.databaseConfigs.toArray(new DatabaseConfig[0]));
 
       // Copy retry configuration

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

@@ -2,7 +2,7 @@
 
 import java.util.function.Consumer;
 
-import redis.clients.jedis.MultiDatabaseConfig;
+import redis.clients.jedis.MultiDbConfig;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.executors.CommandExecutor;
 import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
@@ -38,7 +38,7 @@
  * <pre>
  * MultiDbClient client = MultiDbClient.builder()
  *                 .multiDbConfig(
- *                         MultiDatabaseConfig.builder()
+ *                         MultiDbConfig.builder()
  *                                 .endpoint(
  *                                         DatabaseConfig.builder(
  *                                                         east,
@@ -67,7 +67,7 @@ public abstract class MultiDbClientBuilder<C>
     extends AbstractClientBuilder<MultiDbClientBuilder<C>, C> {
 
   // Multi-db specific configuration fields
-  private MultiDatabaseConfig multiDbConfig = null;
+  private MultiDbConfig multiDbConfig = null;
   private Consumer<ClusterSwitchEventArgs> databaseSwitchListener = null;
 
   /**
@@ -79,7 +79,7 @@ public abstract class MultiDbClientBuilder<C>
    * @param config the multi-database configuration
    * @return this builder
    */
-  public MultiDbClientBuilder<C> multiDbConfig(MultiDatabaseConfig config) {
+  public MultiDbClientBuilder<C> multiDbConfig(MultiDbConfig config) {
     this.multiDbConfig = config;
     return this;
   }

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

@@ -1,7 +1,7 @@
 package redis.clients.jedis.mcf;
 
 import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig.SlidingWindowType;
-import redis.clients.jedis.MultiDatabaseConfig;
+import redis.clients.jedis.MultiDbConfig;
 
 /**
  * Adapter that disables Resilience4j's built-in circuit breaker evaluation and help delegate
@@ -67,9 +67,9 @@ int getSlidingWindowSize() {
    * method controls circuit breaker state based on the original configuration's dual-threshold
    * logic.
    * </p>
-   * @param multiDatabaseConfig configuration containing sliding window size
+   * @param multiDbConfig configuration containing sliding window size
    */
-  CircuitBreakerThresholdsAdapter(MultiDatabaseConfig multiDatabaseConfig) {
+  CircuitBreakerThresholdsAdapter(MultiDbConfig multiDbConfig) {
 
     // IMPORTANT: failureRateThreshold is set to max theoretically disable Resilience4j's evaluation
     // and rely on our custom evaluateThresholds() logic.
@@ -79,6 +79,6 @@ int getSlidingWindowSize() {
     // and rely on our custom evaluateThresholds() logic.
     minimumNumberOfCalls = Integer.MAX_VALUE;
 
-    slidingWindowSize = multiDatabaseConfig.getCircuitBreakerSlidingWindowSize();
+    slidingWindowSize = multiDbConfig.getCircuitBreakerSlidingWindowSize();
   }
 }

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

@@ -8,7 +8,7 @@
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.JedisPooled;
 import redis.clients.jedis.UnifiedJedis;
-import redis.clients.jedis.MultiDatabaseConfig.StrategySupplier;
+import redis.clients.jedis.MultiDbConfig.StrategySupplier;
 
 public class EchoStrategy implements HealthCheckStrategy {
   private static final int MAX_HEALTH_CHECK_POOL_SIZE = 2;

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

@@ -11,7 +11,7 @@
  * @see JedisFailoverException.JedisTemporarilyNotAvailableException
  */
 public class JedisFailoverException extends JedisConnectionException {
-  private static final String MESSAGE = "Cluster/database endpoint could not failover since the MultiDatabaseConfig was not "
+  private static final String MESSAGE = "Cluster/database endpoint could not failover since the MultiDbConfig was not "
       + "provided with an additional cluster/database endpoint according to its prioritized sequence. "
       + "If applicable, consider falling back OR restarting with an available cluster/database endpoint";
 
@@ -28,8 +28,8 @@ public JedisFailoverException() {
    * the max number of failover attempts has been exceeded. And there is still no healthy cluster.
    * <p>
    * See the configuration properties
-   * {@link redis.clients.jedis.MultiDatabaseConfig#maxNumFailoverAttempts} and
-   * {@link redis.clients.jedis.MultiDatabaseConfig#delayInBetweenFailoverAttempts} for more
+   * {@link redis.clients.jedis.MultiDbConfig#maxNumFailoverAttempts} and
+   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more
    * details.
    */
   public static class JedisPermanentlyNotAvailableException extends JedisFailoverException {
@@ -49,8 +49,8 @@ public JedisPermanentlyNotAvailableException() {
    * temporary condition and it is possible that there will be a healthy cluster available.
    * <p>
    * See the configuration properties
-   * {@link redis.clients.jedis.MultiDatabaseConfig#maxNumFailoverAttempts} and
-   * {@link redis.clients.jedis.MultiDatabaseConfig#delayInBetweenFailoverAttempts} for more
+   * {@link redis.clients.jedis.MultiDbConfig#maxNumFailoverAttempts} and
+   * {@link redis.clients.jedis.MultiDbConfig#delayInBetweenFailoverAttempts} for more
    * details.
    */
   public static class JedisTemporarilyNotAvailableException extends JedisFailoverException {