From 1f45b65e255c51d689b773db3346c935660b8597 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 21 Dec 2022 09:50:19 +0300
Subject: [PATCH] refactoring

---
 .../main/java/org/redisson/RedissonSet.java   | 19 ++++++++-----------
 .../client/protocol/RedisCommands.java        |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonSet.java b/redisson/src/main/java/org/redisson/RedissonSet.java
index 7e2d822d3..336b2d926 100644
--- a/redisson/src/main/java/org/redisson/RedissonSet.java
+++ b/redisson/src/main/java/org/redisson/RedissonSet.java
@@ -26,6 +26,7 @@ import org.redisson.mapreduce.RedissonCollectionMapReduce;
 import org.redisson.misc.CompletableFutureWrapper;
 
 import java.util.*;
+import java.util.concurrent.CompletionStage;
 import java.util.stream.Stream;
 
 /**
@@ -379,7 +380,7 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V>, ScanIt
             return new CompletableFutureWrapper<>(0);
         }
 
-        List<Object> args = new ArrayList<Object>(c.size() + 1);
+        List<Object> args = new ArrayList<>(c.size() + 1);
         args.add(getRawName());
         encode(args, c);
 
@@ -389,29 +390,25 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V>, ScanIt
     @Override
     public RFuture<List<V>> containsEachAsync(Collection<V> c) {
         if (c.isEmpty()) {
-            return RedissonPromise.newSucceededFuture(Collections.emptyList());
+            return new CompletableFutureWrapper<>(Collections.emptyList());
         }
-        List<Object> args = new ArrayList<Object>(c.size() + 1);
+
+        List<Object> args = new ArrayList<>(c.size() + 1);
         args.add(getRawName());
         encode(args, c);
 
         RFuture<List<Long>> future = commandExecutor.readAsync(getRawName(), codec, RedisCommands.SMISMEMBER, args.toArray());
         List<V> keysToCheck = new ArrayList<>(c);
-        RPromise<List<V>> result = new RedissonPromise<>();
-        future.onComplete((res, e) -> {
-            if (e != null) {
-                result.tryFailure(e);
-                return;
-            }
+        CompletionStage<List<V>> f = future.thenApply(res -> {
             List<V> containedKeys = new ArrayList<>();
             for (int i = 0; i < res.size(); i++) {
                 if (res.get(i) == 1) {
                     containedKeys.add(keysToCheck.get(i));
                 }
             }
-            result.trySuccess(containedKeys);
+            return containedKeys;
         });
-        return result;
+        return new CompletableFutureWrapper<>(f);
     }
 
     @Override
diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
index 05af6e306..ada7f0fc2 100644
--- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -215,7 +215,7 @@ public interface RedisCommands {
     RedisCommand<Set<Object>> SUNION = new RedisCommand<Set<Object>>("SUNION", new ObjectSetReplayDecoder<Object>());
     RedisCommand<Set<Object>> SDIFF = new RedisCommand<Set<Object>>("SDIFF", new ObjectSetReplayDecoder<Object>());
     RedisCommand<Set<Object>> SINTER = new RedisCommand<Set<Object>>("SINTER", new ObjectSetReplayDecoder<Object>());
-    RedisCommand<List<Long>> SMISMEMBER = new RedisCommand<List<Long>>("SMISMEMBER", new ObjectListReplayDecoder<Long>());
+    RedisCommand<List<Long>> SMISMEMBER = new RedisCommand<>("SMISMEMBER", new ObjectListReplayDecoder<Long>());
 
     RedisStrictCommand<Long> LPOS = new RedisStrictCommand<>("LPOS");
     RedisCommand<Void> LSET = new RedisCommand<Void>("LSET", new VoidReplayConvertor());