From 9d845c11724513b1b38b1d6151d84db6b99a3fd4 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 1 Mar 2018 15:22:38 +0300 Subject: [PATCH] refactoring --- .../java/org/redisson/RedissonListMultimapCache.java | 8 ++++++-- redisson/src/main/java/org/redisson/RedissonMap.java | 6 +++--- .../src/main/java/org/redisson/RedissonMapCache.java | 12 ++++++------ .../src/main/java/org/redisson/RedissonObject.java | 10 +++++----- .../java/org/redisson/RedissonSetMultimapCache.java | 8 ++++++-- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonListMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonListMultimapCache.java index f06233b55..adc06604f 100644 --- a/redisson/src/main/java/org/redisson/RedissonListMultimapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonListMultimapCache.java @@ -42,13 +42,17 @@ public class RedissonListMultimapCache extends RedissonListMultimap RedissonListMultimapCache(EvictionScheduler evictionScheduler, CommandAsyncExecutor connectionManager, String name) { super(connectionManager, name); - evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + if (evictionScheduler != null) { + evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + } baseCache = new RedissonMultimapCache(connectionManager, this, getTimeoutSetName(), prefix); } RedissonListMultimapCache(EvictionScheduler evictionScheduler, Codec codec, CommandAsyncExecutor connectionManager, String name) { super(codec, connectionManager, name); - evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + if (evictionScheduler != null) { + evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + } baseCache = new RedissonMultimapCache(connectionManager, this, getTimeoutSetName(), prefix); } diff --git a/redisson/src/main/java/org/redisson/RedissonMap.java b/redisson/src/main/java/org/redisson/RedissonMap.java index 825ec0698..89d884458 100644 --- a/redisson/src/main/java/org/redisson/RedissonMap.java +++ b/redisson/src/main/java/org/redisson/RedissonMap.java @@ -237,7 +237,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { return options == null || options.getLoader() == null; } - protected RFuture> getAllOperationAsync(Set keys) { + public RFuture> getAllOperationAsync(Set keys) { List args = new ArrayList(keys.size() + 1); args.add(getName()); encodeMapKeys(args, keys); @@ -624,7 +624,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { Collections.singletonList(getName(key)), encodeMapKey(key), encodeMapValue(value)); } - protected RFuture getOperationAsync(K key) { + public RFuture getOperationAsync(K key) { return commandExecutor.readAsync(getName(key), codec, RedisCommands.HGET, getName(key), encodeMapKey(key)); } @@ -973,7 +973,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { return get(fastRemoveAsync(keys)); } - MapScanResult scanIterator(String name, RedisClient client, long startPos, String pattern) { + public MapScanResult scanIterator(String name, RedisClient client, long startPos, String pattern) { if (pattern == null) { RFuture> f = commandExecutor.readAsync(client, name, new MapScanCodec(codec), RedisCommands.HSCAN, name, startPos); diff --git a/redisson/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java index b5e23bb42..d5816630e 100644 --- a/redisson/src/main/java/org/redisson/RedissonMapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonMapCache.java @@ -210,7 +210,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac } @Override - protected RFuture> getAllOperationAsync(Set keys) { + public RFuture> getAllOperationAsync(Set keys) { List args = new ArrayList(keys.size() + 1); List plainKeys = new ArrayList(keys.size()); @@ -448,7 +448,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac } @Override - protected RFuture getOperationAsync(K key) { + public RFuture getOperationAsync(K key) { return commandExecutor.evalWriteAsync(getName(key), codec, RedisCommands.EVAL_MAP_VALUE, "local value = redis.call('hget', KEYS[1], ARGV[2]); " + "if value == false then " @@ -618,7 +618,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac } @Override - public RFuture addAndGetOperationAsync(K key, Number value) { + protected RFuture addAndGetOperationAsync(K key, Number value) { ByteBuf keyState = encodeMapKey(key); return commandExecutor.evalWriteAsync(getName(key), StringCodec.INSTANCE, new RedisCommand("EVAL", new NumberConvertor(value.getClass())), @@ -1100,7 +1100,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac @Override - public RFuture removeOperationAsync(K key) { + protected RFuture removeOperationAsync(K key) { return commandExecutor.evalWriteAsync(getName(key), codec, RedisCommands.EVAL_MAP_VALUE, "local value = redis.call('hget', KEYS[1], ARGV[2]); " + "if value == false then " @@ -1198,7 +1198,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac } @Override - MapScanResult scanIterator(String name, RedisClient client, long startPos, String pattern) { + public MapScanResult scanIterator(String name, RedisClient client, long startPos, String pattern) { return get(scanIteratorAsync(name, client, startPos, pattern)); } @@ -1635,7 +1635,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac } @Override - public RFuture putAllOperationAsync(Map map) { + protected RFuture putAllOperationAsync(Map map) { List params = new ArrayList(map.size()*2 + 1); params.add(System.currentTimeMillis()); for (java.util.Map.Entry t : map.entrySet()) { diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java index 40e0862b1..c999e032e 100644 --- a/redisson/src/main/java/org/redisson/RedissonObject.java +++ b/redisson/src/main/java/org/redisson/RedissonObject.java @@ -56,14 +56,14 @@ public abstract class RedissonObject implements RObject { return commandExecutor.await(future, timeout, timeoutUnit); } - protected static String prefixName(String prefix, String name) { + public static String prefixName(String prefix, String name) { if (name.contains("{")) { return prefix + ":" + name; } return prefix + ":{" + name + "}"; } - protected static String suffixName(String name, String suffix) { + public static String suffixName(String name, String suffix) { if (name.contains("{")) { return name + ":" + suffix; } @@ -194,7 +194,7 @@ public abstract class RedissonObject implements RObject { } } - protected ByteBuf encode(Object value) { + public ByteBuf encode(Object value) { if (commandExecutor.isRedissonReferenceSupportEnabled()) { RedissonReference reference = RedissonObjectFactory.toReference(commandExecutor.getConnectionManager().getCfg(), value); if (reference != null) { @@ -209,7 +209,7 @@ public abstract class RedissonObject implements RObject { } } - protected ByteBuf encodeMapKey(Object value) { + public ByteBuf encodeMapKey(Object value) { if (commandExecutor.isRedissonReferenceSupportEnabled()) { RedissonReference reference = RedissonObjectFactory.toReference(commandExecutor.getConnectionManager().getCfg(), value); if (reference != null) { @@ -224,7 +224,7 @@ public abstract class RedissonObject implements RObject { } } - protected ByteBuf encodeMapValue(Object value) { + public ByteBuf encodeMapValue(Object value) { if (commandExecutor.isRedissonReferenceSupportEnabled()) { RedissonReference reference = RedissonObjectFactory.toReference(commandExecutor.getConnectionManager().getCfg(), value); if (reference != null) { diff --git a/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java index aa7f3d713..40d5f8939 100644 --- a/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java @@ -41,13 +41,17 @@ public class RedissonSetMultimapCache extends RedissonSetMultimap im RedissonSetMultimapCache(EvictionScheduler evictionScheduler, CommandAsyncExecutor connectionManager, String name) { super(connectionManager, name); - evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + if (evictionScheduler != null) { + evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + } baseCache = new RedissonMultimapCache(connectionManager, this, getTimeoutSetName(), prefix); } RedissonSetMultimapCache(EvictionScheduler evictionScheduler, Codec codec, CommandAsyncExecutor connectionManager, String name) { super(codec, connectionManager, name); - evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + if (evictionScheduler != null) { + evictionScheduler.scheduleCleanMultimap(name, getTimeoutSetName()); + } baseCache = new RedissonMultimapCache(connectionManager, this, getTimeoutSetName(), prefix); }