From 64615845e85b5aa1d594cf7493b9fdb580cab2a0 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Tue, 26 Jul 2016 12:38:37 +0300
Subject: [PATCH] ReadMode moved to org.redisson.config

---
 .../java/org/redisson/cluster/ClusterConnectionManager.java    | 2 +-
 .../java/org/redisson/config/BaseMasterSlaveServersConfig.java | 1 -
 src/main/java/org/redisson/config/ClusterServersConfig.java    | 3 +--
 src/main/java/org/redisson/{ => config}/ReadMode.java          | 2 +-
 .../org/redisson/connection/MasterSlaveConnectionManager.java  | 2 +-
 src/main/java/org/redisson/connection/MasterSlaveEntry.java    | 2 +-
 .../org/redisson/connection/SentinelConnectionManager.java     | 2 +-
 .../java/org/redisson/connection/SingleConnectionManager.java  | 2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)
 rename src/main/java/org/redisson/{ => config}/ReadMode.java (96%)

diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index af04cdcac..4a51c349c 100644
--- 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.TimeUnit;
 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.cluster.ClusterNodeInfo.Flag;
 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
index 831dace88..e2fbf28c2 100644
--- 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
index 235f6fffe..ecb0df62b 100644
--- a/src/main/java/org/redisson/config/ClusterServersConfig.java
+++ b/src/main/java/org/redisson/config/ClusterServersConfig.java
@@ -19,7 +19,6 @@ import java.net.URI;
 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 class ClusterServersConfig extends BaseMasterSlaveServersConfig<ClusterSe
     }
 
     /**
-     * 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 b/src/main/java/org/redisson/config/ReadMode.java
similarity index 96%
rename from src/main/java/org/redisson/ReadMode.java
rename to src/main/java/org/redisson/config/ReadMode.java
index a9f108b37..51cfe3421 100644
--- a/src/main/java/org/redisson/ReadMode.java
+++ b/src/main/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
index 949018959..0d39d437d 100644
--- 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.ConcurrentMap;
 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.cluster.ClusterSlotRange;
 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
index a6b5732f3..394d1409e 100644
--- 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.Set;
 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.codec.Codec;
 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
index b1f9f45a3..063908b48 100755
--- 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.Set;
 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.cluster.ClusterSlotRange;
 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
index 99ac46598..00f80b2aa 100644
--- a/src/main/java/org/redisson/connection/SingleConnectionManager.java
+++ b/src/main/java/org/redisson/connection/SingleConnectionManager.java
@@ -20,10 +20,10 @@ import java.net.UnknownHostException;
 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;