diff --git a/src/main/java/org/redisson/Config.java b/src/main/java/org/redisson/Config.java index 493795f74..7066e09a3 100644 --- a/src/main/java/org/redisson/Config.java +++ b/src/main/java/org/redisson/Config.java @@ -231,14 +231,6 @@ public class Config { return this.sentinelServersConfig; } - /** - * Deprecated. Use {@link #useSentinelServers()} instead - */ - @Deprecated - public SentinelServersConfig useSentinelConnection() { - return useSentinelServers(); - } - SentinelServersConfig getSentinelServersConfig() { return sentinelServersConfig; } @@ -272,13 +264,6 @@ public class Config { return masterSlaveServersConfig; } - /** - * Deprecated. Use {@link #useMasterSlaveServers()} instead - */ - @Deprecated - public MasterSlaveServersConfig useMasterSlaveConnection() { - return useMasterSlaveServers(); - } MasterSlaveServersConfig getMasterSlaveServersConfig() { return masterSlaveServersConfig; } @@ -346,8 +331,11 @@ public class Config { } /** - * Use defined eventLoopGroup instance. - * Thus several Redisson instances can use one eventLoopGroup instance. + * Use external EventLoopGroup. EventLoopGroup processes all + * Netty connection tied with Redis servers. Each EventLoopGroup creates + * own threads and each Redisson client creates own EventLoopGroup by default. + * So if there are multiple Redisson instances in same JVM + * it would be useful to share one EventLoopGroup among them. *
* Only {@link io.netty.channel.epoll.EpollEventLoopGroup} or * {@link io.netty.channel.nio.NioEventLoopGroup} can be used. diff --git a/src/main/java/org/redisson/core/RLock.java b/src/main/java/org/redisson/core/RLock.java index 174c941de..2ff50805d 100644 --- a/src/main/java/org/redisson/core/RLock.java +++ b/src/main/java/org/redisson/core/RLock.java @@ -124,6 +124,6 @@ public interface RLock extends Lock, RExpirable { Future