From b0afc60755a122f4efe6a47abfbe5bfd9efacfef Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 19 Dec 2018 13:20:24 +0300 Subject: [PATCH] refactoring --- .../org/redisson/spring/data/connection/RedissonConnection.java | 2 +- .../org/redisson/spring/data/connection/RedissonConnection.java | 2 +- .../org/redisson/spring/data/connection/RedissonConnection.java | 2 +- .../org/redisson/spring/data/connection/RedissonConnection.java | 2 +- redisson/src/main/java/org/redisson/RedissonMapCache.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index b7a092960..e29dd63a5 100644 --- a/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -324,7 +324,7 @@ public class RedissonConnection extends AbstractRedisConnection { } Set results = new HashSet(); - RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, KEYS, pattern)); + RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, StringCodec.INSTANCE, KEYS, pattern)); return sync(f); } diff --git a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index b771e4cdb..605cde25e 100644 --- a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -326,7 +326,7 @@ public class RedissonConnection extends AbstractRedisConnection { } Set results = new HashSet(); - RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, KEYS, pattern)); + RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, StringCodec.INSTANCE, KEYS, pattern)); return sync(f); } diff --git a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 38cd42699..2426691ea 100644 --- a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -335,7 +335,7 @@ public class RedissonConnection extends AbstractRedisConnection { } Set results = new HashSet(); - RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, KEYS, pattern)); + RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, StringCodec.INSTANCE, KEYS, pattern)); return sync(f); } diff --git a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 9a993a5a2..56830866b 100644 --- a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -336,7 +336,7 @@ public class RedissonConnection extends AbstractRedisConnection { } Set results = new HashSet(); - RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, KEYS, pattern)); + RFuture> f = (RFuture>)(Object)(executorService.readAllAsync(results, StringCodec.INSTANCE, KEYS, pattern)); return sync(f); } diff --git a/redisson/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java index cac516bea..8ae2054f3 100644 --- a/redisson/src/main/java/org/redisson/RedissonMapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonMapCache.java @@ -165,7 +165,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " return 1;" + "end;" + "return 0; ", - Arrays.asList(getName(key), getTimeoutSetNameByKey(key), getIdleSetNameByKey(key), getLastAccessTimeSetNameByKey(key), getOptionsName(key)), + Arrays.asList(getName(key), getTimeoutSetNameByKey(key), getIdleSetNameByKey(key), getLastAccessTimeSetNameByKey(key), getOptionsNameByKey(key)), System.currentTimeMillis(), encodeMapKey(key)); }