From 35bb6843846a49d110695ae92d2221193fb2a98a Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 9 Jul 2015 22:18:31 +0300
Subject: [PATCH] pubsub handling moved to separate package

---
 src/main/java/org/redisson/client/RedisClient.java |  2 +-
 .../org/redisson/client/RedisPubSubConnection.java | 14 +++++++-------
 .../org/redisson/client/handler/RedisData.java     |  2 +-
 .../org/redisson/client/handler/RedisDecoder.java  |  6 +++---
 .../org/redisson/client/protocol/RedisCommand.java |  2 ++
 .../redisson/client/protocol/RedisCommands.java    |  3 +++
 .../client/protocol/RedisStrictCommand.java        |  2 ++
 .../client/protocol/{ => pubsub}/MultiDecoder.java |  4 +++-
 .../protocol/{ => pubsub}/PubSubMessage.java       |  2 +-
 .../{ => pubsub}/PubSubMessageDecoder.java         |  2 +-
 .../{ => pubsub}/PubSubPatternMessage.java         |  2 +-
 .../{ => pubsub}/PubSubPatternMessageDecoder.java  |  2 +-
 .../protocol/{ => pubsub}/PubSubStatusDecoder.java |  2 +-
 .../protocol/{ => pubsub}/PubSubStatusMessage.java |  2 +-
 14 files changed, 28 insertions(+), 19 deletions(-)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/MultiDecoder.java (57%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubMessage.java (91%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubMessageDecoder.java (91%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubPatternMessage.java (93%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubPatternMessageDecoder.java (92%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubStatusDecoder.java (96%)
 rename src/main/java/org/redisson/client/protocol/{ => pubsub}/PubSubStatusMessage.java (93%)

diff --git a/src/main/java/org/redisson/client/RedisClient.java b/src/main/java/org/redisson/client/RedisClient.java
index c14ac912b..637712197 100644
--- a/src/main/java/org/redisson/client/RedisClient.java
+++ b/src/main/java/org/redisson/client/RedisClient.java
@@ -21,9 +21,9 @@ import java.util.concurrent.ExecutionException;
 import org.redisson.client.handler.RedisCommandsQueue;
 import org.redisson.client.handler.RedisDecoder;
 import org.redisson.client.handler.RedisEncoder;
-import org.redisson.client.protocol.PubSubStatusMessage;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.StringCodec;
+import org.redisson.client.protocol.pubsub.PubSubStatusMessage;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
diff --git a/src/main/java/org/redisson/client/RedisPubSubConnection.java b/src/main/java/org/redisson/client/RedisPubSubConnection.java
index fafc72c0a..4a11d6886 100644
--- a/src/main/java/org/redisson/client/RedisPubSubConnection.java
+++ b/src/main/java/org/redisson/client/RedisPubSubConnection.java
@@ -5,16 +5,16 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import org.redisson.client.handler.RedisData;
 import org.redisson.client.protocol.Codec;
 import org.redisson.client.protocol.Decoder;
-import org.redisson.client.protocol.MultiDecoder;
-import org.redisson.client.protocol.PubSubStatusMessage;
-import org.redisson.client.protocol.PubSubStatusDecoder;
-import org.redisson.client.protocol.PubSubMessage;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.StringCodec;
-import org.redisson.client.protocol.PubSubMessageDecoder;
-import org.redisson.client.protocol.PubSubPatternMessage;
-import org.redisson.client.protocol.PubSubPatternMessageDecoder;
+import org.redisson.client.protocol.pubsub.MultiDecoder;
+import org.redisson.client.protocol.pubsub.PubSubMessage;
+import org.redisson.client.protocol.pubsub.PubSubMessageDecoder;
+import org.redisson.client.protocol.pubsub.PubSubPatternMessage;
+import org.redisson.client.protocol.pubsub.PubSubPatternMessageDecoder;
+import org.redisson.client.protocol.pubsub.PubSubStatusDecoder;
+import org.redisson.client.protocol.pubsub.PubSubStatusMessage;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
diff --git a/src/main/java/org/redisson/client/handler/RedisData.java b/src/main/java/org/redisson/client/handler/RedisData.java
index 61bca58f3..ab38cca80 100644
--- a/src/main/java/org/redisson/client/handler/RedisData.java
+++ b/src/main/java/org/redisson/client/handler/RedisData.java
@@ -19,8 +19,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.redisson.client.protocol.Codec;
 import org.redisson.client.protocol.Decoder;
-import org.redisson.client.protocol.MultiDecoder;
 import org.redisson.client.protocol.RedisCommand;
+import org.redisson.client.protocol.pubsub.MultiDecoder;
 
 import io.netty.util.concurrent.Promise;
 
diff --git a/src/main/java/org/redisson/client/handler/RedisDecoder.java b/src/main/java/org/redisson/client/handler/RedisDecoder.java
index 42d52054d..8d9627e58 100644
--- a/src/main/java/org/redisson/client/handler/RedisDecoder.java
+++ b/src/main/java/org/redisson/client/handler/RedisDecoder.java
@@ -24,9 +24,9 @@ import org.redisson.client.RedisException;
 import org.redisson.client.RedisPubSubConnection;
 import org.redisson.client.handler.RedisCommandsQueue.QueueCommands;
 import org.redisson.client.protocol.Decoder;
-import org.redisson.client.protocol.MultiDecoder;
-import org.redisson.client.protocol.PubSubMessage;
-import org.redisson.client.protocol.PubSubPatternMessage;
+import org.redisson.client.protocol.pubsub.MultiDecoder;
+import org.redisson.client.protocol.pubsub.PubSubMessage;
+import org.redisson.client.protocol.pubsub.PubSubPatternMessage;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommand.java b/src/main/java/org/redisson/client/protocol/RedisCommand.java
index 0943fd285..2fe26acc3 100644
--- a/src/main/java/org/redisson/client/protocol/RedisCommand.java
+++ b/src/main/java/org/redisson/client/protocol/RedisCommand.java
@@ -15,6 +15,8 @@
  */
 package org.redisson.client.protocol;
 
+import org.redisson.client.protocol.pubsub.MultiDecoder;
+
 public class RedisCommand<R> {
 
     private final String name;
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommands.java b/src/main/java/org/redisson/client/protocol/RedisCommands.java
index ee581021f..0e0fcba79 100644
--- a/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -15,6 +15,9 @@
  */
 package org.redisson.client.protocol;
 
+import org.redisson.client.protocol.pubsub.PubSubStatusDecoder;
+import org.redisson.client.protocol.pubsub.PubSubStatusMessage;
+
 public interface RedisCommands {
 
     RedisStrictCommand<String> AUTH = new RedisStrictCommand<String>("AUTH", new StringReplayDecoder());
diff --git a/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java b/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
index b71796ee3..3fa2ae567 100644
--- a/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
+++ b/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
@@ -1,5 +1,7 @@
 package org.redisson.client.protocol;
 
+import org.redisson.client.protocol.pubsub.MultiDecoder;
+
 public class RedisStrictCommand<T> extends RedisCommand<T> {
 
     public RedisStrictCommand(String name, MultiDecoder<T> replayMultiDecoder, int... encodeParamIndexes) {
diff --git a/src/main/java/org/redisson/client/protocol/MultiDecoder.java b/src/main/java/org/redisson/client/protocol/pubsub/MultiDecoder.java
similarity index 57%
rename from src/main/java/org/redisson/client/protocol/MultiDecoder.java
rename to src/main/java/org/redisson/client/protocol/pubsub/MultiDecoder.java
index 4dee5f005..1ad5cd376 100644
--- a/src/main/java/org/redisson/client/protocol/MultiDecoder.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/MultiDecoder.java
@@ -1,7 +1,9 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 import java.util.List;
 
+import org.redisson.client.protocol.Decoder;
+
 public interface MultiDecoder<T> extends Decoder<Object> {
 
     T decode(List<Object> parts);
diff --git a/src/main/java/org/redisson/client/protocol/PubSubMessage.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
similarity index 91%
rename from src/main/java/org/redisson/client/protocol/PubSubMessage.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
index 7c49e7d52..9a72684ec 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubMessage.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
@@ -1,4 +1,4 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 public class PubSubMessage {
 
diff --git a/src/main/java/org/redisson/client/protocol/PubSubMessageDecoder.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
similarity index 91%
rename from src/main/java/org/redisson/client/protocol/PubSubMessageDecoder.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
index 9898407fd..6fe67a9e6 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubMessageDecoder.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
@@ -1,4 +1,4 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 import java.util.List;
 
diff --git a/src/main/java/org/redisson/client/protocol/PubSubPatternMessage.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
similarity index 93%
rename from src/main/java/org/redisson/client/protocol/PubSubPatternMessage.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
index 0d94c6f42..468f30bca 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubPatternMessage.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
@@ -1,4 +1,4 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 public class PubSubPatternMessage {
 
diff --git a/src/main/java/org/redisson/client/protocol/PubSubPatternMessageDecoder.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
similarity index 92%
rename from src/main/java/org/redisson/client/protocol/PubSubPatternMessageDecoder.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
index 1aa2a6c2a..4bc5fb865 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubPatternMessageDecoder.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
@@ -1,4 +1,4 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 import java.util.List;
 
diff --git a/src/main/java/org/redisson/client/protocol/PubSubStatusDecoder.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
similarity index 96%
rename from src/main/java/org/redisson/client/protocol/PubSubStatusDecoder.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
index f1838bea4..f5a8df92b 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubStatusDecoder.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/redisson/client/protocol/PubSubStatusMessage.java b/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
similarity index 93%
rename from src/main/java/org/redisson/client/protocol/PubSubStatusMessage.java
rename to src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
index 39219e359..dc205e01e 100644
--- a/src/main/java/org/redisson/client/protocol/PubSubStatusMessage.java
+++ b/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
@@ -1,4 +1,4 @@
-package org.redisson.client.protocol;
+package org.redisson.client.protocol.pubsub;
 
 import java.util.List;