fix: add missing MinimalStage check for Cffu#getSuccessNow() method…

… 👀change `getSuccessNow` method parameter type to `CompletableFuture` from `CompletionStage` ⚠️
foldright · May 23, 2024 · 61125ed · 61125ed
1 parent 0f18ed5
commit 61125ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cffu-core/src/main/java/io/foldright/cffu/Cffu.java b/cffu-core/src/main/java/io/foldright/cffu/Cffu.java
@@ -1656,6 +1656,7 @@ public T getNow(T valueIfAbsent) {
     @Contract(pure = true)
     @Nullable
     public T getSuccessNow(@Nullable T valueIfNotSuccess) {
+        checkMinimalStage();
         return CompletableFutureUtils.getSuccessNow(cf, valueIfNotSuccess);
     }
 

diff --git a/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java b/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java
@@ -190,13 +190,13 @@ public static <T> CompletableFuture<List<T>> allResultsOfFastFail(CompletionStag
      * the given stages in the given time({@code timeout}), aka as many results as possible in the given time.
      * <p>
      * If the given stage is successful, its result is the completed value; Otherwise the given valueIfNotSuccess.
-     * (aka the result extraction logic is {@link #getSuccessNow(CompletionStage, Object)}).
+     * (aka the result extraction logic is {@link #getSuccessNow(CompletableFuture, Object)}).
      *
      * @param timeout           how long to wait in units of {@code unit}
      * @param unit              a {@code TimeUnit} determining how to interpret the {@code timeout} parameter
      * @param valueIfNotSuccess the value to return if not completed successfully
      * @param cfs               the stages
-     * @see #getSuccessNow(CompletionStage, Object)
+     * @see #getSuccessNow(CompletableFuture, Object)
      */
     // * @see #MGetSuccessNow(Object, CompletionStage[])
     @Contract(pure = true)
@@ -1346,9 +1346,8 @@ public static <T> T join(CompletableFuture<T> cf, long timeout, TimeUnit unit) {
     // * @see #MGetSuccessNow(Object, CompletionStage[])
     @Contract(pure = true)
     @Nullable
-    public static <T> T getSuccessNow(CompletionStage<? extends T> cf, @Nullable T valueIfNotSuccess) {
-        final CompletableFuture<T> f = toCf(cf);
-        return f.isDone() && !f.isCompletedExceptionally() ? f.join() : valueIfNotSuccess;
+    public static <T> T getSuccessNow(CompletableFuture<? extends T> cf, @Nullable T valueIfNotSuccess) {
+        return cf.isDone() && !cf.isCompletedExceptionally() ? cf.join() : valueIfNotSuccess;
     }
 
     /**
@@ -1473,11 +1472,11 @@ public static CffuState state(CompletableFuture<?> cf) {
     /**
      * Multi-Gets(MGet) the results in the <strong>same order</strong> of the given cfs,
      * use the result value if the given stage is completed successfully, else use the given valueIfNotSuccess
-     * (aka the result extraction logic is {@link #getSuccessNow(CompletionStage, Object)}).
+     * (aka the result extraction logic is {@link #getSuccessNow(CompletableFuture, Object)}).
      *
      * @param cfs the stages
      * @see #mostResultsOfSuccess(long, TimeUnit, Object, CompletionStage[])
-     * @see #getSuccessNow(CompletionStage, Object)
+     * @see #getSuccessNow(CompletableFuture, Object)
      */
     @Contract(pure = true)
     @SafeVarargs

diff --git a/cffu-kotlin/src/main/java/io/foldright/cffu/kotlin/CompletableFutureExtensions.kt b/cffu-kotlin/src/main/java/io/foldright/cffu/kotlin/CompletableFutureExtensions.kt
@@ -1011,7 +1011,7 @@ fun <T> CompletableFuture<T>.join(timeout: Long, unit: TimeUnit): T =
  * @return the result value, if completed successfully, else the given valueIfNotSuccess
  */
 @Suppress("UNCHECKED_CAST")
-fun <T> CompletionStage<T>.getSuccessNow(valueIfNotSuccess: T): T =
+fun <T> CompletableFuture<T>.getSuccessNow(valueIfNotSuccess: T): T =
     CompletableFutureUtils.getSuccessNow(this, valueIfNotSuccess) as T
 
 /**