github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

RedissonClient moved to api package

Browse Source
pull/583/head
Nikita 9 years ago
parent 37dc1879d8
commit 83d2a407c1
35 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File

1
redisson/src/main/java/org/redisson/Redisson.java
Unescape Escape View File

@ -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;

1
redisson/src/main/java/org/redisson/RedissonExecutorService.java
Unescape Escape View File

@ -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;

1
redisson/src/main/java/org/redisson/RedissonLiveObjectService.java
Unescape Escape View File

@ -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;

42
redisson/src/main/java/org/redisson/RedissonClient.java → redisson/src/main/java/org/redisson/api/RedissonClient.java
Unescape Escape View File

@ -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;

9
redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
Unescape Escape View File

@ -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();

2
redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java
Unescape Escape View File

@ -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;

2
redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java
Unescape Escape View File

@ -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;

3
redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java
Unescape Escape View File

@ -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;

3
redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java
Unescape Escape View File

@ -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;

2
redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java
Unescape Escape View File

@ -15,7 +15,7 @@
*/
package org.redisson.liveobject.resolver;
import org.redisson.RedissonClient;
import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RId;
/**

2
redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java
Unescape Escape View File

@ -15,7 +15,7 @@
*/
package org.redisson.liveobject.resolver;
import org.redisson.RedissonClient;
import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RId;
/**

3
redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java
Unescape Escape View File

@ -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;
/**

3
redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java
Unescape Escape View File

@ -16,7 +16,8 @@
package org.redisson.liveobject.resolver;
import java.lang.annotation.Annotation;
import org.redisson.RedissonClient;
import org.redisson.api.RedissonClient;
/**
*

2
redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java vendored
Unescape Escape View File

@ -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;

2
redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java vendored
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/BaseConcurrentTest.java
Unescape Escape View File

@ -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 {

1
redisson/src/test/java/org/redisson/BaseTest.java
Unescape Escape View File

@ -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 {

1
redisson/src/test/java/org/redisson/CommandHandlersTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java
Unescape Escape View File

@ -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 {

1
redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
Unescape Escape View File

@ -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 {

1
redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonMapTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonRedLockTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java
Unescape Escape View File

@ -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;

2
redisson/src/test/java/org/redisson/RedissonRunnable.java
Unescape Escape View File

@ -1,5 +1,7 @@
package org.redisson;
import org.redisson.api.RedissonClient;
public interface RedissonRunnable {
void run(RedissonClient redisson);

1
redisson/src/test/java/org/redisson/RedissonTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonTopicTest.java
Unescape Escape View File

@ -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;

1
redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
Unescape Escape View File

@ -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;

2
redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java
Unescape Escape View File

@ -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<Long>, Serializable {

2
redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java
Unescape Escape View File

@ -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 {

2
redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java vendored
Unescape Escape View File

@ -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;

Write Preview
Loading…
Cancel
Save