org.redisson.api package introduced

src/main/java/org/redisson/Config.java

@@ -33,7 +33,7 @@ public class Config {
     private SingleServerConfig singleServerConfig;
 
     private ClusterServersConfig clusterServersConfig;
-    
+
     private ElasticacheServersConfig elasticacheServersConfig;
 
     /**
@@ -51,7 +51,7 @@ public class Config {
     public Config() {
     }
 
-    Config(Config oldConf) {
+    public Config(Config oldConf) {
         setUseLinuxNativeEpoll(oldConf.isUseLinuxNativeEpoll());
 
         if (oldConf.getCodec() == null) {
@@ -76,7 +76,7 @@ public class Config {
         if (oldConf.getElasticacheServersConfig() != null) {
             setElasticacheServersConfig(new ElasticacheServersConfig(oldConf.getElasticacheServersConfig()));
         }
-        
+
     }
 
     /**
@@ -142,7 +142,7 @@ public class Config {
         }
         return singleServerConfig;
     }
-    
+
     SingleServerConfig getSingleServerConfig() {
         return singleServerConfig;
     }
@@ -223,7 +223,7 @@ public class Config {
             throw new IllegalStateException("single server config already used!");
         }
     }
-    
+
     private void checkElasticacheServersConfig() {
         if (elasticacheServersConfig != null) {
             throw new IllegalStateException("elasticache replication group servers config already used!");

src/main/java/org/redisson/Redisson.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.redisson.api.RedissonReactiveClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.cluster.ClusterConnectionManager;

src/main/java/org/redisson/RedissonReactive.java

@@ -20,6 +20,24 @@ import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 
+import org.redisson.api.RAtomicLongReactive;
+import org.redisson.api.RBatchReactive;
+import org.redisson.api.RBitSetReactive;
+import org.redisson.api.RBlockingQueueReactive;
+import org.redisson.api.RBucketReactive;
+import org.redisson.api.RDequeReactive;
+import org.redisson.api.RHyperLogLogReactive;
+import org.redisson.api.RKeysReactive;
+import org.redisson.api.RLexSortedSetReactive;
+import org.redisson.api.RListReactive;
+import org.redisson.api.RMapReactive;
+import org.redisson.api.RPatternTopicReactive;
+import org.redisson.api.RQueueReactive;
+import org.redisson.api.RScoredSortedSetReactive;
+import org.redisson.api.RScriptReactive;
+import org.redisson.api.RSetReactive;
+import org.redisson.api.RTopicReactive;
+import org.redisson.api.RedissonReactiveClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.cluster.ClusterConnectionManager;
@@ -29,23 +47,23 @@ import org.redisson.connection.ElasticacheConnectionManager;
 import org.redisson.connection.MasterSlaveConnectionManager;
 import org.redisson.connection.SentinelConnectionManager;
 import org.redisson.connection.SingleConnectionManager;
-import org.redisson.core.RAtomicLongReactive;
-import org.redisson.core.RBatchReactive;
-import org.redisson.core.RBitSetReactive;
-import org.redisson.core.RBlockingQueueReactive;
-import org.redisson.core.RBucketReactive;
-import org.redisson.core.RDequeReactive;
-import org.redisson.core.RHyperLogLogReactive;
-import org.redisson.core.RKeysReactive;
-import org.redisson.core.RLexSortedSetReactive;
-import org.redisson.core.RListReactive;
-import org.redisson.core.RMapReactive;
-import org.redisson.core.RPatternTopicReactive;
-import org.redisson.core.RQueueReactive;
-import org.redisson.core.RScoredSortedSetReactive;
-import org.redisson.core.RScriptReactive;
-import org.redisson.core.RSetReactive;
-import org.redisson.core.RTopicReactive;
+import org.redisson.reactive.RedissonAtomicLongReactive;
+import org.redisson.reactive.RedissonBatchReactive;
+import org.redisson.reactive.RedissonBitSetReactive;
+import org.redisson.reactive.RedissonBlockingQueueReactive;
+import org.redisson.reactive.RedissonBucketReactive;
+import org.redisson.reactive.RedissonDequeReactive;
+import org.redisson.reactive.RedissonHyperLogLogReactive;
+import org.redisson.reactive.RedissonKeysReactive;
+import org.redisson.reactive.RedissonLexSortedSetReactive;
+import org.redisson.reactive.RedissonListReactive;
+import org.redisson.reactive.RedissonMapReactive;
+import org.redisson.reactive.RedissonPatternTopicReactive;
+import org.redisson.reactive.RedissonQueueReactive;
+import org.redisson.reactive.RedissonScoredSortedSetReactive;
+import org.redisson.reactive.RedissonScriptReactive;
+import org.redisson.reactive.RedissonSetReactive;
+import org.redisson.reactive.RedissonTopicReactive;
 
 import io.netty.util.concurrent.Future;
 

src/main/java/org/redisson/api/RAtomicLongReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import org.reactivestreams.Publisher;
 

src/main/java/org/redisson/api/RBatchReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.List;
 

src/main/java/org/redisson/api/RBitSetReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.BitSet;
 

src/main/java/org/redisson/api/RBlockingQueueReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;

src/main/java/org/redisson/api/RBucketReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.concurrent.TimeUnit;
 

src/main/java/org/redisson/api/RCollectionReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RDequeReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import org.reactivestreams.Publisher;
 

src/main/java/org/redisson/api/RExpirableReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;

src/main/java/org/redisson/api/RHyperLogLogReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RKeysReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RLexSortedSetReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RListReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RMapReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 import java.util.Map;

src/main/java/org/redisson/api/RObjectReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import org.reactivestreams.Publisher;
 

src/main/java/org/redisson/api/RPatternTopicReactive.java

@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.core.PatternMessageListener;
+import org.redisson.core.PatternStatusListener;
 
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.

src/main/java/org/redisson/api/RQueueReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import org.reactivestreams.Publisher;
 

src/main/java/org/redisson/api/RScoredSortedSetReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.Collection;
 

src/main/java/org/redisson/api/RScriptReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.List;
 

src/main/java/org/redisson/api/RSetReactive.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import org.reactivestreams.Publisher;
 

src/main/java/org/redisson/api/RTopicReactive.java

@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.core;
+package org.redisson.api;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.core.MessageListener;
+import org.redisson.core.StatusListener;
 
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.

src/main/java/org/redisson/api/RedissonReactiveClient.java

@@ -13,30 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.api;
 
 import java.util.List;
 
+import org.redisson.Config;
 import org.redisson.client.codec.Codec;
-import org.redisson.core.RAtomicLongReactive;
-import org.redisson.core.RBatchReactive;
-import org.redisson.core.RBitSetReactive;
-import org.redisson.core.RBlockingQueueReactive;
-import org.redisson.core.RBucketReactive;
-import org.redisson.core.RDequeReactive;
-import org.redisson.core.RHyperLogLogReactive;
-import org.redisson.core.RKeysReactive;
-import org.redisson.core.RLexSortedSet;
-import org.redisson.core.RLexSortedSetReactive;
-import org.redisson.core.RListReactive;
-import org.redisson.core.RMap;
-import org.redisson.core.RMapReactive;
-import org.redisson.core.RPatternTopicReactive;
-import org.redisson.core.RQueueReactive;
-import org.redisson.core.RScoredSortedSetReactive;
-import org.redisson.core.RScriptReactive;
-import org.redisson.core.RSetReactive;
-import org.redisson.core.RTopicReactive;
 
 public interface RedissonReactiveClient {
 

src/main/java/org/redisson/command/CommandReactiveService.java

@@ -20,11 +20,11 @@ import java.util.Collection;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
-import org.redisson.NettyFuturePublisher;
 import org.redisson.SlotCallback;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.connection.ConnectionManager;
+import org.redisson.reactive.NettyFuturePublisher;
 
 import io.netty.util.concurrent.Future;
 

src/main/java/org/redisson/reactive/NettyFuturePublisher.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.reactive;
 
 import org.reactivestreams.Subscriber;
 

src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.Collections;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RAtomicLongReactive;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandReactiveExecutor;
-import org.redisson.core.RAtomicLongReactive;
 
 import reactor.rx.Streams;
 
@@ -33,7 +33,7 @@ import reactor.rx.Streams;
  */
 public class RedissonAtomicLongReactive extends RedissonExpirableReactive implements RAtomicLongReactive {
 
-    protected RedissonAtomicLongReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonAtomicLongReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonBatchReactive.java

@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RAtomicLongReactive;
+import org.redisson.api.RBatchReactive;
+import org.redisson.api.RBitSetReactive;
+import org.redisson.api.RBlockingQueueReactive;
+import org.redisson.api.RBucketReactive;
+import org.redisson.api.RDequeReactive;
+import org.redisson.api.RHyperLogLogReactive;
+import org.redisson.api.RLexSortedSetReactive;
+import org.redisson.api.RListReactive;
+import org.redisson.api.RMapReactive;
+import org.redisson.api.RQueueReactive;
+import org.redisson.api.RScoredSortedSetReactive;
+import org.redisson.api.RScriptReactive;
+import org.redisson.api.RSetReactive;
+import org.redisson.api.RTopicReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.command.CommandBatchService;
 import org.redisson.connection.ConnectionManager;
-import org.redisson.core.RAtomicLongReactive;
-import org.redisson.core.RBatchReactive;
-import org.redisson.core.RBitSetReactive;
-import org.redisson.core.RBlockingQueueReactive;
-import org.redisson.core.RBucketReactive;
-import org.redisson.core.RDequeReactive;
-import org.redisson.core.RHyperLogLogReactive;
-import org.redisson.core.RLexSortedSetReactive;
-import org.redisson.core.RListReactive;
-import org.redisson.core.RMapReactive;
-import org.redisson.core.RQueueReactive;
-import org.redisson.core.RScoredSortedSetReactive;
-import org.redisson.core.RScriptReactive;
-import org.redisson.core.RSetReactive;
-import org.redisson.core.RTopicReactive;
 
 public class RedissonBatchReactive implements RBatchReactive {
 

src/main/java/org/redisson/reactive/RedissonBitSetReactive.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.reactive;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,18 +22,18 @@ import java.util.Collections;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RBitSetReactive;
 import org.redisson.client.codec.BitSetCodec;
 import org.redisson.client.codec.ByteArrayCodec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandBatchService;
 import org.redisson.command.CommandReactiveExecutor;
-import org.redisson.core.RBitSetReactive;
 
 import reactor.rx.Streams;
 
 public class RedissonBitSetReactive extends RedissonExpirableReactive implements RBitSetReactive {
 
-    protected RedissonBitSetReactive(CommandReactiveExecutor connectionManager, String name) {
+    public RedissonBitSetReactive(CommandReactiveExecutor connectionManager, String name) {
         super(connectionManager, name);
     }
 

src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.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.reactive;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,12 +24,12 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RBlockingQueueReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.connection.decoder.ListDrainToDecoder;
-import org.redisson.core.RBlockingQueueReactive;
 
 /**
  * Offers blocking queue facilities through an intermediary
@@ -41,11 +41,11 @@ import org.redisson.core.RBlockingQueueReactive;
  */
 public class RedissonBlockingQueueReactive<V> extends RedissonQueueReactive<V> implements RBlockingQueueReactive<V> {
 
-    protected RedissonBlockingQueueReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonBlockingQueueReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 
-    protected RedissonBlockingQueueReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonBlockingQueueReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         super(codec, commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonBucketReactive.java

@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RBucketReactive;
 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> {
 
-    protected RedissonBucketReactive(CommandReactiveExecutor connectionManager, String name) {
+    public RedissonBucketReactive(CommandReactiveExecutor connectionManager, String name) {
         super(connectionManager, name);
     }
 
-    protected RedissonBucketReactive(Codec codec, CommandReactiveExecutor connectionManager, String name) {
+    public RedissonBucketReactive(Codec codec, CommandReactiveExecutor connectionManager, String name) {
         super(codec, connectionManager, name);
     }
 

src/main/java/org/redisson/reactive/RedissonDequeReactive.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RDequeReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommand.ValueType;
@@ -24,7 +25,6 @@ import org.redisson.client.protocol.convertor.TrueReplayConvertor;
 import org.redisson.client.protocol.convertor.VoidReplayConvertor;
 import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.connection.decoder.ListFirstObjectDecoder;
-import org.redisson.core.RDequeReactive;
 
 /**
  * Distributed and concurrent implementation of {@link java.util.Queue}
@@ -40,8 +40,7 @@ public class RedissonDequeReactive<V> extends RedissonQueueReactive<V> implement
     private static final RedisCommand<Void> RPUSH_VOID = new RedisCommand<Void>("RPUSH", new VoidReplayConvertor(), 2, ValueType.OBJECTS);
     private static final RedisCommand<Object> LRANGE_SINGLE = new RedisCommand<Object>("LRANGE", new ListFirstObjectDecoder());
 
-
-    protected RedissonDequeReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonDequeReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonExpirableReactive.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RExpirableReactive;
 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;
 
 
 abstract class RedissonExpirableReactive extends RedissonObjectReactive implements RExpirableReactive {

src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.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.reactive;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,18 +21,18 @@ import java.util.Collection;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RHyperLogLogReactive;
 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> {
 
-    protected RedissonHyperLogLogReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonHyperLogLogReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 
-    protected RedissonHyperLogLogReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonHyperLogLogReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         super(codec, commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonKeysReactive.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.reactive;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -25,12 +25,13 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.redisson.SlotCallback;
+import org.redisson.api.RKeysReactive;
 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.CommandReactiveService;
-import org.redisson.core.RKeysReactive;
 
 import reactor.rx.Stream;
 import reactor.rx.Streams;

src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RLexSortedSetReactive;
 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 {
 

src/main/java/org/redisson/reactive/RedissonListReactive.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.reactive;
 
 import static org.redisson.client.protocol.RedisCommands.EVAL_OBJECT;
 import static org.redisson.client.protocol.RedisCommands.LINDEX;
@@ -31,6 +31,7 @@ import org.reactivestreams.Processor;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.redisson.api.RListReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
@@ -40,7 +41,6 @@ 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;
 import reactor.rx.Stream;
@@ -55,11 +55,11 @@ import reactor.rx.subscription.ReactiveSubscription;
  */
 public class RedissonListReactive<V> extends RedissonExpirableReactive implements RListReactive<V> {
 
-    protected RedissonListReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonListReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 
-    protected RedissonListReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonListReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         super(codec, commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonMapReactive.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.reactive;
 
 import java.math.BigDecimal;
 import java.net.InetSocketAddress;
@@ -27,6 +27,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RMapReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommand;
@@ -38,7 +39,6 @@ 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;
 
 import reactor.fn.BiFunction;
 import reactor.fn.Function;
@@ -62,7 +62,7 @@ public class RedissonMapReactive<K, V> extends RedissonExpirableReactive impleme
     private static final RedisCommand<Long> EVAL_REMOVE_VALUE = new RedisCommand<Long>("EVAL", new LongReplayConvertor(), 4, ValueType.MAP);
     private static final RedisCommand<Object> EVAL_PUT = EVAL_REPLACE;
 
-    protected RedissonMapReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonMapReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.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.reactive;
 
 import java.net.InetSocketAddress;
 import java.util.Map;

src/main/java/org/redisson/reactive/RedissonObjectReactive.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import org.reactivestreams.Processor;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.redisson.api.RObjectReactive;
 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;
 import reactor.rx.Stream;

src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java

@@ -13,19 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.PubSubPatternMessageListener;
+import org.redisson.PubSubPatternStatusListener;
+import org.redisson.api.RPatternTopicReactive;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.connection.PubSubConnectionEntry;
 import org.redisson.core.PatternMessageListener;
 import org.redisson.core.PatternStatusListener;
-import org.redisson.core.RPatternTopicReactive;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
@@ -44,11 +46,11 @@ public class RedissonPatternTopicReactive<M> implements RPatternTopicReactive<M>
     private final String name;
     private final Codec codec;
 
-    protected RedissonPatternTopicReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonPatternTopicReactive(CommandReactiveExecutor commandExecutor, String name) {
         this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
     }
 
-    protected RedissonPatternTopicReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonPatternTopicReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         this.commandExecutor = commandExecutor;
         this.name = name;
         this.codec = codec;

src/main/java/org/redisson/reactive/RedissonQueueReactive.java

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.RQueueReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandReactiveExecutor;
-import org.redisson.core.RQueue;
-import org.redisson.core.RQueueReactive;
 
 /**
  * Distributed and concurrent implementation of {@link java.util.Queue}
@@ -31,11 +30,11 @@ import org.redisson.core.RQueueReactive;
  */
 public class RedissonQueueReactive<V> extends RedissonListReactive<V> implements RQueueReactive<V> {
 
-    protected RedissonQueueReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonQueueReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 
-    protected RedissonQueueReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonQueueReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         super(codec, commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.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.reactive;
 
 import java.math.BigDecimal;
 import java.net.InetSocketAddress;
@@ -24,6 +24,7 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.redisson.api.RScoredSortedSetReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommand;
@@ -32,7 +33,6 @@ 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;
 import reactor.rx.subscription.ReactiveSubscription;

src/main/java/org/redisson/reactive/RedissonScriptReactive.java

@@ -13,25 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.SlotCallback;
+import org.redisson.api.RScriptReactive;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandReactiveExecutor;
 import org.redisson.core.RScript;
-import org.redisson.core.RScriptReactive;
 
 public class RedissonScriptReactive implements RScriptReactive {
 
     private final CommandReactiveExecutor commandExecutor;
 
-    protected RedissonScriptReactive(CommandReactiveExecutor commandExecutor) {
+    public RedissonScriptReactive(CommandReactiveExecutor commandExecutor) {
         this.commandExecutor = commandExecutor;
     }
 

src/main/java/org/redisson/reactive/RedissonSetReactive.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.reactive;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -24,13 +24,13 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.redisson.api.RSetReactive;
 import org.redisson.client.codec.Codec;
 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;
 import reactor.rx.subscription.ReactiveSubscription;
@@ -46,7 +46,7 @@ public class RedissonSetReactive<V> extends RedissonExpirableReactive implements
 
     private static final RedisCommand<Boolean> EVAL_OBJECTS = new RedisCommand<Boolean>("EVAL", new BooleanReplayConvertor(), 4);
 
-    protected RedissonSetReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonSetReactive(CommandReactiveExecutor commandExecutor, String name) {
         super(commandExecutor, name);
     }
 

src/main/java/org/redisson/reactive/RedissonTopicReactive.java

@@ -13,19 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson;
+package org.redisson.reactive;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.PubSubMessageListener;
+import org.redisson.PubSubStatusListener;
+import org.redisson.api.RTopicReactive;
 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;
 import org.redisson.core.StatusListener;
 
 import io.netty.util.concurrent.Future;
@@ -45,11 +47,11 @@ public class RedissonTopicReactive<M> implements RTopicReactive<M> {
     private final String name;
     private final Codec codec;
 
-    protected RedissonTopicReactive(CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonTopicReactive(CommandReactiveExecutor commandExecutor, String name) {
         this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
     }
 
-    protected RedissonTopicReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
+    public RedissonTopicReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
         this.commandExecutor = commandExecutor;
         this.name = name;
         this.codec = codec;

src/test/java/org/redisson/BaseReactiveTest.java

@@ -7,8 +7,9 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.reactivestreams.Publisher;
-import org.redisson.core.RCollectionReactive;
-import org.redisson.core.RScoredSortedSetReactive;
+import org.redisson.api.RCollectionReactive;
+import org.redisson.api.RScoredSortedSetReactive;
+import org.redisson.api.RedissonReactiveClient;
 
 import reactor.rx.Streams;
 

src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java

@@ -2,7 +2,7 @@ package org.redisson;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RAtomicLongReactive;
+import org.redisson.api.RAtomicLongReactive;
 
 public class RedissonAtomicLongReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonBitSetReactiveTest.java

@@ -4,7 +4,7 @@ import java.util.BitSet;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RBitSetReactive;
+import org.redisson.api.RBitSetReactive;
 
 public class RedissonBitSetReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java

@@ -16,7 +16,7 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RBlockingQueueReactive;
+import org.redisson.api.RBlockingQueueReactive;
 
 public class RedissonBlockingQueueReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonBucketReactiveTest.java

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RBucketReactive;
+import org.redisson.api.RBucketReactive;
 
 public class RedissonBucketReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonDequeReactiveTest.java

@@ -1,16 +1,13 @@
 package org.redisson;
 
-import java.util.ArrayDeque;
 import java.util.Arrays;
-import java.util.Deque;
 import java.util.Iterator;
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RDeque;
-import org.redisson.core.RDequeReactive;
+import org.redisson.api.RDequeReactive;
 
 public class RedissonDequeReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java

@@ -2,7 +2,7 @@ package org.redisson;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RHyperLogLogReactive;
+import org.redisson.api.RHyperLogLogReactive;
 
 public class RedissonHyperLogLogReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonKeysReactiveTest.java

@@ -6,8 +6,8 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RBucketReactive;
-import org.redisson.core.RMapReactive;
+import org.redisson.api.RBucketReactive;
+import org.redisson.api.RMapReactive;
 
 public class RedissonKeysReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java

@@ -4,7 +4,7 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RLexSortedSetReactive;
+import org.redisson.api.RLexSortedSetReactive;
 
 public class RedissonLexSortedSetReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonListReactiveTest.java

@@ -9,8 +9,8 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.redisson.api.RListReactive;
 import org.redisson.client.RedisException;
-import org.redisson.core.RListReactive;
 
 import reactor.rx.Promise;
 

src/test/java/org/redisson/RedissonMapReactiveTest.java

@@ -14,7 +14,7 @@ import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import org.redisson.core.RMapReactive;
+import org.redisson.api.RMapReactive;
 
 import reactor.rx.Streams;
 

src/test/java/org/redisson/RedissonQueueReactiveTest.java

@@ -4,7 +4,7 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RQueueReactive;
+import org.redisson.api.RQueueReactive;
 
 public class RedissonQueueReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java

@@ -11,8 +11,8 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.redisson.api.RScoredSortedSetReactive;
 import org.redisson.client.protocol.ScoredEntry;
-import org.redisson.core.RScoredSortedSetReactive;
 
 public class RedissonScoredSortedSetReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonScriptReactiveTest.java

@@ -7,9 +7,9 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.redisson.api.RScriptReactive;
 import org.redisson.client.RedisException;
 import org.redisson.core.RScript;
-import org.redisson.core.RScriptReactive;
 
 public class RedissonScriptReactiveTest extends BaseReactiveTest {
 

src/test/java/org/redisson/RedissonSetReactiveTest.java

@@ -12,7 +12,7 @@ import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.core.RSetReactive;
+import org.redisson.api.RSetReactive;
 
 public class RedissonSetReactiveTest extends BaseReactiveTest {