From c59d6278912051587b7997ba34bee5e7f93c3197 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Tue, 1 Dec 2015 11:09:11 +0300
Subject: [PATCH] command package added

---
 src/main/java/org/redisson/Redisson.java                      | 2 ++
 src/main/java/org/redisson/RedissonAtomicLong.java            | 1 +
 src/main/java/org/redisson/RedissonBatch.java                 | 1 +
 src/main/java/org/redisson/RedissonBitSet.java                | 2 ++
 src/main/java/org/redisson/RedissonBlockingQueue.java         | 1 +
 src/main/java/org/redisson/RedissonBucket.java                | 1 +
 src/main/java/org/redisson/RedissonBucketReactive.java        | 1 +
 src/main/java/org/redisson/RedissonCountDownLatch.java        | 1 +
 src/main/java/org/redisson/RedissonDeque.java                 | 1 +
 src/main/java/org/redisson/RedissonExpirable.java             | 1 +
 src/main/java/org/redisson/RedissonExpirableReactive.java     | 1 +
 src/main/java/org/redisson/RedissonHyperLogLog.java           | 1 +
 src/main/java/org/redisson/RedissonHyperLogLogReactive.java   | 1 +
 src/main/java/org/redisson/RedissonKeys.java                  | 1 +
 src/main/java/org/redisson/RedissonLexSortedSet.java          | 1 +
 src/main/java/org/redisson/RedissonLexSortedSetReactive.java  | 1 +
 src/main/java/org/redisson/RedissonList.java                  | 1 +
 src/main/java/org/redisson/RedissonListReactive.java          | 1 +
 src/main/java/org/redisson/RedissonLock.java                  | 1 +
 src/main/java/org/redisson/RedissonMap.java                   | 1 +
 src/main/java/org/redisson/RedissonMapReactive.java           | 1 +
 src/main/java/org/redisson/RedissonObject.java                | 1 +
 src/main/java/org/redisson/RedissonObjectReactive.java        | 1 +
 src/main/java/org/redisson/RedissonPatternTopic.java          | 1 +
 src/main/java/org/redisson/RedissonQueue.java                 | 1 +
 src/main/java/org/redisson/RedissonReactive.java              | 1 +
 src/main/java/org/redisson/RedissonScoredSortedSet.java       | 1 +
 .../java/org/redisson/RedissonScoredSortedSetReactive.java    | 1 +
 src/main/java/org/redisson/RedissonScript.java                | 1 +
 src/main/java/org/redisson/RedissonSet.java                   | 1 +
 src/main/java/org/redisson/RedissonSetReactive.java           | 1 +
 src/main/java/org/redisson/RedissonSortedSet.java             | 1 +
 src/main/java/org/redisson/RedissonTopic.java                 | 1 +
 src/main/java/org/redisson/RedissonTopicReactive.java         | 1 +
 .../java/org/redisson/{ => command}/CommandAsyncExecutor.java | 3 ++-
 .../java/org/redisson/{ => command}/CommandAsyncService.java  | 4 +++-
 .../org/redisson/{ => command}/CommandBatchAsyncService.java  | 2 +-
 src/main/java/org/redisson/{ => command}/CommandExecutor.java | 2 +-
 .../org/redisson/{ => command}/CommandReactiveExecutor.java   | 2 +-
 .../org/redisson/{ => command}/CommandReactiveService.java    | 3 ++-
 .../java/org/redisson/{ => command}/CommandSyncExecutor.java  | 3 ++-
 .../java/org/redisson/{ => command}/CommandSyncService.java   | 3 ++-
 42 files changed, 50 insertions(+), 8 deletions(-)
 rename src/main/java/org/redisson/{ => command}/CommandAsyncExecutor.java (97%)
 rename src/main/java/org/redisson/{ => command}/CommandAsyncService.java (99%)
 rename src/main/java/org/redisson/{ => command}/CommandBatchAsyncService.java (99%)
 rename src/main/java/org/redisson/{ => command}/CommandExecutor.java (96%)
 rename src/main/java/org/redisson/{ => command}/CommandReactiveExecutor.java (98%)
 rename src/main/java/org/redisson/{ => command}/CommandReactiveService.java (97%)
 rename src/main/java/org/redisson/{ => command}/CommandSyncExecutor.java (97%)
 rename src/main/java/org/redisson/{ => command}/CommandSyncService.java (99%)

diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java
index 4fb654c8e..1145a1b1e 100755
--- a/src/main/java/org/redisson/Redisson.java
+++ b/src/main/java/org/redisson/Redisson.java
@@ -25,6 +25,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.cluster.ClusterConnectionManager;
+import org.redisson.command.CommandExecutor;
+import org.redisson.command.CommandSyncService;
 import org.redisson.connection.ConnectionManager;
 import org.redisson.connection.ElasticacheConnectionManager;
 import org.redisson.connection.MasterSlaveConnectionManager;
diff --git a/src/main/java/org/redisson/RedissonAtomicLong.java b/src/main/java/org/redisson/RedissonAtomicLong.java
index d04a2da51..9b135665a 100644
--- a/src/main/java/org/redisson/RedissonAtomicLong.java
+++ b/src/main/java/org/redisson/RedissonAtomicLong.java
@@ -19,6 +19,7 @@ import java.util.Collections;
 
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RAtomicLong;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonBatch.java b/src/main/java/org/redisson/RedissonBatch.java
index 6e294c33b..978fb5b65 100644
--- a/src/main/java/org/redisson/RedissonBatch.java
+++ b/src/main/java/org/redisson/RedissonBatch.java
@@ -18,6 +18,7 @@ package org.redisson;
 import java.util.List;
 
 import org.redisson.client.codec.Codec;
+import org.redisson.command.CommandBatchAsyncService;
 import org.redisson.connection.ConnectionManager;
 import org.redisson.core.RAtomicLongAsync;
 import org.redisson.core.RBatch;
diff --git a/src/main/java/org/redisson/RedissonBitSet.java b/src/main/java/org/redisson/RedissonBitSet.java
index 7e63bc43c..4039e4fd5 100644
--- a/src/main/java/org/redisson/RedissonBitSet.java
+++ b/src/main/java/org/redisson/RedissonBitSet.java
@@ -23,6 +23,8 @@ import java.util.List;
 
 import org.redisson.client.codec.ByteArrayCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
+import org.redisson.command.CommandBatchAsyncService;
 import org.redisson.core.RBitSet;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonBlockingQueue.java b/src/main/java/org/redisson/RedissonBlockingQueue.java
index 1e05520ea..3709ce736 100644
--- a/src/main/java/org/redisson/RedissonBlockingQueue.java
+++ b/src/main/java/org/redisson/RedissonBlockingQueue.java
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.connection.decoder.ListDrainToDecoder;
 import org.redisson.core.RBlockingQueue;
 
diff --git a/src/main/java/org/redisson/RedissonBucket.java b/src/main/java/org/redisson/RedissonBucket.java
index 226dede01..58860f4e0 100644
--- a/src/main/java/org/redisson/RedissonBucket.java
+++ b/src/main/java/org/redisson/RedissonBucket.java
@@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RBucket;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonBucketReactive.java b/src/main/java/org/redisson/RedissonBucketReactive.java
index 55db31375..ed8885f5b 100644
--- a/src/main/java/org/redisson/RedissonBucketReactive.java
+++ b/src/main/java/org/redisson/RedissonBucketReactive.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 import org.reactivestreams.Publisher;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RBucketReactive;
 
 public class RedissonBucketReactive<V> extends RedissonExpirableReactive implements RBucketReactive<V> {
diff --git a/src/main/java/org/redisson/RedissonCountDownLatch.java b/src/main/java/org/redisson/RedissonCountDownLatch.java
index 4c270f4ff..6a6b46b40 100644
--- a/src/main/java/org/redisson/RedissonCountDownLatch.java
+++ b/src/main/java/org/redisson/RedissonCountDownLatch.java
@@ -25,6 +25,7 @@ import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.LongCodec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.pubsub.PubSubType;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RCountDownLatch;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonDeque.java b/src/main/java/org/redisson/RedissonDeque.java
index 3eebfa1d9..75cc4146d 100644
--- a/src/main/java/org/redisson/RedissonDeque.java
+++ b/src/main/java/org/redisson/RedissonDeque.java
@@ -24,6 +24,7 @@ import org.redisson.client.protocol.RedisCommand.ValueType;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.convertor.TrueReplayConvertor;
 import org.redisson.client.protocol.convertor.VoidReplayConvertor;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.connection.decoder.ListFirstObjectDecoder;
 import org.redisson.core.RDeque;
 
diff --git a/src/main/java/org/redisson/RedissonExpirable.java b/src/main/java/org/redisson/RedissonExpirable.java
index 108f07364..40587e574 100644
--- a/src/main/java/org/redisson/RedissonExpirable.java
+++ b/src/main/java/org/redisson/RedissonExpirable.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RExpirable;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonExpirableReactive.java b/src/main/java/org/redisson/RedissonExpirableReactive.java
index ca258ef74..bd1addfbb 100644
--- a/src/main/java/org/redisson/RedissonExpirableReactive.java
+++ b/src/main/java/org/redisson/RedissonExpirableReactive.java
@@ -22,6 +22,7 @@ import org.reactivestreams.Publisher;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RExpirableReactive;
 
 
diff --git a/src/main/java/org/redisson/RedissonHyperLogLog.java b/src/main/java/org/redisson/RedissonHyperLogLog.java
index 35292c795..ea018723a 100644
--- a/src/main/java/org/redisson/RedissonHyperLogLog.java
+++ b/src/main/java/org/redisson/RedissonHyperLogLog.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RHyperLogLog;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonHyperLogLogReactive.java b/src/main/java/org/redisson/RedissonHyperLogLogReactive.java
index 900f81638..ab9a23864 100644
--- a/src/main/java/org/redisson/RedissonHyperLogLogReactive.java
+++ b/src/main/java/org/redisson/RedissonHyperLogLogReactive.java
@@ -23,6 +23,7 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RHyperLogLogReactive;
 
 public class RedissonHyperLogLogReactive<V> extends RedissonExpirableReactive implements RHyperLogLogReactive<V> {
diff --git a/src/main/java/org/redisson/RedissonKeys.java b/src/main/java/org/redisson/RedissonKeys.java
index 0e0b5552a..d8a1c3114 100644
--- a/src/main/java/org/redisson/RedissonKeys.java
+++ b/src/main/java/org/redisson/RedissonKeys.java
@@ -27,6 +27,7 @@ import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.decoder.ListScanResult;
 import org.redisson.cluster.ClusterSlotRange;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RKeys;
 import org.redisson.misc.CompositeIterable;
 
diff --git a/src/main/java/org/redisson/RedissonLexSortedSet.java b/src/main/java/org/redisson/RedissonLexSortedSet.java
index b5bdf84a9..d8ef25fd9 100644
--- a/src/main/java/org/redisson/RedissonLexSortedSet.java
+++ b/src/main/java/org/redisson/RedissonLexSortedSet.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RLexSortedSet;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonLexSortedSetReactive.java b/src/main/java/org/redisson/RedissonLexSortedSetReactive.java
index 05368ba78..bbdb626a6 100644
--- a/src/main/java/org/redisson/RedissonLexSortedSetReactive.java
+++ b/src/main/java/org/redisson/RedissonLexSortedSetReactive.java
@@ -22,6 +22,7 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RLexSortedSetReactive;
 
 public class RedissonLexSortedSetReactive extends RedissonScoredSortedSetReactive<String> implements RLexSortedSetReactive {
diff --git a/src/main/java/org/redisson/RedissonList.java b/src/main/java/org/redisson/RedissonList.java
index ea2e5fd62..c02dd35e5 100644
--- a/src/main/java/org/redisson/RedissonList.java
+++ b/src/main/java/org/redisson/RedissonList.java
@@ -32,6 +32,7 @@ import org.redisson.client.protocol.convertor.BooleanNumberReplayConvertor;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.convertor.Convertor;
 import org.redisson.client.protocol.convertor.IntegerReplayConvertor;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RList;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonListReactive.java b/src/main/java/org/redisson/RedissonListReactive.java
index c58b09078..5a51f6584 100644
--- a/src/main/java/org/redisson/RedissonListReactive.java
+++ b/src/main/java/org/redisson/RedissonListReactive.java
@@ -39,6 +39,7 @@ import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.convertor.Convertor;
 import org.redisson.client.protocol.convertor.IntegerReplayConvertor;
 import org.redisson.client.protocol.convertor.LongReplayConvertor;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RListReactive;
 
 import reactor.core.reactivestreams.SubscriberBarrier;
diff --git a/src/main/java/org/redisson/RedissonLock.java b/src/main/java/org/redisson/RedissonLock.java
index 645c51cfb..e9367cdf2 100644
--- a/src/main/java/org/redisson/RedissonLock.java
+++ b/src/main/java/org/redisson/RedissonLock.java
@@ -27,6 +27,7 @@ import org.redisson.client.codec.LongCodec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.pubsub.PubSubType;
 import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.command.CommandExecutor;
 import org.redisson.connection.PubSubConnectionEntry;
 import org.redisson.core.RLock;
 
diff --git a/src/main/java/org/redisson/RedissonMap.java b/src/main/java/org/redisson/RedissonMap.java
index 970ed05ea..b688e0df2 100644
--- a/src/main/java/org/redisson/RedissonMap.java
+++ b/src/main/java/org/redisson/RedissonMap.java
@@ -36,6 +36,7 @@ import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.convertor.LongReplayConvertor;
 import org.redisson.client.protocol.convertor.NumberConvertor;
 import org.redisson.client.protocol.decoder.MapScanResult;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.Predicate;
 import org.redisson.core.RMap;
 
diff --git a/src/main/java/org/redisson/RedissonMapReactive.java b/src/main/java/org/redisson/RedissonMapReactive.java
index 16fdc73d1..ad35a0a35 100644
--- a/src/main/java/org/redisson/RedissonMapReactive.java
+++ b/src/main/java/org/redisson/RedissonMapReactive.java
@@ -36,6 +36,7 @@ import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.convertor.LongReplayConvertor;
 import org.redisson.client.protocol.convertor.NumberConvertor;
 import org.redisson.client.protocol.decoder.MapScanResult;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.connection.decoder.MapGetAllDecoder;
 import org.redisson.core.RMapReactive;
 
diff --git a/src/main/java/org/redisson/RedissonObject.java b/src/main/java/org/redisson/RedissonObject.java
index 3ba95200c..39d68da09 100644
--- a/src/main/java/org/redisson/RedissonObject.java
+++ b/src/main/java/org/redisson/RedissonObject.java
@@ -17,6 +17,7 @@ package org.redisson;
 
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RObject;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonObjectReactive.java b/src/main/java/org/redisson/RedissonObjectReactive.java
index b50053401..7100525a1 100644
--- a/src/main/java/org/redisson/RedissonObjectReactive.java
+++ b/src/main/java/org/redisson/RedissonObjectReactive.java
@@ -21,6 +21,7 @@ import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RObjectReactive;
 
 import reactor.core.reactivestreams.SubscriberBarrier;
diff --git a/src/main/java/org/redisson/RedissonPatternTopic.java b/src/main/java/org/redisson/RedissonPatternTopic.java
index 90d9ae2f2..dbdada5f3 100644
--- a/src/main/java/org/redisson/RedissonPatternTopic.java
+++ b/src/main/java/org/redisson/RedissonPatternTopic.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
+import org.redisson.command.CommandExecutor;
 import org.redisson.connection.PubSubConnectionEntry;
 import org.redisson.core.PatternMessageListener;
 import org.redisson.core.PatternStatusListener;
diff --git a/src/main/java/org/redisson/RedissonQueue.java b/src/main/java/org/redisson/RedissonQueue.java
index 36c44dbc1..ea1f62110 100644
--- a/src/main/java/org/redisson/RedissonQueue.java
+++ b/src/main/java/org/redisson/RedissonQueue.java
@@ -19,6 +19,7 @@ import java.util.NoSuchElementException;
 
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RQueue;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonReactive.java b/src/main/java/org/redisson/RedissonReactive.java
index 06f98288a..f52226a5d 100644
--- a/src/main/java/org/redisson/RedissonReactive.java
+++ b/src/main/java/org/redisson/RedissonReactive.java
@@ -23,6 +23,7 @@ import java.util.UUID;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.cluster.ClusterConnectionManager;
+import org.redisson.command.CommandReactiveService;
 import org.redisson.connection.ConnectionManager;
 import org.redisson.connection.ElasticacheConnectionManager;
 import org.redisson.connection.MasterSlaveConnectionManager;
diff --git a/src/main/java/org/redisson/RedissonScoredSortedSet.java b/src/main/java/org/redisson/RedissonScoredSortedSet.java
index a128b5413..1ada54531 100644
--- a/src/main/java/org/redisson/RedissonScoredSortedSet.java
+++ b/src/main/java/org/redisson/RedissonScoredSortedSet.java
@@ -30,6 +30,7 @@ import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.ScoredEntry;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.decoder.ListScanResult;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RScoredSortedSet;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java b/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java
index 6cd50c388..9472f308c 100644
--- a/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java
+++ b/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java
@@ -31,6 +31,7 @@ import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.ScoredEntry;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.decoder.ListScanResult;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RScoredSortedSetReactive;
 
 import reactor.rx.Stream;
diff --git a/src/main/java/org/redisson/RedissonScript.java b/src/main/java/org/redisson/RedissonScript.java
index 67132e09e..4c13c187c 100644
--- a/src/main/java/org/redisson/RedissonScript.java
+++ b/src/main/java/org/redisson/RedissonScript.java
@@ -22,6 +22,7 @@ import java.util.List;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RScript;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonSet.java b/src/main/java/org/redisson/RedissonSet.java
index 99db12786..cb74c56a2 100644
--- a/src/main/java/org/redisson/RedissonSet.java
+++ b/src/main/java/org/redisson/RedissonSet.java
@@ -28,6 +28,7 @@ import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.decoder.ListScanResult;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.core.RSet;
 
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/org/redisson/RedissonSetReactive.java b/src/main/java/org/redisson/RedissonSetReactive.java
index cec084ec2..31b56bdd6 100644
--- a/src/main/java/org/redisson/RedissonSetReactive.java
+++ b/src/main/java/org/redisson/RedissonSetReactive.java
@@ -29,6 +29,7 @@ import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.client.protocol.decoder.ListScanResult;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RSetReactive;
 
 import reactor.rx.Stream;
diff --git a/src/main/java/org/redisson/RedissonSortedSet.java b/src/main/java/org/redisson/RedissonSortedSet.java
index 979abc8da..53a8e04ea 100644
--- a/src/main/java/org/redisson/RedissonSortedSet.java
+++ b/src/main/java/org/redisson/RedissonSortedSet.java
@@ -36,6 +36,7 @@ import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.LongCodec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandExecutor;
 import org.redisson.connection.ConnectionManager;
 import org.redisson.core.RSortedSet;
 
diff --git a/src/main/java/org/redisson/RedissonTopic.java b/src/main/java/org/redisson/RedissonTopic.java
index 721db406c..28f7a1ba9 100644
--- a/src/main/java/org/redisson/RedissonTopic.java
+++ b/src/main/java/org/redisson/RedissonTopic.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.connection.PubSubConnectionEntry;
 import org.redisson.core.MessageListener;
 import org.redisson.core.RTopic;
diff --git a/src/main/java/org/redisson/RedissonTopicReactive.java b/src/main/java/org/redisson/RedissonTopicReactive.java
index 01199a9c0..00334eae6 100644
--- a/src/main/java/org/redisson/RedissonTopicReactive.java
+++ b/src/main/java/org/redisson/RedissonTopicReactive.java
@@ -22,6 +22,7 @@ import org.reactivestreams.Publisher;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.connection.PubSubConnectionEntry;
 import org.redisson.core.MessageListener;
 import org.redisson.core.RTopicReactive;
diff --git a/src/main/java/org/redisson/CommandAsyncExecutor.java b/src/main/java/org/redisson/command/CommandAsyncExecutor.java
similarity index 97%
rename from src/main/java/org/redisson/CommandAsyncExecutor.java
rename to src/main/java/org/redisson/command/CommandAsyncExecutor.java
index 815e47ad2..2a34971cf 100644
--- a/src/main/java/org/redisson/CommandAsyncExecutor.java
+++ b/src/main/java/org/redisson/command/CommandAsyncExecutor.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.command;
 
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.List;
 
+import org.redisson.SlotCallback;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.connection.ConnectionManager;
diff --git a/src/main/java/org/redisson/CommandAsyncService.java b/src/main/java/org/redisson/command/CommandAsyncService.java
similarity index 99%
rename from src/main/java/org/redisson/CommandAsyncService.java
rename to src/main/java/org/redisson/command/CommandAsyncService.java
index f249463e3..df9f815a4 100644
--- a/src/main/java/org/redisson/CommandAsyncService.java
+++ b/src/main/java/org/redisson/command/CommandAsyncService.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.command;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -27,6 +27,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.redisson.RedisClientResult;
+import org.redisson.SlotCallback;
 import org.redisson.client.RedisAskException;
 import org.redisson.client.RedisConnection;
 import org.redisson.client.RedisException;
diff --git a/src/main/java/org/redisson/CommandBatchAsyncService.java b/src/main/java/org/redisson/command/CommandBatchAsyncService.java
similarity index 99%
rename from src/main/java/org/redisson/CommandBatchAsyncService.java
rename to src/main/java/org/redisson/command/CommandBatchAsyncService.java
index b16fee11b..376fa018f 100644
--- a/src/main/java/org/redisson/CommandBatchAsyncService.java
+++ b/src/main/java/org/redisson/command/CommandBatchAsyncService.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.command;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/redisson/CommandExecutor.java b/src/main/java/org/redisson/command/CommandExecutor.java
similarity index 96%
rename from src/main/java/org/redisson/CommandExecutor.java
rename to src/main/java/org/redisson/command/CommandExecutor.java
index 1a9d1002a..4b47f0ced 100644
--- a/src/main/java/org/redisson/CommandExecutor.java
+++ b/src/main/java/org/redisson/command/CommandExecutor.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.command;
 
 /**
  *
diff --git a/src/main/java/org/redisson/CommandReactiveExecutor.java b/src/main/java/org/redisson/command/CommandReactiveExecutor.java
similarity index 98%
rename from src/main/java/org/redisson/CommandReactiveExecutor.java
rename to src/main/java/org/redisson/command/CommandReactiveExecutor.java
index 5e7562511..f2a5b43df 100644
--- a/src/main/java/org/redisson/CommandReactiveExecutor.java
+++ b/src/main/java/org/redisson/command/CommandReactiveExecutor.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.command;
 
 import java.net.InetSocketAddress;
 import java.util.List;
diff --git a/src/main/java/org/redisson/CommandReactiveService.java b/src/main/java/org/redisson/command/CommandReactiveService.java
similarity index 97%
rename from src/main/java/org/redisson/CommandReactiveService.java
rename to src/main/java/org/redisson/command/CommandReactiveService.java
index a93d60c3f..91017b4be 100644
--- a/src/main/java/org/redisson/CommandReactiveService.java
+++ b/src/main/java/org/redisson/command/CommandReactiveService.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.command;
 
 import java.net.InetSocketAddress;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.NettyFuturePublisher;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.connection.ConnectionManager;
diff --git a/src/main/java/org/redisson/CommandSyncExecutor.java b/src/main/java/org/redisson/command/CommandSyncExecutor.java
similarity index 97%
rename from src/main/java/org/redisson/CommandSyncExecutor.java
rename to src/main/java/org/redisson/command/CommandSyncExecutor.java
index bb3b1e504..a022cd4c8 100644
--- a/src/main/java/org/redisson/CommandSyncExecutor.java
+++ b/src/main/java/org/redisson/command/CommandSyncExecutor.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.command;
 
 import java.net.InetSocketAddress;
 import java.util.List;
 
+import org.redisson.SyncOperation;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.connection.ConnectionManager;
diff --git a/src/main/java/org/redisson/CommandSyncService.java b/src/main/java/org/redisson/command/CommandSyncService.java
similarity index 99%
rename from src/main/java/org/redisson/CommandSyncService.java
rename to src/main/java/org/redisson/command/CommandSyncService.java
index 80d0d6821..738ac94ae 100644
--- a/src/main/java/org/redisson/CommandSyncService.java
+++ b/src/main/java/org/redisson/command/CommandSyncService.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.command;
 
 import java.net.InetSocketAddress;
 import java.util.List;
 
+import org.redisson.SyncOperation;
 import org.redisson.client.RedisAskException;
 import org.redisson.client.RedisConnection;
 import org.redisson.client.RedisException;