Merge branch 'master' of github.com:eclipse/jnosql-diana-driver

eclipse · Jan 18, 2018 · 0e90c2c · 0e90c2c
2 parents 52d1bd5 + 62e1c45
commit 0e90c2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/redis-driver/src/main/java/org/jnosql/diana/redis/key/RedisSet.java b/redis-driver/src/main/java/org/jnosql/diana/redis/key/RedisSet.java
@@ -31,8 +31,12 @@ class RedisSet<T> extends RedisCollection<T> implements Set<T> {
     @Override
     public boolean add(T e) {
         Objects.requireNonNull(e);
-        jedis.sadd(keyWithNameSpace, JSONB.toJson(e));
-        return false;
+        if (isString) {
+            jedis.sadd(keyWithNameSpace, e.toString());
+        } else {
+            jedis.sadd(keyWithNameSpace, JSONB.toJson(e));
+        }
+        return true;
     }
 
     @Override
@@ -92,7 +96,7 @@ protected List<T> toArrayList() {
         Set<String> redisValues = jedis.smembers(keyWithNameSpace);
         List<T> list = new ArrayList<>();
         for (String redisValue : redisValues) {
-            if(isString) {
+            if (isString) {
                 list.add((T) redisValue);
             } else {
                 list.add(JSONB.fromJson(redisValue, clazz));

diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetStringTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetStringTest.java
@@ -23,6 +23,7 @@
 
 import java.util.Set;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class RedisSetStringTest {
@@ -44,6 +45,14 @@ public void shouldAddUsers() {
         users.add("otaviojava");
         assertTrue(users.size() == 1);
 
+        String user = users.iterator().next();
+        assertEquals("otaviojava", user);
+    }
+
+    @Test
+    public void shouldRemoveSet() {
+        assertTrue(users.isEmpty());
+        users.add("otaviojava");
         users.remove("otaviojava");
         assertTrue(users.isEmpty());
     }