Merge pull request #388 from KamToHung/feat-387

[ISSUE #387] Optimized ThreadPoolBuilder code
dromara · Jan 8, 2024 · 66c4fcc · 66c4fcc
2 parents 38d2e72 + fc83642
commit 66c4fcc
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 9 deletions.
diff --git a/core/src/main/java/org/dromara/dynamictp/core/support/ThreadPoolBuilder.java b/core/src/main/java/org/dromara/dynamictp/core/support/ThreadPoolBuilder.java
@@ -334,26 +334,99 @@ public ThreadPoolBuilder waitForTasksToCompleteOnShutdown(boolean waitForTasksTo
         return this;
     }
 
+    /**
+     * @param eager true or false
+     * @return the ThreadPoolBuilder instance
+     * @deprecated use {@link #eager()} instead
+     */
+    @Deprecated
     public ThreadPoolBuilder eager(boolean eager) {
+        checkExecutorType();
         this.eager = eager;
         return this;
     }
 
+    /**
+     * @param ordered true or false
+     * @return the ThreadPoolBuilder instance
+     * @deprecated use {@link #ordered()} instead
+     */
+    @Deprecated
     public ThreadPoolBuilder ordered(boolean ordered) {
+        checkExecutorType();
         this.ordered = ordered;
         return this;
     }
 
+    /**
+     * @param scheduled true or false
+     * @return the ThreadPoolBuilder instance
+     * @deprecated use {@link #scheduled()} instead
+     */
+    @Deprecated
     public ThreadPoolBuilder scheduled(boolean scheduled) {
+        checkExecutorType();
         this.scheduled = scheduled;
         return this;
     }
 
+    /**
+     * @param priority true or false
+     * @return the ThreadPoolBuilder instance
+     * @deprecated use {@link #priority()} instead
+     */
+    @Deprecated
     public ThreadPoolBuilder priority(boolean priority) {
+        checkExecutorType();
         this.priority = priority;
         return this;
     }
 
+    /**
+     * set eager type
+     *
+     * @return the ThreadPoolBuilder instance
+     */
+    public ThreadPoolBuilder eager() {
+        checkExecutorType();
+        this.eager = true;
+        return this;
+    }
+
+    /**
+     * set ordered type
+     *
+     * @return the ThreadPoolBuilder instance
+     */
+    public ThreadPoolBuilder ordered() {
+        checkExecutorType();
+        this.ordered = true;
+        return this;
+    }
+
+    /**
+     * set scheduled type
+     *
+     * @return the ThreadPoolBuilder instance
+     */
+    public ThreadPoolBuilder scheduled() {
+        checkExecutorType();
+        this.scheduled = true;
+        return this;
+    }
+
+    /**
+     * set priority type
+     *
+     * @return the ThreadPoolBuilder instance
+     */
+    public ThreadPoolBuilder priority() {
+        checkExecutorType();
+        this.priority = true;
+        return this;
+    }
+
+
     public ThreadPoolBuilder preStartAllCoreThreads(boolean preStartAllCoreThreads) {
         this.preStartAllCoreThreads = preStartAllCoreThreads;
         return this;
@@ -602,4 +675,15 @@ private ThreadPoolExecutor buildCommonExecutor(ThreadPoolBuilder builder) {
         executor.allowCoreThreadTimeOut(builder.allowCoreThreadTimeOut);
         return executor;
     }
+
+    /**
+     * Check executor type.
+     */
+    private void checkExecutorType() {
+        if (eager || ordered || scheduled || priority) {
+            // 抛异常
+            throw new IllegalArgumentException("More than one executor type is defined");
+        }
+    }
+
 }
diff --git a/...le-apollo/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...le-apollo/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...sul-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...sul-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...mple-etcd/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...mple-etcd/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...wei-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...wei-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...cos-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...cos-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...ple-nacos/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...ple-nacos/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...ris-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...ris-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...per-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...per-cloud/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...zookeeper/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java b/...zookeeper/src/main/java/org/dromara/dynamictp/example/config/ThreadPoolConfiguration.java
@@ -105,7 +105,7 @@ public DtpExecutor eagerDtpExecutor() {
                 .corePoolSize(2)
                 .maximumPoolSize(4)
                 .queueCapacity(2000)
-                .eager(true)
+                .eager()
                 .buildDynamic();
     }
 

diff --git a/...est-core/src/test/java/org/dromara/dynamictp/test/core/support/ThreadPoolBuilderTest.java b/...est-core/src/test/java/org/dromara/dynamictp/test/core/support/ThreadPoolBuilderTest.java
@@ -0,0 +1,21 @@
+package org.dromara.dynamictp.test.core.support;
+
+import org.dromara.dynamictp.core.support.ThreadPoolBuilder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author <a href = "mailto:[email protected]">KamTo Hung</a>
+ */
+public class ThreadPoolBuilderTest {
+
+    @Test
+    void testBuildDynamic() {
+        Assertions.assertThrows(IllegalArgumentException.class,() -> ThreadPoolBuilder.newBuilder()
+                .threadPoolName("dtpExecutor1")
+                .priority()
+                .ordered()
+                .buildDynamic());
+    }
+
+}