diff --git a/redisson/src/main/java/org/redisson/Redisson.java b/redisson/src/main/java/org/redisson/Redisson.java index 465229e81..67ff75bbc 100755 --- a/redisson/src/main/java/org/redisson/Redisson.java +++ b/redisson/src/main/java/org/redisson/Redisson.java @@ -59,6 +59,7 @@ import org.redisson.api.RSetMultimap; import org.redisson.api.RSetMultimapCache; import org.redisson.api.RSortedSet; import org.redisson.api.RTopic; +import org.redisson.api.RedissonClient; import org.redisson.api.RedissonReactiveClient; import org.redisson.client.codec.Codec; import org.redisson.command.CommandExecutor; diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java index 745872ccd..0926f851f 100644 --- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java +++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java @@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.redisson.api.RExecutorService; import org.redisson.api.RFuture; import org.redisson.api.RTopic; +import org.redisson.api.RedissonClient; import org.redisson.api.RemoteInvocationOptions; import org.redisson.api.annotation.RInject; import org.redisson.api.listener.MessageListener; diff --git a/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java b/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java index 3738c140d..f8199e29b 100644 --- a/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java +++ b/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentMap; import org.redisson.api.RLiveObject; import org.redisson.api.RLiveObjectService; import org.redisson.api.RObject; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.REntity; import org.redisson.api.annotation.RId; import org.redisson.liveobject.LiveObjectTemplate; diff --git a/redisson/src/main/java/org/redisson/RedissonClient.java b/redisson/src/main/java/org/redisson/api/RedissonClient.java similarity index 92% rename from redisson/src/main/java/org/redisson/RedissonClient.java rename to redisson/src/main/java/org/redisson/api/RedissonClient.java index 100840f06..8290e2743 100755 --- a/redisson/src/main/java/org/redisson/RedissonClient.java +++ b/redisson/src/main/java/org/redisson/api/RedissonClient.java @@ -13,50 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.api; import java.util.concurrent.TimeUnit; -import org.redisson.api.ClusterNodesGroup; -import org.redisson.api.Node; -import org.redisson.api.NodesGroup; -import org.redisson.api.RAtomicDouble; -import org.redisson.api.RAtomicLong; -import org.redisson.api.RBatch; -import org.redisson.api.RBitSet; -import org.redisson.api.RBlockingDeque; -import org.redisson.api.RBlockingQueue; -import org.redisson.api.RBloomFilter; -import org.redisson.api.RBoundedBlockingQueue; -import org.redisson.api.RBucket; -import org.redisson.api.RBuckets; -import org.redisson.api.RCountDownLatch; -import org.redisson.api.RDeque; -import org.redisson.api.RExecutorService; -import org.redisson.api.RGeo; -import org.redisson.api.RHyperLogLog; -import org.redisson.api.RKeys; -import org.redisson.api.RLexSortedSet; -import org.redisson.api.RList; -import org.redisson.api.RListMultimap; -import org.redisson.api.RListMultimapCache; -import org.redisson.api.RLiveObjectService; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RMapCache; -import org.redisson.api.RPatternTopic; -import org.redisson.api.RQueue; -import org.redisson.api.RReadWriteLock; -import org.redisson.api.RRemoteService; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RScript; -import org.redisson.api.RSemaphore; -import org.redisson.api.RSet; -import org.redisson.api.RSetCache; -import org.redisson.api.RSetMultimap; -import org.redisson.api.RSetMultimapCache; -import org.redisson.api.RSortedSet; -import org.redisson.api.RTopic; import org.redisson.client.codec.Codec; import org.redisson.config.Config; import org.redisson.liveobject.provider.CodecProvider; diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 608b723e9..48bedc0b3 100644 --- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -61,8 +61,10 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollSocketChannel; import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.oio.OioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; +import io.netty.channel.socket.oio.OioSocketChannel; import io.netty.util.HashedWheelTimer; import io.netty.util.Timeout; import io.netty.util.Timer; @@ -175,6 +177,13 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } this.socketChannelClass = NioSocketChannel.class; +// if (cfg.getEventLoopGroup() == null) { +// this.group = new OioEventLoopGroup(cfg.getThreads()); +// } else { +// this.group = cfg.getEventLoopGroup(); +// } +// +// this.socketChannelClass = OioSocketChannel.class; } this.codec = cfg.getCodec(); this.shutdownPromise = newPromise(); diff --git a/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java b/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java index a0b1346ef..e100c6769 100644 --- a/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java +++ b/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java @@ -20,8 +20,8 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.concurrent.Callable; -import org.redisson.RedissonClient; import org.redisson.RedissonExecutorService; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RInject; import org.redisson.client.codec.Codec; import org.redisson.client.protocol.RedisCommands; diff --git a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java index 32c2af3c9..52343e921 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java @@ -36,7 +36,6 @@ import java.util.concurrent.ConcurrentMap; import org.redisson.RedissonBitSet; import org.redisson.RedissonBlockingDeque; import org.redisson.RedissonBlockingQueue; -import org.redisson.RedissonClient; import org.redisson.RedissonDeque; import org.redisson.RedissonList; import org.redisson.RedissonMap; @@ -49,6 +48,7 @@ import org.redisson.client.codec.Codec; import org.redisson.api.RBitSet; import org.redisson.api.RMap; import org.redisson.api.RObject; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.REntity; import org.redisson.api.annotation.RId; import org.redisson.api.annotation.RObjectField; diff --git a/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java index 2fe5e69f4..26ad8df3e 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java @@ -22,11 +22,12 @@ import net.bytebuddy.implementation.bind.annotation.FieldValue; import net.bytebuddy.implementation.bind.annotation.Origin; import net.bytebuddy.implementation.bind.annotation.RuntimeType; import net.bytebuddy.implementation.bind.annotation.This; -import org.redisson.RedissonClient; + import org.redisson.RedissonMap; import org.redisson.client.RedisException; import org.redisson.client.codec.Codec; import org.redisson.api.RMap; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.REntity; import org.redisson.liveobject.provider.CodecProvider; import org.redisson.liveobject.resolver.NamingScheme; diff --git a/redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java b/redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java index 320fbb7ca..7b3791e59 100644 --- a/redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java +++ b/redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java @@ -18,11 +18,12 @@ package org.redisson.liveobject.misc; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import org.redisson.RedissonClient; + import org.redisson.RedissonReference; import org.redisson.client.codec.Codec; import org.redisson.api.RBitSet; import org.redisson.api.RObject; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.REntity; import org.redisson.liveobject.provider.CodecProvider; import org.redisson.liveobject.provider.ResolverProvider; diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java b/redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java index 29c1c4ab3..3a179d6e9 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java @@ -15,7 +15,7 @@ */ package org.redisson.liveobject.resolver; -import org.redisson.RedissonClient; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RId; /** diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java b/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java index f84068f30..16114ef36 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java @@ -15,7 +15,7 @@ */ package org.redisson.liveobject.resolver; -import org.redisson.RedissonClient; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RId; /** diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java b/redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java index e87096289..71c4e0ebd 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java @@ -16,7 +16,8 @@ package org.redisson.liveobject.resolver; import java.util.UUID; -import org.redisson.RedissonClient; + +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RId; /** diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java b/redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java index 4f303fb4c..7abe7f700 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java @@ -16,7 +16,8 @@ package org.redisson.liveobject.resolver; import java.lang.annotation.Annotation; -import org.redisson.RedissonClient; + +import org.redisson.api.RedissonClient; /** * diff --git a/redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java b/redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java index 914fc4a39..40025dd99 100644 --- a/redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java +++ b/redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java @@ -20,10 +20,10 @@ import java.lang.reflect.Constructor; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.redisson.RedissonClient; import org.redisson.api.RLock; import org.redisson.api.RMap; import org.redisson.api.RMapCache; +import org.redisson.api.RedissonClient; import org.redisson.misc.Hash; import org.springframework.cache.Cache; import org.springframework.cache.support.SimpleValueWrapper; diff --git a/redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java b/redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java index a7d706524..26288582e 100644 --- a/redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java +++ b/redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java @@ -21,9 +21,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.redisson.RedissonClient; import org.redisson.api.RMap; import org.redisson.api.RMapCache; +import org.redisson.api.RedissonClient; import org.redisson.client.codec.Codec; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.InitializingBean; diff --git a/redisson/src/test/java/org/redisson/BaseConcurrentTest.java b/redisson/src/test/java/org/redisson/BaseConcurrentTest.java index 5f7e59508..e1e01f67d 100644 --- a/redisson/src/test/java/org/redisson/BaseConcurrentTest.java +++ b/redisson/src/test/java/org/redisson/BaseConcurrentTest.java @@ -7,6 +7,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.junit.Assert; +import org.redisson.api.RedissonClient; public abstract class BaseConcurrentTest extends BaseTest { diff --git a/redisson/src/test/java/org/redisson/BaseTest.java b/redisson/src/test/java/org/redisson/BaseTest.java index 9ee7f0dbf..4430f711a 100644 --- a/redisson/src/test/java/org/redisson/BaseTest.java +++ b/redisson/src/test/java/org/redisson/BaseTest.java @@ -5,6 +5,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.redisson.api.RedissonClient; import org.redisson.config.Config; public abstract class BaseTest { diff --git a/redisson/src/test/java/org/redisson/CommandHandlersTest.java b/redisson/src/test/java/org/redisson/CommandHandlersTest.java index a30e71792..98099ac94 100644 --- a/redisson/src/test/java/org/redisson/CommandHandlersTest.java +++ b/redisson/src/test/java/org/redisson/CommandHandlersTest.java @@ -1,6 +1,7 @@ package org.redisson; import org.junit.Test; +import org.redisson.api.RedissonClient; import org.redisson.client.RedisException; import org.redisson.config.Config; diff --git a/redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java b/redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java index b55a468ec..815f378bf 100644 --- a/redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java +++ b/redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java @@ -13,6 +13,7 @@ import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; import org.redisson.api.RSortedSet; +import org.redisson.api.RedissonClient; public class ConcurrentRedissonSortedSetTest extends BaseConcurrentTest { diff --git a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java index 076a82e01..394fac947 100644 --- a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java +++ b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java @@ -19,6 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RBlockingQueue; +import org.redisson.api.RedissonClient; import org.redisson.config.Config; import io.netty.util.concurrent.Future; diff --git a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java index 2104b1470..0cf850dad 100644 --- a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java +++ b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java @@ -23,6 +23,7 @@ import org.junit.Assert; import org.junit.Test; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RBoundedBlockingQueue; +import org.redisson.api.RedissonClient; import org.redisson.client.RedisException; import org.redisson.config.Config; diff --git a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java index cd228744e..5476862fc 100644 --- a/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java +++ b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java @@ -13,6 +13,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.redisson.api.RCountDownLatch; +import org.redisson.api.RedissonClient; public class RedissonCountDownLatchConcurrentTest { diff --git a/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java b/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java index fe10dad50..1bfd381b2 100644 --- a/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java +++ b/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java @@ -37,6 +37,7 @@ import org.redisson.api.RMap; import org.redisson.api.RQueue; import org.redisson.api.RSet; import org.redisson.api.RSortedSet; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.REntity; import org.redisson.api.annotation.RId; import org.redisson.liveobject.resolver.DefaultNamingScheme; diff --git a/redisson/src/test/java/org/redisson/RedissonMapTest.java b/redisson/src/test/java/org/redisson/RedissonMapTest.java index 7216e6ae1..9b2775650 100644 --- a/redisson/src/test/java/org/redisson/RedissonMapTest.java +++ b/redisson/src/test/java/org/redisson/RedissonMapTest.java @@ -17,6 +17,7 @@ import java.util.concurrent.ExecutionException; import org.junit.Assert; import org.junit.Test; import org.redisson.api.RMap; +import org.redisson.api.RedissonClient; import org.redisson.client.codec.StringCodec; import org.redisson.codec.JsonJacksonCodec; import org.redisson.config.Config; diff --git a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java index a8aed0746..3794bdf6f 100644 --- a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java +++ b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java @@ -9,6 +9,7 @@ import org.junit.Test; import io.netty.channel.nio.NioEventLoopGroup; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; import org.redisson.config.Config; import static com.jayway.awaitility.Awaitility.await; diff --git a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java index 17d5aa9af..6b72c24b1 100644 --- a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java +++ b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java @@ -11,6 +11,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; import org.redisson.config.Config; import static com.jayway.awaitility.Awaitility.await; diff --git a/redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java b/redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java index 4bdffaaab..ff9df53cb 100644 --- a/redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java +++ b/redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java @@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; import org.junit.Test; import org.redisson.api.RFuture; +import org.redisson.api.RedissonClient; import org.redisson.api.RemoteInvocationOptions; import org.redisson.codec.FstCodec; import org.redisson.codec.SerializationCodec; diff --git a/redisson/src/test/java/org/redisson/RedissonRunnable.java b/redisson/src/test/java/org/redisson/RedissonRunnable.java index b8c55ae72..313cf9229 100644 --- a/redisson/src/test/java/org/redisson/RedissonRunnable.java +++ b/redisson/src/test/java/org/redisson/RedissonRunnable.java @@ -1,5 +1,7 @@ package org.redisson; +import org.redisson.api.RedissonClient; + public interface RedissonRunnable { void run(RedissonClient redisson); diff --git a/redisson/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java index 470eb9097..32fe1a804 100644 --- a/redisson/src/test/java/org/redisson/RedissonTest.java +++ b/redisson/src/test/java/org/redisson/RedissonTest.java @@ -20,6 +20,7 @@ import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.ClusterNode; import org.redisson.api.Node; import org.redisson.api.NodesGroup; +import org.redisson.api.RedissonClient; import org.redisson.client.RedisConnectionException; import org.redisson.client.RedisException; import org.redisson.client.RedisOutOfMemoryException; diff --git a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java index 4fdfa89c7..fa6c19f09 100644 --- a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java +++ b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RPatternTopic; import org.redisson.api.RTopic; +import org.redisson.api.RedissonClient; import org.redisson.api.listener.BasePatternStatusListener; import org.redisson.api.listener.MessageListener; import org.redisson.api.listener.PatternMessageListener; diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java index 6454658f3..867b497fd 100644 --- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java +++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java @@ -26,6 +26,7 @@ import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RBlockingQueue; import org.redisson.api.RSet; import org.redisson.api.RTopic; +import org.redisson.api.RedissonClient; import org.redisson.api.listener.BaseStatusListener; import org.redisson.api.listener.MessageListener; import org.redisson.api.listener.StatusListener; diff --git a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java index 9a6e187a6..6ba710c1d 100644 --- a/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java +++ b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java @@ -9,6 +9,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.redisson.api.RCountDownLatch; import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; import org.redisson.client.codec.Codec; import org.redisson.codec.JsonJacksonCodec; import org.redisson.codec.SerializationCodec; diff --git a/redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java b/redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java index 12f0dd800..773839688 100644 --- a/redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java +++ b/redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java @@ -3,7 +3,7 @@ package org.redisson.executor; import java.io.Serializable; import java.util.concurrent.Callable; -import org.redisson.RedissonClient; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RInject; public class CallableRedissonTask implements Callable, Serializable { diff --git a/redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java b/redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java index a830b25a8..b87ccc95c 100644 --- a/redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java +++ b/redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java @@ -1,6 +1,6 @@ package org.redisson.executor; -import org.redisson.RedissonClient; +import org.redisson.api.RedissonClient; import org.redisson.api.annotation.RInject; public class RunnableRedissonTask implements Runnable { diff --git a/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java b/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java index a067d7269..28e6b6bc5 100644 --- a/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java +++ b/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java @@ -14,7 +14,7 @@ import org.junit.runners.Parameterized; import org.redisson.BaseTest; import org.redisson.RedisRunner; import org.redisson.RedisRunner.RedisProcess; -import org.redisson.RedissonClient; +import org.redisson.api.RedissonClient; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut;