Use new List#toArray method

pivovarit · Oct 3, 2023 · 5bb65da · 5bb65da
1 parent 5220c26
commit 5bb65da
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java b/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java
@@ -1,7 +1,6 @@
 package com.pivovarit.collectors;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -79,14 +78,14 @@ public Set<Characteristics> characteristics() {
     }
 
     private static <T> CompletableFuture<Stream<T>> combine(List<CompletableFuture<T>> futures) {
-        CompletableFuture<T>[] futuresArray = (CompletableFuture<T>[]) futures.toArray(new CompletableFuture[0]);
-        CompletableFuture<Stream<T>> combined = allOf(futuresArray)
-          .thenApply(__ -> Arrays.stream(futuresArray).map(CompletableFuture::join));
-
-        for (CompletableFuture<?> f : futuresArray) {
-            f.exceptionally(ex -> {
-                combined.completeExceptionally(ex);
-                return null;
+        var combined = allOf(futures.toArray(CompletableFuture[]::new))
+          .thenApply(__ -> futures.stream().map(CompletableFuture::join));
+
+        for (var future : futures) {
+            future.whenComplete((o, ex) -> {
+                if (ex != null) {
+                    combined.completeExceptionally(ex);
+                }
             });
         }