diff --git a/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java b/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java index 2387915c32c709ae317834098cac52efe6ec2deb..842aff3de117fb07256fd1cd437e17d01bb927ef 100644 --- a/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java +++ b/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java @@ -7,7 +7,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +44,7 @@ public class SpringRedisGenericCache implements Level2Cache { public void clear() { Collection keys = keys(); keys.stream().forEach(k -> { - redisTemplate.delete(this.region + ":" + k); + redisTemplate.delete(k); }); } @@ -67,7 +66,12 @@ public class SpringRedisGenericCache implements Level2Cache { @Override public Collection keys() { - return redisTemplate.keys(this.region + ":*").stream().map(k->k.substring(this.region.length()+1)).collect(Collectors.toSet()); + Set list = redisTemplate.keys(this.region + ":*"); + List keys = new ArrayList<>(list.size()); + for (String s : list) { + keys.add(s); + } + return keys; } @Override diff --git a/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java b/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java index 49eb85b272c630538a6227c17fc8e97c9d3aaca7..8b4b1ae311c784edd9073cdb91e666c176729e1f 100644 --- a/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java +++ b/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java @@ -7,7 +7,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +44,7 @@ public class SpringRedisGenericCache implements Level2Cache { public void clear() { Collection keys = keys(); keys.stream().forEach(k -> { - redisTemplate.delete(this.region + ":" + k); + redisTemplate.delete(k); }); } @@ -67,7 +66,12 @@ public class SpringRedisGenericCache implements Level2Cache { @Override public Collection keys() { - return redisTemplate.keys(this.region + ":*").stream().map(k->k.substring(this.region.length()+1)).collect(Collectors.toSet()); + Set list = redisTemplate.keys(this.region + ":*"); + List keys = new ArrayList<>(list.size()); + for (String s : list) { + keys.add(s); + } + return keys; } @Override diff --git a/pom.xml b/pom.xml index 1455283168eb9e9049380cc0e4421a2dd3669c10..445385744d15fdf474584dba046045c65856c0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - + 跌跌跌 net.oschina.j2cache j2cache 2.7.6-release