From f9c76f097755cb006987311c35866635061b02f5 Mon Sep 17 00:00:00 2001
From: Jerry Lee <oldratlee@gmail.com>
Date: Sat, 14 Dec 2024 18:34:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20extract=20`safeHandle0`=20methods?=
 =?UTF-8?q?=20to=20`LLCF`=20=F0=9F=94=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cffu/CompletableFutureUtils.java          | 36 ++++---------------
 .../src/main/java/io/foldright/cffu/LLCF.java | 31 ++++++++++++++++
 2 files changed, 37 insertions(+), 30 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
index 0450fcc7..4d2954c1 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java
@@ -16,7 +16,6 @@
 import java.util.function.*;
 
 import static io.foldright.cffu.Delayer.atCfDelayerThread;
-import static io.foldright.cffu.ExceptionReporter.reportUncaughtException;
 import static io.foldright.cffu.InternalCommonUtils.*;
 import static io.foldright.cffu.LLCF.*;
 import static java.util.Objects.requireNonNull;
@@ -3061,17 +3060,10 @@ C completeOnTimeout(C cfThis, @Nullable T value, long timeout, TimeUnit unit) {
     private static <C extends CompletableFuture<?>> C hopExecutorIfAtCfDelayerThread(C cf, Executor executor) {
         CompletableFuture<Object> ret = newIncompleteFuture(cf);
 
-        cf.whenComplete((v, ex) -> {
-            try {
-                if (!atCfDelayerThread()) completeCf(ret, v, ex);
-                else screenExecutor(executor).execute(() -> completeCf(ret, v, ex));
-            } catch (Throwable e) {
-                if (ex != null) e.addSuppressed(ex);
-                reportUncaughtException("handle of executor hop", e);
-            }
-        });
-
-        return (C) ret;
+        return safeHandle0(cf, (v, ex) -> {
+            if (!atCfDelayerThread()) completeCf(ret, v, ex);
+            else screenExecutor(executor).execute(() -> completeCf(ret, v, ex));
+        }, "handle of executor hop");
     }
 
     private static void completeCf(CompletableFuture<Object> cf, Object value, @Nullable Throwable ex) {
@@ -3252,15 +3244,7 @@ C peek(C cfThis, BiConsumer<? super T, ? super Throwable> action) {
         requireNonNull(cfThis, "cfThis is null");
         requireNonNull(action, "action is null");
 
-        cfThis.whenComplete((v, ex) -> {
-            try {
-                action.accept(v, ex);
-            } catch (Throwable e) {
-                if (ex != null) e.addSuppressed(ex);
-                reportUncaughtException("the action of peek", e);
-            }
-        });
-        return cfThis;
+        return safeHandle0(cfThis, action, "the action of peek");
     }
 
     /**
@@ -3320,15 +3304,7 @@ C peekAsync(C cfThis, BiConsumer<? super T, ? super Throwable> action, Executor
         requireNonNull(action, "action is null");
         requireNonNull(executor, "executor is null");
 
-        cfThis.whenCompleteAsync((v, ex) -> {
-            try {
-                action.accept(v, ex);
-            } catch (Throwable e) {
-                if (ex != null) e.addSuppressed(ex);
-                reportUncaughtException("the action of peekAsync", e);
-            }
-        }, executor);
-        return cfThis;
+        return safeHandleAsync0(cfThis, action, "the action of peekAsync", executor);
     }
 
     // endregion
diff --git a/cffu-core/src/main/java/io/foldright/cffu/LLCF.java b/cffu-core/src/main/java/io/foldright/cffu/LLCF.java
index 9cbcac27..ae648f28 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/LLCF.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/LLCF.java
@@ -1,13 +1,17 @@
 package io.foldright.cffu;
 
+import org.jetbrains.annotations.Contract;
+
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ForkJoinPool;
+import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 
+import static io.foldright.cffu.ExceptionReporter.reportUncaughtException;
 import static io.foldright.cffu.InternalCommonUtils.mapArray;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -111,6 +115,33 @@ static <T> CompletableFuture<T> toNonMinCf0(CompletionStage<? extends T> s) {
         return isMinStageCf(f) ? f.toCompletableFuture() : f;
     }
 
+    @Contract("_, _, _ -> param1")
+    static <T, C extends CompletionStage<? extends T>>
+    C safeHandle0(C cfThis, BiConsumer<? super T, ? super Throwable> action, String where) {
+        cfThis.whenComplete((v, ex) -> {
+            try {
+                action.accept(v, ex);
+            } catch (Throwable e) {
+                if (ex != null) e.addSuppressed(ex);
+                reportUncaughtException(where, e);
+            }
+        });
+        return cfThis;
+    }
+
+    @Contract("_, _, _, _ -> param1")
+    static <T, C extends CompletionStage<? extends T>>
+    C safeHandleAsync0(C cfThis, BiConsumer<? super T, ? super Throwable> action, String where, Executor executor) {
+        cfThis.whenCompleteAsync((v, ex) -> {
+            try {
+                action.accept(v, ex);
+            } catch (Throwable e) {
+                if (ex != null) e.addSuppressed(ex);
+                reportUncaughtException(where, e);
+            }
+        }, executor);
+        return cfThis;
+    }
     /**
      * Converts CompletionStage to a non-minimal-stage CompletableFuture copy. This method is type safe.
      * <p>