diff --git a/src/main/java/org/redisson/Config.java b/src/main/java/org/redisson/Config.java index db4e88848..9b4685c1a 100644 --- a/src/main/java/org/redisson/Config.java +++ b/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!"); diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java index 1145a1b1e..a1093b0d6 100755 --- a/src/main/java/org/redisson/Redisson.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonReactive.java b/src/main/java/org/redisson/RedissonReactive.java index 8a12c4127..d515abb69 100644 --- a/src/main/java/org/redisson/RedissonReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RAtomicLongReactive.java b/src/main/java/org/redisson/api/RAtomicLongReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RAtomicLongReactive.java rename to src/main/java/org/redisson/api/RAtomicLongReactive.java index 4e290adcf..12580d068 100644 --- a/src/main/java/org/redisson/core/RAtomicLongReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RBatchReactive.java b/src/main/java/org/redisson/api/RBatchReactive.java similarity index 99% rename from src/main/java/org/redisson/core/RBatchReactive.java rename to src/main/java/org/redisson/api/RBatchReactive.java index feafe0f4e..5e1578494 100644 --- a/src/main/java/org/redisson/core/RBatchReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RBitSetReactive.java b/src/main/java/org/redisson/api/RBitSetReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RBitSetReactive.java rename to src/main/java/org/redisson/api/RBitSetReactive.java index bae5cc7ac..461aab11f 100644 --- a/src/main/java/org/redisson/core/RBitSetReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RBlockingQueueReactive.java b/src/main/java/org/redisson/api/RBlockingQueueReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RBlockingQueueReactive.java rename to src/main/java/org/redisson/api/RBlockingQueueReactive.java index 4d00e25ae..2d3f06f0e 100644 --- a/src/main/java/org/redisson/core/RBlockingQueueReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RBucketReactive.java b/src/main/java/org/redisson/api/RBucketReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RBucketReactive.java rename to src/main/java/org/redisson/api/RBucketReactive.java index fccbd4e18..7e114e11e 100644 --- a/src/main/java/org/redisson/core/RBucketReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RCollectionReactive.java b/src/main/java/org/redisson/api/RCollectionReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RCollectionReactive.java rename to src/main/java/org/redisson/api/RCollectionReactive.java index 291bbddf2..a17a41d5e 100644 --- a/src/main/java/org/redisson/core/RCollectionReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RDequeReactive.java b/src/main/java/org/redisson/api/RDequeReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RDequeReactive.java rename to src/main/java/org/redisson/api/RDequeReactive.java index de3af78cc..fc16fa89c 100644 --- a/src/main/java/org/redisson/core/RDequeReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RExpirableReactive.java b/src/main/java/org/redisson/api/RExpirableReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RExpirableReactive.java rename to src/main/java/org/redisson/api/RExpirableReactive.java index 7a28f9ace..fd71ee590 100644 --- a/src/main/java/org/redisson/core/RExpirableReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RHyperLogLogReactive.java b/src/main/java/org/redisson/api/RHyperLogLogReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RHyperLogLogReactive.java rename to src/main/java/org/redisson/api/RHyperLogLogReactive.java index 12de71c75..9f0fe3efc 100644 --- a/src/main/java/org/redisson/core/RHyperLogLogReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RKeysReactive.java b/src/main/java/org/redisson/api/RKeysReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RKeysReactive.java rename to src/main/java/org/redisson/api/RKeysReactive.java index f0a36158a..07d4d2d7a 100644 --- a/src/main/java/org/redisson/core/RKeysReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RLexSortedSetReactive.java b/src/main/java/org/redisson/api/RLexSortedSetReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RLexSortedSetReactive.java rename to src/main/java/org/redisson/api/RLexSortedSetReactive.java index 5f876156f..c738a0b15 100644 --- a/src/main/java/org/redisson/core/RLexSortedSetReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RListReactive.java b/src/main/java/org/redisson/api/RListReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RListReactive.java rename to src/main/java/org/redisson/api/RListReactive.java index 8113cfeef..45ee12403 100644 --- a/src/main/java/org/redisson/core/RListReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RMapReactive.java b/src/main/java/org/redisson/api/RMapReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RMapReactive.java rename to src/main/java/org/redisson/api/RMapReactive.java index 8fac13b9c..85aa90d1c 100644 --- a/src/main/java/org/redisson/core/RMapReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RObjectReactive.java b/src/main/java/org/redisson/api/RObjectReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RObjectReactive.java rename to src/main/java/org/redisson/api/RObjectReactive.java index 14785936c..7ed337612 100644 --- a/src/main/java/org/redisson/core/RObjectReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RPatternTopicReactive.java b/src/main/java/org/redisson/api/RPatternTopicReactive.java similarity index 93% rename from src/main/java/org/redisson/core/RPatternTopicReactive.java rename to src/main/java/org/redisson/api/RPatternTopicReactive.java index a1f84938f..09aa97af9 100644 --- a/src/main/java/org/redisson/core/RPatternTopicReactive.java +++ b/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. diff --git a/src/main/java/org/redisson/core/RQueueReactive.java b/src/main/java/org/redisson/api/RQueueReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RQueueReactive.java rename to src/main/java/org/redisson/api/RQueueReactive.java index bdd8a8425..32a497085 100644 --- a/src/main/java/org/redisson/core/RQueueReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RScoredSortedSetReactive.java b/src/main/java/org/redisson/api/RScoredSortedSetReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RScoredSortedSetReactive.java rename to src/main/java/org/redisson/api/RScoredSortedSetReactive.java index 7bf0f9022..7f850073c 100644 --- a/src/main/java/org/redisson/core/RScoredSortedSetReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RScriptReactive.java b/src/main/java/org/redisson/api/RScriptReactive.java similarity index 98% rename from src/main/java/org/redisson/core/RScriptReactive.java rename to src/main/java/org/redisson/api/RScriptReactive.java index 5318732a7..211049999 100644 --- a/src/main/java/org/redisson/core/RScriptReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RSetReactive.java b/src/main/java/org/redisson/api/RSetReactive.java similarity index 97% rename from src/main/java/org/redisson/core/RSetReactive.java rename to src/main/java/org/redisson/api/RSetReactive.java index 4c7ffbcc9..d433b8621 100644 --- a/src/main/java/org/redisson/core/RSetReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/core/RTopicReactive.java b/src/main/java/org/redisson/api/RTopicReactive.java similarity index 92% rename from src/main/java/org/redisson/core/RTopicReactive.java rename to src/main/java/org/redisson/api/RTopicReactive.java index 674d95050..e15d3bc88 100644 --- a/src/main/java/org/redisson/core/RTopicReactive.java +++ b/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. diff --git a/src/main/java/org/redisson/RedissonReactiveClient.java b/src/main/java/org/redisson/api/RedissonReactiveClient.java similarity index 86% rename from src/main/java/org/redisson/RedissonReactiveClient.java rename to src/main/java/org/redisson/api/RedissonReactiveClient.java index f4c4e416c..cc2704dc4 100644 --- a/src/main/java/org/redisson/RedissonReactiveClient.java +++ b/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 { diff --git a/src/main/java/org/redisson/command/CommandReactiveService.java b/src/main/java/org/redisson/command/CommandReactiveService.java index 73828fae3..697757f2b 100644 --- a/src/main/java/org/redisson/command/CommandReactiveService.java +++ b/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; diff --git a/src/main/java/org/redisson/NettyFuturePublisher.java b/src/main/java/org/redisson/reactive/NettyFuturePublisher.java similarity index 98% rename from src/main/java/org/redisson/NettyFuturePublisher.java rename to src/main/java/org/redisson/reactive/NettyFuturePublisher.java index a9c428358..4a10d27d0 100644 --- a/src/main/java/org/redisson/NettyFuturePublisher.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonAtomicLongReactive.java b/src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java similarity index 95% rename from src/main/java/org/redisson/RedissonAtomicLongReactive.java rename to src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java index 0baa3c22e..304626436 100644 --- a/src/main/java/org/redisson/RedissonAtomicLongReactive.java +++ b/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); } diff --git a/src/main/java/org/redisson/RedissonBatchReactive.java b/src/main/java/org/redisson/reactive/RedissonBatchReactive.java similarity index 88% rename from src/main/java/org/redisson/RedissonBatchReactive.java rename to src/main/java/org/redisson/reactive/RedissonBatchReactive.java index e93efa934..ffff021f6 100644 --- a/src/main/java/org/redisson/RedissonBatchReactive.java +++ b/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 { diff --git a/src/main/java/org/redisson/RedissonBitSetReactive.java b/src/main/java/org/redisson/reactive/RedissonBitSetReactive.java similarity index 97% rename from src/main/java/org/redisson/RedissonBitSetReactive.java rename to src/main/java/org/redisson/reactive/RedissonBitSetReactive.java index 5b15a557f..661239d25 100644 --- a/src/main/java/org/redisson/RedissonBitSetReactive.java +++ b/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); } diff --git a/src/main/java/org/redisson/RedissonBlockingQueueReactive.java b/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java similarity index 93% rename from src/main/java/org/redisson/RedissonBlockingQueueReactive.java rename to src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java index 78fe89e22..667036e2e 100644 --- a/src/main/java/org/redisson/RedissonBlockingQueueReactive.java +++ b/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 extends RedissonQueueReactive implements RBlockingQueueReactive { - 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); } diff --git a/src/main/java/org/redisson/RedissonBucketReactive.java b/src/main/java/org/redisson/reactive/RedissonBucketReactive.java similarity index 86% rename from src/main/java/org/redisson/RedissonBucketReactive.java rename to src/main/java/org/redisson/reactive/RedissonBucketReactive.java index 344925b2a..8fd4d13c5 100644 --- a/src/main/java/org/redisson/RedissonBucketReactive.java +++ b/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 extends RedissonExpirableReactive implements RBucketReactive { - 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); } diff --git a/src/main/java/org/redisson/RedissonDequeReactive.java b/src/main/java/org/redisson/reactive/RedissonDequeReactive.java similarity index 96% rename from src/main/java/org/redisson/RedissonDequeReactive.java rename to src/main/java/org/redisson/reactive/RedissonDequeReactive.java index a2f6244d4..3206264d3 100644 --- a/src/main/java/org/redisson/RedissonDequeReactive.java +++ b/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 extends RedissonQueueReactive implement private static final RedisCommand RPUSH_VOID = new RedisCommand("RPUSH", new VoidReplayConvertor(), 2, ValueType.OBJECTS); private static final RedisCommand LRANGE_SINGLE = new RedisCommand("LRANGE", new ListFirstObjectDecoder()); - - protected RedissonDequeReactive(CommandReactiveExecutor commandExecutor, String name) { + public RedissonDequeReactive(CommandReactiveExecutor commandExecutor, String name) { super(commandExecutor, name); } diff --git a/src/main/java/org/redisson/RedissonExpirableReactive.java b/src/main/java/org/redisson/reactive/RedissonExpirableReactive.java similarity index 96% rename from src/main/java/org/redisson/RedissonExpirableReactive.java rename to src/main/java/org/redisson/reactive/RedissonExpirableReactive.java index e0ced5611..e6147743c 100644 --- a/src/main/java/org/redisson/RedissonExpirableReactive.java +++ b/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 { diff --git a/src/main/java/org/redisson/RedissonHyperLogLogReactive.java b/src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java similarity index 89% rename from src/main/java/org/redisson/RedissonHyperLogLogReactive.java rename to src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java index 3d06caf53..211716f9e 100644 --- a/src/main/java/org/redisson/RedissonHyperLogLogReactive.java +++ b/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 extends RedissonExpirableReactive implements RHyperLogLogReactive { - 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); } diff --git a/src/main/java/org/redisson/RedissonKeysReactive.java b/src/main/java/org/redisson/reactive/RedissonKeysReactive.java similarity index 98% rename from src/main/java/org/redisson/RedissonKeysReactive.java rename to src/main/java/org/redisson/reactive/RedissonKeysReactive.java index ba50bcc99..6f68b7c5f 100644 --- a/src/main/java/org/redisson/RedissonKeysReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonLexSortedSetReactive.java b/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java similarity index 98% rename from src/main/java/org/redisson/RedissonLexSortedSetReactive.java rename to src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java index 6387414d0..fd1119ba1 100644 --- a/src/main/java/org/redisson/RedissonLexSortedSetReactive.java +++ b/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 implements RLexSortedSetReactive { diff --git a/src/main/java/org/redisson/RedissonListReactive.java b/src/main/java/org/redisson/reactive/RedissonListReactive.java similarity index 98% rename from src/main/java/org/redisson/RedissonListReactive.java rename to src/main/java/org/redisson/reactive/RedissonListReactive.java index 3dcb7f5fc..236d50729 100644 --- a/src/main/java/org/redisson/RedissonListReactive.java +++ b/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 extends RedissonExpirableReactive implements RListReactive { - 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); } diff --git a/src/main/java/org/redisson/RedissonMapReactive.java b/src/main/java/org/redisson/reactive/RedissonMapReactive.java similarity index 98% rename from src/main/java/org/redisson/RedissonMapReactive.java rename to src/main/java/org/redisson/reactive/RedissonMapReactive.java index 3348e894f..b1e4607e2 100644 --- a/src/main/java/org/redisson/RedissonMapReactive.java +++ b/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 extends RedissonExpirableReactive impleme private static final RedisCommand EVAL_REMOVE_VALUE = new RedisCommand("EVAL", new LongReplayConvertor(), 4, ValueType.MAP); private static final RedisCommand EVAL_PUT = EVAL_REPLACE; - protected RedissonMapReactive(CommandReactiveExecutor commandExecutor, String name) { + public RedissonMapReactive(CommandReactiveExecutor commandExecutor, String name) { super(commandExecutor, name); } diff --git a/src/main/java/org/redisson/RedissonMapReactiveIterator.java b/src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java similarity index 99% rename from src/main/java/org/redisson/RedissonMapReactiveIterator.java rename to src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java index 9b3e60fd1..5eb731fe8 100644 --- a/src/main/java/org/redisson/RedissonMapReactiveIterator.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonObjectReactive.java b/src/main/java/org/redisson/reactive/RedissonObjectReactive.java similarity index 97% rename from src/main/java/org/redisson/RedissonObjectReactive.java rename to src/main/java/org/redisson/reactive/RedissonObjectReactive.java index e3b5893fe..81c251806 100644 --- a/src/main/java/org/redisson/RedissonObjectReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonPatternTopicReactive.java b/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java similarity index 91% rename from src/main/java/org/redisson/RedissonPatternTopicReactive.java rename to src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java index 8dbaf56a3..d6e28cd78 100644 --- a/src/main/java/org/redisson/RedissonPatternTopicReactive.java +++ b/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 implements RPatternTopicReactive 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; diff --git a/src/main/java/org/redisson/RedissonQueueReactive.java b/src/main/java/org/redisson/reactive/RedissonQueueReactive.java similarity index 85% rename from src/main/java/org/redisson/RedissonQueueReactive.java rename to src/main/java/org/redisson/reactive/RedissonQueueReactive.java index 257db5b2b..ec998411e 100644 --- a/src/main/java/org/redisson/RedissonQueueReactive.java +++ b/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 extends RedissonListReactive implements RQueueReactive { - 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); } diff --git a/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java b/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java similarity index 99% rename from src/main/java/org/redisson/RedissonScoredSortedSetReactive.java rename to src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java index 113537022..2efa598e7 100644 --- a/src/main/java/org/redisson/RedissonScoredSortedSetReactive.java +++ b/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; diff --git a/src/main/java/org/redisson/RedissonScriptReactive.java b/src/main/java/org/redisson/reactive/RedissonScriptReactive.java similarity index 97% rename from src/main/java/org/redisson/RedissonScriptReactive.java rename to src/main/java/org/redisson/reactive/RedissonScriptReactive.java index 406577e81..f50b13e4f 100644 --- a/src/main/java/org/redisson/RedissonScriptReactive.java +++ b/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; } diff --git a/src/main/java/org/redisson/RedissonSetReactive.java b/src/main/java/org/redisson/reactive/RedissonSetReactive.java similarity index 98% rename from src/main/java/org/redisson/RedissonSetReactive.java rename to src/main/java/org/redisson/reactive/RedissonSetReactive.java index e2b5a96d5..15ccd4fd4 100644 --- a/src/main/java/org/redisson/RedissonSetReactive.java +++ b/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 extends RedissonExpirableReactive implements private static final RedisCommand EVAL_OBJECTS = new RedisCommand("EVAL", new BooleanReplayConvertor(), 4); - protected RedissonSetReactive(CommandReactiveExecutor commandExecutor, String name) { + public RedissonSetReactive(CommandReactiveExecutor commandExecutor, String name) { super(commandExecutor, name); } diff --git a/src/main/java/org/redisson/RedissonTopicReactive.java b/src/main/java/org/redisson/reactive/RedissonTopicReactive.java similarity index 91% rename from src/main/java/org/redisson/RedissonTopicReactive.java rename to src/main/java/org/redisson/reactive/RedissonTopicReactive.java index bbda90f72..d47990091 100644 --- a/src/main/java/org/redisson/RedissonTopicReactive.java +++ b/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 implements RTopicReactive { 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; diff --git a/src/test/java/org/redisson/BaseReactiveTest.java b/src/test/java/org/redisson/BaseReactiveTest.java index 946004ede..9bebcda0d 100644 --- a/src/test/java/org/redisson/BaseReactiveTest.java +++ b/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; diff --git a/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java b/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java index f1cf3845a..4ca4b0134 100644 --- a/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonBitSetReactiveTest.java b/src/test/java/org/redisson/RedissonBitSetReactiveTest.java index eb22fab29..17ec1b051 100644 --- a/src/test/java/org/redisson/RedissonBitSetReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java b/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java index 5563714a0..ca5cc4a0d 100644 --- a/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonBucketReactiveTest.java b/src/test/java/org/redisson/RedissonBucketReactiveTest.java index 27bd426cd..8ac537bee 100644 --- a/src/test/java/org/redisson/RedissonBucketReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonDequeReactiveTest.java b/src/test/java/org/redisson/RedissonDequeReactiveTest.java index d4091d3a5..d068db078 100644 --- a/src/test/java/org/redisson/RedissonDequeReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java b/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java index 8db68d8c8..1e764bced 100644 --- a/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonKeysReactiveTest.java b/src/test/java/org/redisson/RedissonKeysReactiveTest.java index 796442992..e2bff39b6 100644 --- a/src/test/java/org/redisson/RedissonKeysReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java b/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java index 3ecc8fad6..b0de34bf2 100644 --- a/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonListReactiveTest.java b/src/test/java/org/redisson/RedissonListReactiveTest.java index 84137a42c..210b43780 100644 --- a/src/test/java/org/redisson/RedissonListReactiveTest.java +++ b/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; diff --git a/src/test/java/org/redisson/RedissonMapReactiveTest.java b/src/test/java/org/redisson/RedissonMapReactiveTest.java index 7178747da..48ba845e9 100644 --- a/src/test/java/org/redisson/RedissonMapReactiveTest.java +++ b/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; diff --git a/src/test/java/org/redisson/RedissonQueueReactiveTest.java b/src/test/java/org/redisson/RedissonQueueReactiveTest.java index a237c32ee..cbdf5315e 100644 --- a/src/test/java/org/redisson/RedissonQueueReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java b/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java index 03a4beb57..9abb0b023 100644 --- a/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonScriptReactiveTest.java b/src/test/java/org/redisson/RedissonScriptReactiveTest.java index ff35599b0..4822e808c 100644 --- a/src/test/java/org/redisson/RedissonScriptReactiveTest.java +++ b/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 { diff --git a/src/test/java/org/redisson/RedissonSetReactiveTest.java b/src/test/java/org/redisson/RedissonSetReactiveTest.java index 35fa38ca9..8ab461f37 100644 --- a/src/test/java/org/redisson/RedissonSetReactiveTest.java +++ b/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 {