diff --git a/redisson/src/main/java/org/redisson/Redisson.java b/redisson/src/main/java/org/redisson/Redisson.java index 6a17d84ef..b745ade7e 100755 --- a/redisson/src/main/java/org/redisson/Redisson.java +++ b/redisson/src/main/java/org/redisson/Redisson.java @@ -15,14 +15,6 @@ */ package org.redisson; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -69,7 +61,6 @@ import org.redisson.api.RSortedSet; import org.redisson.api.RTopic; import org.redisson.api.RedissonReactiveClient; import org.redisson.client.codec.Codec; -import org.redisson.client.protocol.RedisCommands; import org.redisson.codec.SerializationCodec; import org.redisson.command.CommandExecutor; import org.redisson.command.CommandSyncService; @@ -82,7 +73,6 @@ import org.redisson.liveobject.provider.DefaultResolverProvider; import org.redisson.liveobject.provider.ResolverProvider; import org.redisson.pubsub.SemaphorePubSub; -import io.netty.util.concurrent.Future; import io.netty.util.internal.PlatformDependent; /** @@ -192,64 +182,6 @@ public class Redisson implements RedissonClient { return new RedissonBuckets(this, codec, commandExecutor); } - @Override - public List> findBuckets(String pattern) { - Collection keys = commandExecutor.get(commandExecutor., String>readAllAsync(RedisCommands.KEYS, pattern)); - List> buckets = new ArrayList>(keys.size()); - for (String key : keys) { - if(key == null) { - continue; - } - buckets.add(this.getBucket(key)); - } - return buckets; - } - - @Override - public Map loadBucketValues(Collection keys) { - return loadBucketValues(keys.toArray(new String[keys.size()])); - } - - @Override - public Map loadBucketValues(String ... keys) { - if (keys.length == 0) { - return Collections.emptyMap(); - } - - Future> future = commandExecutor.readAsync(keys[0], RedisCommands.MGET, keys); - List values = commandExecutor.get(future); - Map result = new HashMap(values.size()); - int index = 0; - for (Object value : values) { - if(value == null) { - index++; - continue; - } - result.put(keys[index], (V)value); - index++; - } - return result; - } - - @Override - public void saveBuckets(Map buckets) { - if (buckets.isEmpty()) { - return; - } - - List params = new ArrayList(buckets.size()); - for (Entry entry : buckets.entrySet()) { - params.add(entry.getKey()); - try { - params.add(config.getCodec().getValueEncoder().encode(entry.getValue())); - } catch (IOException e) { - throw new IllegalArgumentException(e); - } - } - - commandExecutor.write(params.get(0).toString(), RedisCommands.MSET, params.toArray()); - } - @Override public RHyperLogLog getHyperLogLog(String name) { return new RedissonHyperLogLog(commandExecutor, name); diff --git a/redisson/src/main/java/org/redisson/RedissonClient.java b/redisson/src/main/java/org/redisson/RedissonClient.java index 508a80fbf..af0a12571 100755 --- a/redisson/src/main/java/org/redisson/RedissonClient.java +++ b/redisson/src/main/java/org/redisson/RedissonClient.java @@ -15,9 +15,6 @@ */ package org.redisson; -import java.util.Collection; -import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import org.redisson.api.ClusterNodesGroup; @@ -173,30 +170,6 @@ public interface RedissonClient { */ RBuckets getBuckets(Codec codec); - /** - * Use {@link RBuckets#find(String)} - */ - @Deprecated - List> findBuckets(String pattern); - - /** - * Use {@link RBuckets#get(String...)} - */ - @Deprecated - Map loadBucketValues(Collection keys); - - /** - * Use {@link RBuckets#get(String...)} - */ - @Deprecated - Map loadBucketValues(String ... keys); - - /** - * Use {@link RBuckets#set(Map)} - */ - @Deprecated - void saveBuckets(Map buckets); - /** * Returns HyperLogLog instance by name. *