diff --git a/redisson/src/main/java/org/redisson/command/CommandAsyncService.java b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java index 782bb9561..43cf7de7a 100644 --- a/redisson/src/main/java/org/redisson/command/CommandAsyncService.java +++ b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java @@ -31,10 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import org.redisson.SlotCallback; -import org.redisson.api.RFuture; -import org.redisson.api.RedissonClient; -import org.redisson.api.RedissonReactiveClient; -import org.redisson.api.RedissonRxClient; +import org.redisson.api.*; import org.redisson.cache.LRUCacheMap; import org.redisson.client.RedisClient; import org.redisson.client.RedisException; @@ -654,9 +651,9 @@ public class CommandAsyncService implements CommandAsyncExecutor { RPromise result = new RedissonPromise<>(); AtomicReference failed = new AtomicReference<>(); AtomicLong executed = new AtomicLong(range2key.size()); - BiConsumer, Throwable> listener = (t, u) -> { + BiConsumer, Throwable> listener = (t, u) -> { if (u == null) { - for (T res : (List) t) { + for (T res : (List) t.getResponses()) { if (res != null) { callback.onSlotResult(res); } @@ -690,7 +687,7 @@ public class CommandAsyncService implements CommandAsyncExecutor { } } - RFuture> future = executorService.executeAsync(); + RFuture> future = executorService.executeAsync(); future.onComplete(listener); } diff --git a/redisson/src/main/java/org/redisson/command/CommandBatchService.java b/redisson/src/main/java/org/redisson/command/CommandBatchService.java index 40dfebc12..b5dee71f2 100644 --- a/redisson/src/main/java/org/redisson/command/CommandBatchService.java +++ b/redisson/src/main/java/org/redisson/command/CommandBatchService.java @@ -173,7 +173,7 @@ public class CommandBatchService extends CommandAsyncService { return promise; } - public RFuture> executeAsync() { + public RFuture> executeAsync() { return executeAsync(BatchOptions.defaults()); } @@ -184,7 +184,7 @@ public class CommandBatchService extends CommandAsyncService { if (commands.isEmpty()) { executed.set(true); - BatchResult result = new BatchResult(Collections.emptyList(), 0); + BatchResult result = new BatchResult<>(Collections.emptyList(), 0); return (RFuture) RedissonPromise.newSucceededFuture(result); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java index 3cf194656..7a15a1b59 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java @@ -224,7 +224,7 @@ public class RedissonTransaction implements RTransaction { return; } - RFuture> transactionFuture = transactionExecutor.executeAsync(); + RFuture> transactionFuture = transactionExecutor.executeAsync(); transactionFuture.onComplete((r, exc) -> { if (exc != null) { result.tryFailure(new TransactionException("Unable to execute transaction", exc)); @@ -581,7 +581,7 @@ public class RedissonTransaction implements RTransaction { } RPromise result = new RedissonPromise<>(); - RFuture> future = executorService.executeAsync(); + RFuture> future = executorService.executeAsync(); future.onComplete((res, e) -> { if (e != null) { result.tryFailure(new TransactionException("Unable to rollback transaction", e));