ReadMode moved to org.redisson.config

redisson · Jul 26, 2016 · 6461584 · 6461584
1 parent 6f9128a
commit 6461584
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -31,7 +31,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.redisson.ReadMode;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisConnection;
 import org.redisson.client.RedisConnectionException;
@@ -41,6 +40,7 @@
 import org.redisson.config.ClusterServersConfig;
 import org.redisson.config.Config;
 import org.redisson.config.MasterSlaveServersConfig;
+import org.redisson.config.ReadMode;
 import org.redisson.connection.CRC16;
 import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
 import org.redisson.connection.MasterSlaveConnectionManager;

diff --git a/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java b/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java
@@ -15,7 +15,6 @@
  */
 package org.redisson.config;
 
-import org.redisson.ReadMode;
 import org.redisson.connection.balancer.LoadBalancer;
 import org.redisson.connection.balancer.RoundRobinLoadBalancer;
 

diff --git a/src/main/java/org/redisson/config/ClusterServersConfig.java b/src/main/java/org/redisson/config/ClusterServersConfig.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.redisson.ReadMode;
 import org.redisson.misc.URIBuilder;
 
 public class ClusterServersConfig extends BaseMasterSlaveServersConfig<ClusterServersConfig> {
@@ -77,7 +76,7 @@ public ClusterServersConfig setScanInterval(int scanInterval) {
     }
 
     /**
-     * Use {@link #setReadMode(org.redisson.BaseMasterSlaveServersConfig.ReadMode)}
+     * Use {@link #setReadMode(org.redisson.config.BaseMasterSlaveServersConfig.ReadMode)}
      *
      * @param readFromSlaves
      * @return

diff --git a/src/main/java/org/redisson/ReadMode.java → ...in/java/org/redisson/config/ReadMode.java b/src/main/java/org/redisson/ReadMode.java → ...in/java/org/redisson/config/ReadMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.config;
 
 public enum ReadMode {
 

diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -31,7 +31,6 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.redisson.ReadMode;
 import org.redisson.Version;
 import org.redisson.api.NodeType;
 import org.redisson.client.BaseRedisPubSubListener;
@@ -47,6 +46,7 @@
 import org.redisson.config.BaseMasterSlaveServersConfig;
 import org.redisson.config.Config;
 import org.redisson.config.MasterSlaveServersConfig;
+import org.redisson.config.ReadMode;
 import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
 import org.redisson.misc.InfinitySemaphoreLatch;
 import org.slf4j.Logger;

diff --git a/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/src/main/java/org/redisson/connection/MasterSlaveEntry.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.redisson.ReadMode;
 import org.redisson.api.NodeType;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisConnection;
@@ -35,6 +34,7 @@
 import org.redisson.client.protocol.CommandData;
 import org.redisson.cluster.ClusterSlotRange;
 import org.redisson.config.MasterSlaveServersConfig;
+import org.redisson.config.ReadMode;
 import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
 import org.redisson.connection.balancer.LoadBalancerManager;
 import org.redisson.connection.balancer.LoadBalancerManagerImpl;

diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.redisson.ReadMode;
 import org.redisson.client.BaseRedisPubSubListener;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisConnection;
@@ -38,6 +37,7 @@
 import org.redisson.config.BaseMasterSlaveServersConfig;
 import org.redisson.config.Config;
 import org.redisson.config.MasterSlaveServersConfig;
+import org.redisson.config.ReadMode;
 import org.redisson.config.SentinelServersConfig;
 import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
 import org.redisson.misc.URIBuilder;

diff --git a/src/main/java/org/redisson/connection/SingleConnectionManager.java b/src/main/java/org/redisson/connection/SingleConnectionManager.java
@@ -20,10 +20,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.redisson.ReadMode;
 import org.redisson.client.RedisConnectionException;
 import org.redisson.config.Config;
 import org.redisson.config.MasterSlaveServersConfig;
+import org.redisson.config.ReadMode;
 import org.redisson.config.SingleServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;