From cdcf1bdfa18d26fde5523be8eb796bf481947667 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 21 Jan 2016 16:16:18 +0300
Subject: [PATCH] readAll and readAllAsync methods added to RSet. #374

---
 src/main/java/org/redisson/RedissonSet.java         | 13 ++++++++++---
 .../org/redisson/client/protocol/RedisCommands.java |  2 +-
 src/main/java/org/redisson/core/RSet.java           |  7 +++++++
 src/main/java/org/redisson/core/RSetAsync.java      |  9 +++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/redisson/RedissonSet.java b/src/main/java/org/redisson/RedissonSet.java
index fd480eb86..0b16b9fbb 100644
--- a/src/main/java/org/redisson/RedissonSet.java
+++ b/src/main/java/org/redisson/RedissonSet.java
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
@@ -143,19 +144,25 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V> {
         };
     }
 
-    private Future<Collection<V>> readAllAsync() {
+    @Override
+    public Future<Set<V>> readAllAsync() {
         return commandExecutor.readAsync(getName(), codec, RedisCommands.SMEMBERS, getName());
     }
 
+    @Override
+    public Set<V> readAll() {
+        return get(readAllAsync());
+    }
+
     @Override
     public Object[] toArray() {
-        List<Object> res = (List<Object>) get(readAllAsync());
+        Set<Object> res = (Set<Object>) get(readAllAsync());
         return res.toArray();
     }
 
     @Override
     public <T> T[] toArray(T[] a) {
-        List<Object> res = (List<Object>) get(readAllAsync());
+        Set<Object> res = (Set<Object>) get(readAllAsync());
         return res.toArray(a);
     }
 
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommands.java b/src/main/java/org/redisson/client/protocol/RedisCommands.java
index b5b088035..e56afa4a9 100644
--- a/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -110,7 +110,7 @@ public interface RedisCommands {
     RedisCommand<Boolean> SADD_SINGLE = new RedisCommand<Boolean>("SADD", new BooleanReplayConvertor(), 2);
     RedisCommand<Boolean> SREM_SINGLE = new RedisCommand<Boolean>("SREM", new BooleanReplayConvertor(), 2);
     RedisCommand<Boolean> SMOVE = new RedisCommand<Boolean>("SMOVE", new BooleanReplayConvertor(), 3);
-    RedisCommand<List<Object>> SMEMBERS = new RedisCommand<List<Object>>("SMEMBERS", new ObjectListReplayDecoder<Object>());
+    RedisCommand<Set<Object>> SMEMBERS = new RedisCommand<Set<Object>>("SMEMBERS", new ObjectSetReplayDecoder());
     RedisCommand<ListScanResult<Object>> SSCAN = new RedisCommand<ListScanResult<Object>>("SSCAN", new NestedMultiDecoder(new ObjectListReplayDecoder<Object>(), new ListScanResultReplayDecoder()), ValueType.OBJECT);
     RedisCommand<ListScanResult<Object>> EVAL_SSCAN = new RedisCommand<ListScanResult<Object>>("EVAL", new NestedMultiDecoder(new ObjectListReplayDecoder<Object>(), new ListScanResultReplayDecoder()), ValueType.OBJECT);
     RedisCommand<Boolean> SISMEMBER = new RedisCommand<Boolean>("SISMEMBER", new BooleanReplayConvertor(), 2);
diff --git a/src/main/java/org/redisson/core/RSet.java b/src/main/java/org/redisson/core/RSet.java
index e4961a9b8..fc7761607 100644
--- a/src/main/java/org/redisson/core/RSet.java
+++ b/src/main/java/org/redisson/core/RSet.java
@@ -43,4 +43,11 @@ public interface RSet<V> extends Set<V>, RExpirable, RSetAsync<V> {
      */
     boolean move(String destination, V member);
 
+    /**
+     * Read all elements at once
+     *
+     * @return
+     */
+    Set<V> readAll();
+
 }
diff --git a/src/main/java/org/redisson/core/RSetAsync.java b/src/main/java/org/redisson/core/RSetAsync.java
index 9ecdd9eb9..9ab86b013 100644
--- a/src/main/java/org/redisson/core/RSetAsync.java
+++ b/src/main/java/org/redisson/core/RSetAsync.java
@@ -15,6 +15,8 @@
  */
 package org.redisson.core;
 
+import java.util.Set;
+
 import io.netty.util.concurrent.Future;
 
 /**
@@ -44,4 +46,11 @@ public interface RSetAsync<V> extends RCollectionAsync<V> {
      */
     Future<Boolean> moveAsync(String destination, V member);
 
+    /**
+     * Read all elements at once
+     *
+     * @return
+     */
+    Future<Set<V>> readAllAsync();
+
 }