Revert "Merge branch 'mrniko/master' into feature/travis-ci"

This reverts commit 2903622, reversing
changes made to d8189a1.

src/main/java/org/redisson/Redisson.java

@@ -47,7 +47,6 @@
 import org.redisson.core.RBlockingQueue;
 import org.redisson.core.RBloomFilter;
 import org.redisson.core.RBucket;
-import org.redisson.core.RBuckets;
 import org.redisson.core.RCountDownLatch;
 import org.redisson.core.RDeque;
 import org.redisson.core.RGeo;
@@ -203,16 +202,6 @@ public <V> RBucket<V> getBucket(String name, Codec codec) {
         return new RedissonBucket<V>(codec, commandExecutor, name);
     }
 
-    @Override
-    public RBuckets getBuckets() {
-        return new RedissonBuckets(this, commandExecutor);
-    }
-
-    @Override
-    public RBuckets getBuckets(Codec codec) {
-        return new RedissonBuckets(this, codec, commandExecutor);
-    }
-
     @Override
     public <V> List<RBucket<V>> findBuckets(String pattern) {
         Collection<String> keys = commandExecutor.get(commandExecutor.<List<String>, String>readAllAsync(RedisCommands.KEYS, pattern));
@@ -271,6 +260,11 @@ public void saveBuckets(Map<String, ?> buckets) {
         commandExecutor.write(params.get(0).toString(), RedisCommands.MSET, params.toArray());
     }
 
+    @Override
+    public <V> List<RBucket<V>> getBuckets(String pattern) {
+        return findBuckets(pattern);
+    }
+
     @Override
     public <V> RHyperLogLog<V> getHyperLogLog(String name) {
         return new RedissonHyperLogLog<V>(commandExecutor, name);
@@ -543,6 +537,16 @@ public NodesGroup<ClusterNode> getClusterNodesGroup() {
         return new RedisNodes<ClusterNode>(connectionManager);
     }
 
+    @Override
+    public void flushdb() {
+        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHDB));
+    }
+
+    @Override
+    public void flushall() {
+        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
+    }
+
     @Override
     public boolean isShutdown() {
         return connectionManager.isShutdown();

src/main/java/org/redisson/RedissonClient.java

@@ -31,7 +31,6 @@
 import org.redisson.core.RBlockingQueue;
 import org.redisson.core.RBloomFilter;
 import org.redisson.core.RBucket;
-import org.redisson.core.RBuckets;
 import org.redisson.core.RCountDownLatch;
 import org.redisson.core.RDeque;
 import org.redisson.core.RGeo;
@@ -152,43 +151,57 @@ public interface RedissonClient {
     <V> RBucket<V> getBucket(String name, Codec codec);
 
     /**
-     * Returns interface for mass operations with Bucket objects.
+     * <p>Returns a list of object holder instances by a key pattern.
      *
+     * <pre>Supported glob-style patterns:
+     *    h?llo subscribes to hello, hallo and hxllo
+     *    h*llo subscribes to hllo and heeeello
+     *    h[ae]llo subscribes to hello and hallo, but not hillo
+     *    h[^e]llo matches hallo, hbllo, ... but not hello
+     *    h[a-b]llo matches hallo and hbllo</pre>
+     * <p>Use \ to escape special characters if you want to match them verbatim.
+     *
+     * <p>Uses <code>KEYS</code> Redis command.
+     *
+     * @param pattern
      * @return
      */
-    RBuckets getBuckets();
+    <V> List<RBucket<V>> findBuckets(String pattern);
 
     /**
-     * Returns interface for mass operations with Bucket objects
-     * using provided codec for object.
+     * <p>Returns Redis object mapped by key. Result Map is not contains
+     * key-value entry for null values.
      *
+     * <p>Uses <code>MGET</code> Redis command.
+     *
+     * @param keys
      * @return
      */
-    RBuckets getBuckets(Codec codec);
-
-    /**
-     * Use {@link RBuckets#find(String)}
-     */
-    @Deprecated
-    <V> List<RBucket<V>> findBuckets(String pattern);
+    <V> Map<String, V> loadBucketValues(Collection<String> keys);
 
     /**
-     * Use {@link RBuckets#get(String...)}
+     * <p>Returns Redis object mapped by key. Result Map is not contains
+     * key-value entry for null values.
+     *
+     * <p>Uses <code>MGET</code> Redis command.
+     *
+     * @param keys
+     * @return
      */
-    @Deprecated
-    <V> Map<String, V> loadBucketValues(Collection<String> keys);
+    <V> Map<String, V> loadBucketValues(String ... keys);
 
     /**
-     * Use {@link RBuckets#get(String...)}
+     * Saves Redis object mapped by key.
+     *
+     * @param buckets
      */
-    @Deprecated
-    <V> Map<String, V> loadBucketValues(String ... keys);
+    void saveBuckets(Map<String, ?> buckets);
 
     /**
-     * Use {@link RBuckets#set(Map)}
+     * Use {@link #findBuckets(String)}
      */
     @Deprecated
-    void saveBuckets(Map<String, ?> buckets);
+    <V> List<RBucket<V>> getBuckets(String pattern);
 
     /**
      * Returns HyperLogLog instance by name.
@@ -645,6 +658,18 @@ public interface RedissonClient {
      */
     NodesGroup<ClusterNode> getClusterNodesGroup();
 
+    /**
+     * Use {@link RKeys#flushdb()}
+     */
+    @Deprecated
+    void flushdb();
+
+    /**
+     * Use {@link RKeys#flushall()}
+     */
+    @Deprecated
+    void flushall();
+
     /**
      * Returns {@code true} if this Redisson instance has been shut down.
      *

src/main/java/org/redisson/RedissonGeo.java

@@ -104,7 +104,7 @@ public Future<Map<V, String>> hashAsync(V... members) {
         List<Object> params = new ArrayList<Object>(members.length + 1);
         params.add(getName());
         params.addAll(Arrays.asList(members));
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEOHASH", new MapGetAllDecoder(params, 1), 2, ValueType.OBJECTS);
+        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEOHASH", new MapGetAllDecoder(params), 2, ValueType.OBJECTS);
         return commandExecutor.readAsync(getName(), new ScoredCodec(codec), command, params.toArray());
     }