From 7d5dd8ebc346b8c32f2ce3b169f6ddc2410d5954 Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 10 Feb 2016 11:03:06 +0300 Subject: [PATCH] Code cleanup --- src/main/java/org/redisson/RedissonKeys.java | 2 +- src/main/java/org/redisson/core/RKeys.java | 2 +- src/main/java/org/redisson/core/RedissonMultiLock.java | 3 +-- src/main/java/org/redisson/reactive/RedissonKeysReactive.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/redisson/RedissonKeys.java b/src/main/java/org/redisson/RedissonKeys.java index c015cf016..e553bb169 100644 --- a/src/main/java/org/redisson/RedissonKeys.java +++ b/src/main/java/org/redisson/RedissonKeys.java @@ -282,7 +282,7 @@ public class RedissonKeys implements RKeys { } @Override - public Long count() { + public long count() { return commandExecutor.get(countAsync()); } diff --git a/src/main/java/org/redisson/core/RKeys.java b/src/main/java/org/redisson/core/RKeys.java index 867026ac6..a32781a0f 100644 --- a/src/main/java/org/redisson/core/RKeys.java +++ b/src/main/java/org/redisson/core/RKeys.java @@ -95,7 +95,7 @@ public interface RKeys extends RKeysAsync { * * @return */ - Long count(); + long count(); /** * Delete all keys of currently selected database diff --git a/src/main/java/org/redisson/core/RedissonMultiLock.java b/src/main/java/org/redisson/core/RedissonMultiLock.java index 22264cb58..3d5633aac 100644 --- a/src/main/java/org/redisson/core/RedissonMultiLock.java +++ b/src/main/java/org/redisson/core/RedissonMultiLock.java @@ -35,8 +35,7 @@ import io.netty.util.concurrent.Promise; import io.netty.util.internal.PlatformDependent; /** - * Guarantees multiple locks operation handling (lock, tryLock...) - * in atomic way without deadlocks. + * Groups multiple independent locks and handles them as one lock. * * @author Nikita Koksharov * diff --git a/src/main/java/org/redisson/reactive/RedissonKeysReactive.java b/src/main/java/org/redisson/reactive/RedissonKeysReactive.java index e54ce5273..51c687f16 100644 --- a/src/main/java/org/redisson/reactive/RedissonKeysReactive.java +++ b/src/main/java/org/redisson/reactive/RedissonKeysReactive.java @@ -39,7 +39,7 @@ public class RedissonKeysReactive implements RKeysReactive { private final CommandReactiveService commandExecutor; - RedissonKeys instance; + private final RedissonKeys instance; public RedissonKeysReactive(CommandReactiveService commandExecutor) { super();