Rename MultiClusterTransaction to MultiDbTransaction

Author: ggivo

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

@@ -5,7 +5,7 @@
 import redis.clients.jedis.builders.MultiDbClientBuilder;
 import redis.clients.jedis.csc.Cache;
 import redis.clients.jedis.executors.CommandExecutor;
-import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
+import redis.clients.jedis.mcf.MultiDbCommandExecutor;
 import redis.clients.jedis.mcf.MultiDbPipeline;
 import redis.clients.jedis.mcf.MultiDbTransaction;
 import redis.clients.jedis.providers.ConnectionProvider;
@@ -75,9 +75,9 @@
  * resilience features.
  * </p>
  * @author Ivo Gaydazhiev
- * @since 5.2.0
+ * @since 7.0.0
  * @see MultiDbConnectionProvider
- * @see CircuitBreakerCommandExecutor
+ * @see MultiDbCommandExecutor
  * @see MultiDbConfig
  */
 @Experimental
@@ -90,7 +90,7 @@ public class MultiDbClient extends UnifiedJedis {
    * the builder pattern for advanced configurations. For most use cases, prefer using
    * {@link #builder()} to create instances.
    * </p>
-   * @param commandExecutor the command executor (typically CircuitBreakerCommandExecutor)
+   * @param commandExecutor the command executor (typically MultiDbCommandExecutor)
    * @param connectionProvider the connection provider (typically MultiDbConnectionProvider)
    * @param commandObjects the command objects
    * @param redisProtocol the Redis protocol version

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

@@ -32,7 +32,7 @@
 import redis.clients.jedis.params.VSimParams;
 import redis.clients.jedis.resps.RawVector;
 import redis.clients.jedis.json.JsonObjectMapper;
-import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
+import redis.clients.jedis.mcf.MultiDbCommandExecutor;
 import redis.clients.jedis.mcf.MultiDbPipeline;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.mcf.MultiDbTransaction;
@@ -232,18 +232,6 @@ public UnifiedJedis(ConnectionProvider provider, int maxAttempts, Duration maxTo
     this(new RetryableCommandExecutor(provider, maxAttempts, maxTotalRetriesDuration), provider);
   }
 
-  /**
-   * Constructor which supports multiple cluster/database endpoints each with their own isolated connection pool.
-   * <p>
-   * With this Constructor users can seamlessly failover to Disaster Recovery (DR), Backup, and Active-Active cluster(s)
-   * by using simple configuration which is passed through from Resilience4j - https://resilience4j.readme.io/docs
-   * <p>
-   */
-  @Experimental
-  public UnifiedJedis(MultiDbConnectionProvider provider) {
-    this(new CircuitBreakerCommandExecutor(provider), provider);
-  }
-
   /**
    * The constructor to use a custom {@link CommandExecutor}.
    * <p>

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

@@ -5,7 +5,7 @@
 import redis.clients.jedis.MultiDbConfig;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.executors.CommandExecutor;
-import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
+import redis.clients.jedis.mcf.MultiDbCommandExecutor;
 import redis.clients.jedis.mcf.DatabaseSwitchEvent;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.providers.ConnectionProvider;
@@ -60,7 +60,7 @@
  * 
  * @param <C> the client type that this builder creates
  * @author Ivo Gaydazhiev
- * @since 5.2.0
+ * @since 7.0.0
  */
 @Experimental
 public abstract class MultiDbClientBuilder<C>
@@ -125,8 +125,8 @@ protected ConnectionProvider createDefaultConnectionProvider() {
 
   @Override
   protected CommandExecutor createDefaultCommandExecutor() {
-    // For multi-db clients, we always use CircuitBreakerCommandExecutor
-    return new CircuitBreakerCommandExecutor((MultiDbConnectionProvider) this.connectionProvider);
+    // For multi-db clients, we always use MultiDbCommandExecutor
+    return new MultiDbCommandExecutor((MultiDbConnectionProvider) this.connectionProvider);
   }
 
   @Override

src/main/java/redis/clients/jedis/mcf/CircuitBreakerCommandExecutor.java renamed to src/main/java/redis/clients/jedis/mcf/MultiDbCommandExecutor.java

@@ -21,10 +21,9 @@
  *         <p>
  */
 @Experimental
-public class CircuitBreakerCommandExecutor extends CircuitBreakerFailoverBase
-    implements CommandExecutor {
+public class MultiDbCommandExecutor extends CircuitBreakerFailoverBase implements CommandExecutor {
 
-  public CircuitBreakerCommandExecutor(MultiDbConnectionProvider provider) {
+  public MultiDbCommandExecutor(MultiDbConnectionProvider provider) {
     super(provider);
   }
 

src/test/java/redis/clients/jedis/mcf/CircuitBreakerThresholdsTest.java renamed to src/test/java/redis/clients/jedis/mcf/MultiDbCommandExecutorThresholdsTest.java

@@ -33,7 +33,7 @@ public class CircuitBreakerThresholdsTest {
   private MultiDbConnectionProvider realProvider;
   private MultiDbConnectionProvider spyProvider;
   private Database cluster;
-  private CircuitBreakerCommandExecutor executor;
+  private MultiDbCommandExecutor executor;
   private CommandObject<String> dummyCommand;
   private TrackingConnectionPool poolMock;
   private HostAndPort fakeEndpoint = new HostAndPort("fake", 6379);
@@ -61,7 +61,7 @@ public void setup() throws Exception {
 
     cluster = spyProvider.getDatabase();
 
-    executor = new CircuitBreakerCommandExecutor(spyProvider);
+    executor = new MultiDbCommandExecutor(spyProvider);
 
     dummyCommand = new CommandObject<>(new CommandArguments(Protocol.Command.PING),
         BuilderFactory.STRING);
@@ -129,7 +129,7 @@ public void rateBelowThreshold_doesNotFailover() throws Exception {
     MultiDbConnectionProvider rp = new MultiDbConnectionProvider(cfgBuilder.build());
     MultiDbConnectionProvider sp = spy(rp);
     Database c = sp.getDatabase();
-    try (CircuitBreakerCommandExecutor ex = new CircuitBreakerCommandExecutor(sp)) {
+    try (MultiDbCommandExecutor ex = new MultiDbCommandExecutor(sp)) {
       CommandObject<String> cmd = new CommandObject<>(new CommandArguments(Protocol.Command.PING),
           BuilderFactory.STRING);
 
@@ -197,7 +197,7 @@ public void thresholdMatrix(int minFailures, float ratePercent, int successes, i
     MultiDbConnectionProvider real = new MultiDbConnectionProvider(cfgBuilder.build());
     MultiDbConnectionProvider spy = spy(real);
     Database c = spy.getDatabase();
-    try (CircuitBreakerCommandExecutor ex = new CircuitBreakerCommandExecutor(spy)) {
+    try (MultiDbCommandExecutor ex = new MultiDbCommandExecutor(spy)) {
 
       CommandObject<String> cmd = new CommandObject<>(new CommandArguments(Protocol.Command.PING),
           BuilderFactory.STRING);