Docking hybrid tasks

pizihao · Jun 23, 2022 · 5b55e50 · 5b55e50
1 parent 48d2866
commit 5b55e50
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/com/deep/crow/FixedMultiTools.java b/src/main/java/com/deep/crow/FixedMultiTools.java
@@ -2,6 +2,7 @@
 
 import com.deep.crow.multi.Multi;
 import com.deep.crow.multi.MultiHelper;
+import com.deep.crow.task.mix.MixMulti;
 import com.deep.crow.task.parallel.ParallelMulti;
 import com.deep.crow.task.serial.SerialMulti;
 import com.deep.crow.util.Tuple;
@@ -126,6 +127,12 @@ public ParallelMulti parallelMulti() {
         return ParallelMulti.of(executorService);
     }
 
+    // ================================ParallelMulti====================================
+
+    public <T> MixMulti<T> mixMulti(T obj) {
+        return MixMulti.of(obj, executorService);
+    }
+
     // ======================================操作=========================================
 
     /**

diff --git a/src/main/java/com/deep/crow/MultiTools.java b/src/main/java/com/deep/crow/MultiTools.java
@@ -2,6 +2,7 @@
 
 import com.deep.crow.multi.Multi;
 import com.deep.crow.multi.MultiHelper;
+import com.deep.crow.task.mix.MixMulti;
 import com.deep.crow.task.parallel.ParallelMulti;
 import com.deep.crow.task.serial.SerialMulti;
 import com.deep.crow.util.Tuple;
@@ -106,6 +107,12 @@ public static ParallelMulti parallelMulti() {
     }
 
 
+    // ================================MixMulti====================================
+
+    public static <T> MixMulti<T> mixMulti(T obj, ExecutorService executorService) {
+        return MixMulti.of(obj, executorService);
+    }
+
     // ================================操作====================================
 
     /**

diff --git a/src/main/java/com/deep/crow/task/mix/MixMulti.java b/src/main/java/com/deep/crow/task/mix/MixMulti.java
@@ -61,11 +61,15 @@ public class MixMulti<T> {
      */
     Consumer<Throwable> fn;
 
-    public MixMulti(T obj, ExecutorService executorService) {
+    private MixMulti(T obj, ExecutorService executorService) {
         this.obj = obj;
         this.executorService = executorService;
     }
 
+    public static <T> MixMulti<T> of(T obj, ExecutorService executorService) {
+        return new MixMulti<>(obj, executorService);
+    }
+
     /**
      * <h2>添加任务。前置任务默认为开始节点</h2>
      * 无需验证前置任务是否已完成

diff --git a/src/test/java/com/deep/crow/task/mix/MixMultiTest.java b/src/test/java/com/deep/crow/task/mix/MixMultiTest.java
@@ -26,7 +26,7 @@ public class MixMultiTest extends TestCase {
 
     public void testAdd() {
         User user = new User();
-        MixMulti<User> mixMulti = new MixMulti<>(user, executorService)
+        MixMulti<User> mixMulti = MixMulti.of(user, executorService)
             .add("B", o -> wait(o, "B", 3))
             .add("C", o -> wait(o, "C", 2))
             .add("D", o -> wait(o, "D", 0), "B", "C")
@@ -41,7 +41,7 @@ public void testAdd() {
 
     public void testAddThrowable() {
         User user = new User();
-        MixMulti<User> mixMulti = new MixMulti<>(user, executorService)
+        MixMulti<User> mixMulti = MixMulti.of(user, executorService)
             .add("B", o -> wait(o, "B", 3))
             .add("C", o -> wait(o, "C", 2))
             .add("D", o -> wait(o, "D", 0), "B", "C")