[automatic failover] Move failover provider to mcf

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

@@ -22,8 +22,8 @@
  * 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.providers.MultiClusterPooledConnectionProvider} to provide high
- * availability and disaster recovery capabilities.
+ * {@link redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider} to provide high availability
+ * and disaster recovery capabilities.
  * </p>
  * <p>
  * <strong>Key Features:</strong>
@@ -70,7 +70,7 @@
  * 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.providers.MultiClusterPooledConnectionProvider
+ * @see redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider
  * @see redis.clients.jedis.mcf.HealthCheckStrategy
  * @see redis.clients.jedis.mcf.EchoStrategy
  * @see redis.clients.jedis.mcf.LagAwareStrategy

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

@@ -34,6 +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.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.mcf.MultiClusterTransaction;
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.providers.*;

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

@@ -8,8 +8,7 @@
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.executors.CommandExecutor;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider.Cluster;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider.Cluster;
 
 /**
  * @author Allen Terleto (aterleto)

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

@@ -5,8 +5,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider.Cluster;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider.Cluster;
 import redis.clients.jedis.util.IOUtils;
 
 /**

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

@@ -6,8 +6,7 @@
 
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.annots.Experimental;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider.Cluster;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider.Cluster;
 
 /**
  * ConnectionProvider with built-in retry, circuit-breaker, and failover to another cluster/database

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.providers.MultiClusterPooledConnectionProvider.Cluster;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider.Cluster;
 
 public class ClusterSwitchEventArgs {
 

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

@@ -7,7 +7,6 @@
 
 import redis.clients.jedis.*;
 import redis.clients.jedis.annots.Experimental;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.util.KeyValue;
 
 /**

src/main/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProvider.java → src/main/java/redis/clients/jedis/mcf/MultiClusterPooledConnectionProvider.java

@@ -1,4 +1,4 @@
-package redis.clients.jedis.providers;
+package redis.clients.jedis.mcf;
 
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker.State;
@@ -35,18 +35,10 @@
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.exceptions.JedisValidationException;
-import redis.clients.jedis.mcf.HealthStatus;
-import redis.clients.jedis.mcf.HealthStatusChangeEvent;
-import redis.clients.jedis.mcf.HealthStatusManager;
-import redis.clients.jedis.mcf.StatusTracker;
-import redis.clients.jedis.mcf.SwitchReason;
-import redis.clients.jedis.mcf.TrackingConnectionPool;
+import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.MultiClusterClientConfig.StrategySupplier;
 
 import redis.clients.jedis.util.Pool;
-import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
-import redis.clients.jedis.mcf.HealthCheck;
-import redis.clients.jedis.mcf.HealthCheckStrategy;
 
 /**
  * @author Allen Terleto (aterleto)
@@ -450,7 +442,7 @@ void periodicFailbackCheck() {
     }
   }
 
-  public Endpoint iterateActiveCluster(SwitchReason reason) {
+  Endpoint iterateActiveCluster(SwitchReason reason) {
     Map.Entry<Endpoint, Cluster> clusterToIterate = findWeightedHealthyClusterToIterate();
     if (clusterToIterate == null) {
       throw new JedisConnectionException(

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

@@ -14,7 +14,6 @@
 import redis.clients.jedis.*;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.exceptions.JedisDataException;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.util.KeyValue;
 
 /**

src/test/java/redis/clients/jedis/failover/FailoverIntegrationTest.java

@@ -19,8 +19,7 @@
 import redis.clients.jedis.MultiClusterClientConfig;
 import redis.clients.jedis.UnifiedJedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.scenario.RecommendedSettings;
 
 import java.io.IOException;

src/test/java/redis/clients/jedis/mcf/ActiveActiveLocalFailoverTest.java

@@ -19,7 +19,6 @@
 import eu.rekawek.toxiproxy.model.Toxic;
 import redis.clients.jedis.*;
 import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.scenario.ActiveActiveFailoverTest;
 import redis.clients.jedis.scenario.MultiThreadedFakeApp;
 import redis.clients.jedis.scenario.RecommendedSettings;

src/test/java/redis/clients/jedis/mcf/FailbackMechanismIntegrationTest.java

@@ -19,8 +19,6 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.MultiClusterClientConfig;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProviderHelper;
 
 @ExtendWith(MockitoExtension.class)
 class FailbackMechanismIntegrationTest {

src/test/java/redis/clients/jedis/mcf/HealthCheckIntegrationTest.java

@@ -21,7 +21,6 @@
 import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig;
 import redis.clients.jedis.MultiClusterClientConfig.StrategySupplier;
 import redis.clients.jedis.mcf.ProbingPolicy.BuiltIn;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.scenario.RecommendedSettings;
 
 public class HealthCheckIntegrationTest {

src/test/java/redis/clients/jedis/mcf/MultiClusterDynamicEndpointUnitTest.java

@@ -14,7 +14,6 @@
 import redis.clients.jedis.MultiClusterClientConfig;
 import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig;
 import redis.clients.jedis.exceptions.JedisValidationException;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.doNothing;

src/test/java/redis/clients/jedis/mcf/MultiClusterInitializationTest.java

@@ -16,7 +16,6 @@
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.MultiClusterClientConfig;
 import redis.clients.jedis.exceptions.JedisValidationException;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 
 /**
  * Tests for MultiClusterPooledConnectionProvider initialization edge cases

src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderHelper.java → src/test/java/redis/clients/jedis/mcf/MultiClusterPooledConnectionProviderHelper.java

@@ -1,8 +1,6 @@
-package redis.clients.jedis.providers;
+package redis.clients.jedis.mcf;
 
 import redis.clients.jedis.Endpoint;
-import redis.clients.jedis.mcf.HealthStatus;
-import redis.clients.jedis.mcf.HealthStatusChangeEvent;
 
 public class MultiClusterPooledConnectionProviderHelper {
 
@@ -14,4 +12,9 @@ public static void onHealthStatusChange(MultiClusterPooledConnectionProvider pro
   public static void periodicFailbackCheck(MultiClusterPooledConnectionProvider provider) {
     provider.periodicFailbackCheck();
   }
+
+  public static Endpoint iterateActiveCluster(MultiClusterPooledConnectionProvider provider,
+      SwitchReason reason) {
+    return provider.iterateActiveCluster(reason);
+  }
 }

src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java → src/test/java/redis/clients/jedis/mcf/MultiClusterPooledConnectionProviderTest.java

@@ -1,4 +1,4 @@
-package redis.clients.jedis.providers;
+package redis.clients.jedis.mcf;
 
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 
@@ -14,9 +14,10 @@
 import redis.clients.jedis.exceptions.JedisValidationException;
 import redis.clients.jedis.mcf.HealthCheckStrategy;
 import redis.clients.jedis.mcf.HealthStatus;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.mcf.SwitchReason;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider.Cluster;
 import redis.clients.jedis.mcf.ProbingPolicy.BuiltIn;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider.Cluster;
 
 import java.util.Arrays;
 import java.util.Collections;

src/test/java/redis/clients/jedis/mcf/PeriodicFailbackTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static redis.clients.jedis.providers.MultiClusterPooledConnectionProviderHelper.onHealthStatusChange;
+import static redis.clients.jedis.mcf.MultiClusterPooledConnectionProviderHelper.onHealthStatusChange;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -15,8 +15,6 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.MultiClusterClientConfig;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProviderHelper;
 
 @ExtendWith(MockitoExtension.class)
 class PeriodicFailbackTest {

src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java

@@ -18,8 +18,9 @@
 import redis.clients.jedis.exceptions.JedisAccessControlException;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProviderHelper;
 import redis.clients.jedis.mcf.SwitchReason;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.util.IOUtils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -75,7 +76,8 @@ public void pipelineWithSwitch() {
       AbstractPipeline pipe = client.pipelined();
       pipe.set("pstr", "foobar");
       pipe.hset("phash", "foo", "bar");
-      provider.iterateActiveCluster(SwitchReason.HEALTH_CHECK);
+      MultiClusterPooledConnectionProviderHelper.iterateActiveCluster(provider,
+        SwitchReason.HEALTH_CHECK);
       pipe.sync();
     }
 
@@ -94,7 +96,8 @@ public void transactionWithSwitch() {
       AbstractTransaction tx = client.multi();
       tx.set("tstr", "foobar");
       tx.hset("thash", "foo", "bar");
-      provider.iterateActiveCluster(SwitchReason.HEALTH_CHECK);
+      MultiClusterPooledConnectionProviderHelper.iterateActiveCluster(provider,
+        SwitchReason.HEALTH_CHECK);
       assertEquals(Arrays.asList("OK", 1L), tx.exec());
     }
 
@@ -151,8 +154,8 @@ public void commandFailover() {
     MultiClusterClientConfig.Builder builder = new MultiClusterClientConfig.Builder(
         getClusterConfigs(clientConfig, hostPortWithFailure, workingEndpoint.getHostAndPort()))
             .retryMaxAttempts(retryMaxAttempts) // Default
-                                 // is
-                                 // 3
+            // is
+            // 3
             .circuitBreakerSlidingWindowMinCalls(slidingWindowMinCalls)
             .circuitBreakerSlidingWindowSize(slidingWindowSize);
 

src/test/java/redis/clients/jedis/providers/MultiClusterProviderHealthStatusChangeEventTest.java

@@ -16,6 +16,8 @@
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.MultiClusterClientConfig;
 import redis.clients.jedis.mcf.HealthStatus;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProviderHelper;
 
 /**
  * Tests for MultiClusterPooledConnectionProvider event handling behavior during initialization and

src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java

@@ -10,9 +10,9 @@
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.*;
 import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.mcf.ClusterSwitchEventArgs;
+import redis.clients.jedis.mcf.MultiClusterPooledConnectionProvider;
 
 import java.io.IOException;
 import java.time.Duration;