Skip to content

Commit c1cc657

Browse files
authored
Rename 'activeactive' package to 'mcf' (#3615)
* Rename 'activeactive' package to 'mcf' * Reformat imports in UnifiedJedis
1 parent 0d77298 commit c1cc657

7 files changed

+12
-13
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
1010
import org.json.JSONArray;
1111

12-
import redis.clients.jedis.activeactive.CircuitBreakerCommandExecutor;
13-
import redis.clients.jedis.activeactive.MultiClusterPipeline;
14-
import redis.clients.jedis.activeactive.MultiClusterTransaction;
1512
import redis.clients.jedis.args.*;
1613
import redis.clients.jedis.bloom.*;
1714
import redis.clients.jedis.commands.JedisCommands;
@@ -31,6 +28,9 @@
3128
import redis.clients.jedis.json.Path;
3229
import redis.clients.jedis.json.Path2;
3330
import redis.clients.jedis.json.JsonObjectMapper;
31+
import redis.clients.jedis.mcf.CircuitBreakerCommandExecutor;
32+
import redis.clients.jedis.mcf.MultiClusterPipeline;
33+
import redis.clients.jedis.mcf.MultiClusterTransaction;
3434
import redis.clients.jedis.params.*;
3535
import redis.clients.jedis.providers.*;
3636
import redis.clients.jedis.resps.*;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package redis.clients.jedis.activeactive;
1+
package redis.clients.jedis.mcf;
22

33
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
44
import io.github.resilience4j.decorators.Decorators;

src/main/java/redis/clients/jedis/activeactive/CircuitBreakerFailoverBase.java renamed to src/main/java/redis/clients/jedis/mcf/CircuitBreakerFailoverBase.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package redis.clients.jedis.activeactive;
1+
package redis.clients.jedis.mcf;
22

33
import io.github.resilience4j.circuitbreaker.CallNotPermittedException;
44
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
55

6-
import redis.clients.jedis.exceptions.JedisConnectionException;
7-
import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
8-
import redis.clients.jedis.util.IOUtils;
9-
106
import java.util.Arrays;
117
import java.util.List;
128

9+
import redis.clients.jedis.exceptions.JedisConnectionException;
10+
import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
11+
import redis.clients.jedis.util.IOUtils;
1312

1413
/**
1514
* @author Allen Terleto (aterleto)
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package redis.clients.jedis.activeactive;
1+
package redis.clients.jedis.mcf;
22

33
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
44
import io.github.resilience4j.decorators.Decorators;

src/main/java/redis/clients/jedis/activeactive/MultiClusterPipeline.java renamed to src/main/java/redis/clients/jedis/mcf/MultiClusterPipeline.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package redis.clients.jedis.activeactive;
1+
package redis.clients.jedis.mcf;
22

33
import java.io.Closeable;
44
import java.util.LinkedList;

src/main/java/redis/clients/jedis/activeactive/MultiClusterTransaction.java renamed to src/main/java/redis/clients/jedis/mcf/MultiClusterTransaction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package redis.clients.jedis.activeactive;
1+
package redis.clients.jedis.mcf;
22

33
import static redis.clients.jedis.Protocol.Command.DISCARD;
44
import static redis.clients.jedis.Protocol.Command.EXEC;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**
22
* This package contains the classes that are related to Active-Active cluster(s) and Multi-Cluster failover.
33
*/
4-
package redis.clients.jedis.activeactive;
4+
package redis.clients.jedis.mcf;

0 commit comments

Comments
 (0)