perf: use cffuCompleteOnTimeout instead of cffuOrTimeout in `most…

…Of*` methods for multiply input cfs ⚡️ `cffuCompleteOnTimeout` won't create `TimeoutException`
foldright · Jun 6, 2024 · ed817b9 · ed817b9
1 parent 2c00e27
commit ed817b9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java b/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java
@@ -254,7 +254,7 @@ public static <T> CompletableFuture<List<T>> mostResultsOfSuccess(
         // MUST be non-minimal-stage CF instances in order to read results(`getSuccessNow`),
         // otherwise UnsupportedOperationException
         final CompletableFuture<T>[] cfArray = f_toNonMinCfArray(cfs);
-        return cffuOrTimeout(CompletableFuture.allOf(cfArray), executorWhenTimeout, timeout, unit)
+        return cffuCompleteOnTimeout(CompletableFuture.allOf(cfArray), null, executorWhenTimeout, timeout, unit)
                 .handle((unused, ex) -> arrayList(MGetSuccessNow0(valueIfNotSuccess, cfArray)));
     }
 
@@ -800,7 +800,7 @@ private static <T> CompletableFuture<T> mostTupleOfSuccess0(
         // MUST be *Non-Minimal* CF instances in order to read results(`getSuccessNow`),
         // otherwise UnsupportedOperationException
         final CompletableFuture<Object>[] cfArray = f_toNonMinCfArray(css);
-        return cffuOrTimeout(CompletableFuture.allOf(cfArray), executorWhenTimeout, timeout, unit)
+        return cffuCompleteOnTimeout(CompletableFuture.allOf(cfArray), null, executorWhenTimeout, timeout, unit)
                 .handle((unused, ex) -> tupleOf0(MGetSuccessNow0(null, cfArray)));
     }
 
@@ -1513,8 +1513,7 @@ public static <C extends CompletableFuture<?>> C cffuOrTimeout(
         requireNonNull(executorWhenTimeout, "executorWhenTimeout is null");
         requireNonNull(unit, "unit is null");
 
-        final C f = orTimeout(cf, timeout, unit);
-        return hopExecutorIfAtCfDelayerThread(f, executorWhenTimeout);
+        return hopExecutorIfAtCfDelayerThread(orTimeout(cf, timeout, unit), executorWhenTimeout);
     }
 
     /**
@@ -1589,8 +1588,7 @@ C cffuCompleteOnTimeout(C cf, @Nullable T value, Executor executorWhenTimeout, l
         requireNonNull(executorWhenTimeout, "executorWhenTimeout is null");
         requireNonNull(unit, "unit is null");
 
-        final C f = completeOnTimeout(cf, value, timeout, unit);
-        return hopExecutorIfAtCfDelayerThread(f, executorWhenTimeout);
+        return hopExecutorIfAtCfDelayerThread(completeOnTimeout(cf, value, timeout, unit), executorWhenTimeout);
     }
 
     /**