refactor core wrapper related

Author: yanhom1314

common/src/main/java/org/dromara/dynamictp/common/entity/DtpExecutorProps.java

@@ -55,19 +55,6 @@ public class DtpExecutorProps extends TpExecutorProps {
      */
     private String threadNamePrefix = "dtp";
 
-    /**
-     * Whether to wait for scheduled tasks to complete on shutdown,
-     * not interrupting running tasks and executing all tasks in the queue.
-     */
-    private boolean waitForTasksToCompleteOnShutdown = true;
-
-    /**
-     * The maximum number of seconds that this executor is supposed to block
-     * on shutdown in order to wait for remaining tasks to complete their execution
-     * before the rest of the container continues to shut down.
-     */
-    private int awaitTerminationSeconds = 3;
-
     /**
      * If pre start all core threads.
      */

common/src/main/java/org/dromara/dynamictp/common/entity/TpExecutorProps.java

@@ -107,6 +107,19 @@ public class TpExecutorProps {
      */
     private boolean notifyEnabled = true;
 
+    /**
+     * Whether to wait for scheduled tasks to complete on shutdown,
+     * not interrupting running tasks and executing all tasks in the queue.
+     */
+    private boolean waitForTasksToCompleteOnShutdown = true;
+
+    /**
+     * The maximum number of seconds that this executor is supposed to block
+     * on shutdown in order to wait for remaining tasks to complete their execution
+     * before the rest of the container continues to shut down.
+     */
+    private int awaitTerminationSeconds = 3;
+
     /**
      * Task execute timeout, unit (ms).
      */
@@ -130,7 +143,7 @@ public class TpExecutorProps {
     /**
      * Aware names.
      */
-    private List<String> awareNames;
+    private Set<String> awareNames;
 
     /**
      * check core param is inValid

core/src/main/java/org/dromara/dynamictp/core/DtpRegistry.java

@@ -225,65 +225,40 @@ private static void doRefresh(ExecutorWrapper executorWrapper, DtpExecutorProps
         }
         // update queue
         updateQueueProps(executor, props);
-
-        if (executorWrapper.isDtpExecutor()) {
-            doRefreshDtp(executorWrapper, props);
-            return;
-        }
-        doRefreshCommon(executorWrapper, props);
+        doRefreshWrapper(executorWrapper, props);
     }
 
-    private static void doRefreshCommon(ExecutorWrapper executorWrapper, DtpExecutorProps props) {
+    private static void doRefreshWrapper(ExecutorWrapper executorWrapper, DtpExecutorProps props) {
 
         if (StringUtils.isNotBlank(props.getThreadPoolAliasName())) {
             executorWrapper.setThreadPoolAliasName(props.getThreadPoolAliasName());
         }
-
         ExecutorAdapter<?> executor = executorWrapper.getExecutor();
         // update reject handler
-        String currentRejectHandlerType = executor.getRejectHandlerType();
-        if (!Objects.equals(currentRejectHandlerType, props.getRejectedHandlerType())) {
+        executorWrapper.setRejectEnhanced(props.isRejectEnhanced());
+        if (!Objects.equals(executor.getRejectHandlerType(), props.getRejectedHandlerType())) {
             val rejectHandler = RejectHandlerGetter.buildRejectedHandler(props.getRejectedHandlerType());
-            executor.setRejectedExecutionHandler(rejectHandler);
+            executorWrapper.setRejectHandler(rejectHandler);
         }
+
+        // update task wrappers
         List<TaskWrapper> taskWrappers = TaskWrappers.getInstance().getByNames(props.getTaskWrapperNames());
         executorWrapper.setTaskWrappers(taskWrappers);
 
+        executorWrapper.setThreadPoolAliasName(props.getThreadPoolAliasName());
+        executorWrapper.setNotifyItems(props.getNotifyItems());
+        executorWrapper.setPlatformIds(props.getPlatformIds());
+        executorWrapper.setNotifyEnabled(props.isNotifyEnabled());
+        executorWrapper.setPreStartAllCoreThreads(props.isPreStartAllCoreThreads());
+        executorWrapper.setWaitForTasksToCompleteOnShutdown(props.isWaitForTasksToCompleteOnShutdown());
+        executorWrapper.setAwaitTerminationSeconds(props.getAwaitTerminationSeconds());
+        executorWrapper.setAwareNames(props.getAwareNames());
+
         // update notify related
         NotifyHelper.updateNotifyInfo(executorWrapper, props, dtpProperties.getPlatforms());
-        // update aware related
-        AwareManager.refresh(executorWrapper, props);
-    }
-
-    private static void doRefreshDtp(ExecutorWrapper executorWrapper, DtpExecutorProps props) {
 
-        DtpExecutor executor = (DtpExecutor) executorWrapper.getExecutor();
-        if (StringUtils.isNotBlank(props.getThreadPoolAliasName())) {
-            executor.setThreadPoolAliasName(props.getThreadPoolAliasName());
-        }
-        // update reject handler
-        executor.setRejectEnhanced(props.isRejectEnhanced());
-        if (!Objects.equals(executor.getRejectHandlerType(), props.getRejectedHandlerType())) {
-            executor.setRejectHandler(RejectHandlerGetter.buildRejectedHandler(props.getRejectedHandlerType()));
-        }
-        executor.setWaitForTasksToCompleteOnShutdown(props.isWaitForTasksToCompleteOnShutdown());
-        executor.setAwaitTerminationSeconds(props.getAwaitTerminationSeconds());
-        executor.setPreStartAllCoreThreads(props.isPreStartAllCoreThreads());
-        List<TaskWrapper> taskWrappers = TaskWrappers.getInstance().getByNames(props.getTaskWrapperNames());
-        executor.setTaskWrappers(taskWrappers);
-
-        // update notify related
-        NotifyHelper.updateNotifyInfo(executor, props, dtpProperties.getPlatforms());
         // update aware related
         AwareManager.refresh(executorWrapper, props);
-        updateWrapper(executorWrapper, executor);
-    }
-
-    private static void updateWrapper(ExecutorWrapper executorWrapper, DtpExecutor executor) {
-        executorWrapper.setThreadPoolAliasName(executor.getThreadPoolAliasName());
-        executorWrapper.setNotifyItems(executor.getNotifyItems());
-        executorWrapper.setPlatformIds(executor.getPlatformIds());
-        executorWrapper.setNotifyEnabled(executor.isNotifyEnabled());
     }
 
     /**

core/src/main/java/org/dromara/dynamictp/core/executor/DtpExecutor.java

@@ -25,8 +25,6 @@
 import org.dromara.dynamictp.common.entity.NotifyItem;
 import org.dromara.dynamictp.core.aware.AwareManager;
 import org.dromara.dynamictp.core.aware.TaskEnhanceAware;
-import org.dromara.dynamictp.core.notifier.manager.NotifyHelper;
-import org.dromara.dynamictp.core.reject.RejectHandlerGetter;
 import org.dromara.dynamictp.core.spring.SpringExecutor;
 import org.dromara.dynamictp.core.support.ExecutorAdapter;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrapper;
@@ -61,16 +59,6 @@ public class DtpExecutor extends ThreadPoolExecutor
      */
     protected String threadPoolName;
 
-    /**
-     * Simple Business alias Name of Dynamic ThreadPool. Use for notify.
-     */
-    private String threadPoolAliasName;
-
-    /**
-     * If enable notify.
-     */
-    private boolean notifyEnabled = true;
-
     /**
      * Notify items, see {@link NotifyItemEnum}.
      */
@@ -91,54 +79,11 @@ public class DtpExecutor extends ThreadPoolExecutor
      */
     private Set<String> pluginNames = Sets.newHashSet();
 
-    /**
-     * Aware names.
-     */
-    private Set<String> awareNames = Sets.newHashSet();
-
-    /**
-     * If pre start all core threads.
-     */
-    private boolean preStartAllCoreThreads;
-
     /**
      * RejectHandler type.
      */
     private String rejectHandlerType;
 
-    /**
-     * If enhance reject.
-     */
-    private boolean rejectEnhanced = true;
-
-    /**
-     * for manual builder thread pools only
-     */
-    private long runTimeout = 0;
-
-    /**
-     * for manual builder thread pools only
-     */
-    private boolean tryInterrupt = false;
-
-    /**
-     * for manual builder thread pools only
-     */
-    private long queueTimeout = 0;
-
-    /**
-     * Whether to wait for scheduled tasks to complete on shutdown,
-     * not interrupting running tasks and executing all tasks in the queue.
-     */
-    protected boolean waitForTasksToCompleteOnShutdown = false;
-
-    /**
-     * The maximum number of seconds that this executor is supposed to block
-     * on shutdown in order to wait for remaining tasks to complete their execution
-     * before the rest of the container continues to shut down.
-     */
-    protected int awaitTerminationSeconds = 0;
-
     public DtpExecutor(int corePoolSize,
                        int maximumPoolSize,
                        long keepAliveTime,
@@ -228,24 +173,6 @@ protected void terminated() {
         AwareManager.terminated(this);
     }
 
-    public void initialize() {
-        NotifyHelper.initNotify(this);
-        if (preStartAllCoreThreads) {
-            prestartAllCoreThreads();
-        }
-        // reset reject handler in initialize phase according to rejectEnhanced
-        setRejectHandler(RejectHandlerGetter.buildRejectedHandler(getRejectHandlerType()));
-    }
-
-    public void setRejectHandler(RejectedExecutionHandler handler) {
-        this.rejectHandlerType = handler.getClass().getSimpleName();
-        if (!isRejectEnhanced()) {
-            setRejectedExecutionHandler(handler);
-            return;
-        }
-        setRejectedExecutionHandler(RejectHandlerGetter.getProxy(handler));
-    }
-
     private void tryPrintError(Runnable r, Throwable t) {
         if (Objects.nonNull(t)) {
             log.error("DynamicTp execute, thread {} throw exception, traceId {}",
@@ -277,22 +204,6 @@ public void setThreadPoolName(String threadPoolName) {
         this.threadPoolName = threadPoolName;
     }
 
-    public String getThreadPoolAliasName() {
-        return threadPoolAliasName;
-    }
-
-    public void setThreadPoolAliasName(String threadPoolAliasName) {
-        this.threadPoolAliasName = threadPoolAliasName;
-    }
-
-    public boolean isNotifyEnabled() {
-        return notifyEnabled;
-    }
-
-    public void setNotifyEnabled(boolean notifyEnabled) {
-        this.notifyEnabled = notifyEnabled;
-    }
-
     public List<NotifyItem> getNotifyItems() {
         return notifyItems;
     }
@@ -327,30 +238,6 @@ public void setPluginNames(Set<String> pluginNames) {
         this.pluginNames = pluginNames;
     }
 
-    public Set<String> getAwareNames() {
-        return awareNames;
-    }
-
-    public void setAwareNames(Set<String> awareNames) {
-        this.awareNames = awareNames;
-    }
-
-    public boolean isPreStartAllCoreThreads() {
-        return preStartAllCoreThreads;
-    }
-
-    public void setPreStartAllCoreThreads(boolean preStartAllCoreThreads) {
-        this.preStartAllCoreThreads = preStartAllCoreThreads;
-    }
-
-    public boolean isRejectEnhanced() {
-        return rejectEnhanced;
-    }
-
-    public void setRejectEnhanced(boolean rejectEnhanced) {
-        this.rejectEnhanced = rejectEnhanced;
-    }
-
     @Override
     public String getRejectHandlerType() {
         return rejectHandlerType;
@@ -360,46 +247,6 @@ public void setRejectHandlerType(String rejectHandlerType) {
         this.rejectHandlerType = rejectHandlerType;
     }
 
-    public long getRunTimeout() {
-        return runTimeout;
-    }
-
-    public void setRunTimeout(long runTimeout) {
-        this.runTimeout = runTimeout;
-    }
-
-    public boolean isTryInterrupt() {
-        return tryInterrupt;
-    }
-
-    public void setTryInterrupt(boolean tryInterrupt) {
-        this.tryInterrupt = tryInterrupt;
-    }
-
-    public long getQueueTimeout() {
-        return queueTimeout;
-    }
-
-    public void setQueueTimeout(long queueTimeout) {
-        this.queueTimeout = queueTimeout;
-    }
-
-    public boolean isWaitForTasksToCompleteOnShutdown() {
-        return waitForTasksToCompleteOnShutdown;
-    }
-
-    public void setWaitForTasksToCompleteOnShutdown(boolean waitForTasksToCompleteOnShutdown) {
-        this.waitForTasksToCompleteOnShutdown = waitForTasksToCompleteOnShutdown;
-    }
-
-    public int getAwaitTerminationSeconds() {
-        return awaitTerminationSeconds;
-    }
-
-    public void setAwaitTerminationSeconds(int awaitTerminationSeconds) {
-        this.awaitTerminationSeconds = awaitTerminationSeconds;
-    }
-
     /**
      * In order for the field can be assigned by reflection.
      *

core/src/main/java/org/dromara/dynamictp/core/executor/ExecutorType.java

@@ -18,9 +18,12 @@
 package org.dromara.dynamictp.core.executor;
 
 import lombok.AllArgsConstructor;
-import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import lombok.Getter;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import org.dromara.dynamictp.core.executor.priority.PriorityDtpExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * ExecutorType related
@@ -37,6 +40,16 @@ public enum ExecutorType {
      */
     COMMON("common", DtpExecutor.class),
 
+    /**
+     * Common juc executor type.
+     */
+    COMMON_JUC("common-juc", ThreadPoolExecutor.class),
+
+    /**
+     * Common spring executor type.
+     */
+    COMMON_SPRING("common-spring", ThreadPoolTaskExecutor.class),
+
     /**
      * Eager executor type.
      */

core/src/main/java/org/dromara/dynamictp/core/notifier/manager/NotifyHelper.java

@@ -185,7 +185,6 @@ public static void updateNotifyInfo(DtpExecutor executor, DtpExecutorProps props
                 allNotifyItems);
         executor.setNotifyItems(allNotifyItems);
         executor.setPlatformIds(props.getPlatformIds());
-        executor.setNotifyEnabled(props.isNotifyEnabled());
     }
 
     private static void refreshNotify(String poolName,