Merge pull request #342 from dromara/dev

optimize code

adapter/adapter-dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/EagerThreadPoolExecutorProxy.java

@@ -59,7 +59,7 @@ public EagerThreadPoolExecutorProxy(EagerThreadPoolExecutor executor) {
 
     @Override
     public void execute(Runnable command) {
-        command = getEnhancedTask(command, taskWrappers);
+        command = getEnhancedTask(command);
         AwareManager.execute(this, command);
         super.execute(command);
     }
@@ -76,6 +76,11 @@ protected void afterExecute(Runnable r, Throwable t) {
         AwareManager.afterExecute(this, r, t);
     }
 
+    @Override
+    public List<TaskWrapper> getTaskWrappers() {
+        return taskWrappers;
+    }
+
     @Override
     public void setTaskWrappers(List<TaskWrapper> taskWrappers) {
         this.taskWrappers = taskWrappers;

adapter/adapter-motan/src/main/java/org/dromara/dynamictp/adapter/motan/StandardThreadExecutorProxy.java

@@ -54,7 +54,7 @@ public StandardThreadExecutorProxy(StandardThreadExecutor executor) {
 
     @Override
     public void execute(Runnable command) {
-        command = getEnhancedTask(command, taskWrappers);
+        command = getEnhancedTask(command);
         AwareManager.execute(this, command);
         super.execute(command);
     }
@@ -71,6 +71,11 @@ protected void afterExecute(Runnable r, Throwable t) {
         AwareManager.afterExecute(this, r, t);
     }
 
+    @Override
+    public List<TaskWrapper> getTaskWrappers() {
+        return taskWrappers;
+    }
+
     @Override
     public void setTaskWrappers(List<TaskWrapper> taskWrappers) {
         this.taskWrappers = taskWrappers;

core/src/main/java/org/dromara/dynamictp/core/aware/TaskEnhanceAware.java

@@ -50,6 +50,23 @@ default Runnable getEnhancedTask(Runnable command, List<TaskWrapper> taskWrapper
         return command;
     }
 
+    /**
+     * Enhance task
+     *
+     * @param command command
+     * @return enhanced task
+     */
+    default Runnable getEnhancedTask(Runnable command) {
+        return getEnhancedTask(command, getTaskWrappers());
+    }
+
+    /**
+     * Get task wrappers
+     *
+     * @return task wrappers
+     */
+    List<TaskWrapper> getTaskWrappers();
+
     /**
      * Set task wrappers
      *

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

@@ -179,7 +179,7 @@ public void execute(Runnable task, long startTimeout) {
 
     @Override
     public void execute(Runnable command) {
-        command = getEnhancedTask(command, taskWrappers);
+        command = getEnhancedTask(command);
         AwareManager.execute(this, command);
         super.execute(command);
     }
@@ -273,6 +273,7 @@ public void setPlatformIds(List<String> platformIds) {
         this.platformIds = platformIds;
     }
 
+    @Override
     public List<TaskWrapper> getTaskWrappers() {
         return taskWrappers;
     }

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

@@ -15,12 +15,9 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.executor;
 
-import org.dromara.dynamictp.core.executor.DtpExecutor;
-import org.dromara.dynamictp.core.executor.ScheduledDtpExecutor;
-import org.dromara.dynamictp.core.executor.EagerDtpExecutor;
-import org.dromara.dynamictp.core.executor.OrderedDtpExecutor;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import lombok.Getter;
 
 /**

core/src/main/java/org/dromara/dynamictp/core/executor/EagerDtpExecutor.java → core/src/main/java/org/dromara/dynamictp/core/executor/eager/EagerDtpExecutor.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.executor;
+package org.dromara.dynamictp.core.executor.eager;
 
-import org.dromara.dynamictp.core.support.TaskQueue;
+import org.dromara.dynamictp.core.executor.DtpExecutor;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executors;

core/src/main/java/org/dromara/dynamictp/core/support/TaskQueue.java → core/src/main/java/org/dromara/dynamictp/core/executor/eager/TaskQueue.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.executor.eager;
 
 import org.dromara.dynamictp.common.queue.VariableLinkedBlockingQueue;
-import org.dromara.dynamictp.core.executor.EagerDtpExecutor;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import org.springframework.lang.NonNull;
 
 import java.util.concurrent.RejectedExecutionException;

core/src/main/java/org/dromara/dynamictp/core/spring/DtpBeanDefinitionRegistrar.java

@@ -24,12 +24,12 @@
 import org.dromara.dynamictp.common.entity.DtpExecutorProps;
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.common.spring.SpringBeanHelper;
-import org.dromara.dynamictp.core.executor.EagerDtpExecutor;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import org.dromara.dynamictp.core.executor.NamedThreadFactory;
 import org.dromara.dynamictp.core.reject.RejectHandlerGetter;
 import org.dromara.dynamictp.core.support.BinderHelper;
-import org.dromara.dynamictp.core.support.ExecutorType;
-import org.dromara.dynamictp.core.support.TaskQueue;
+import org.dromara.dynamictp.core.executor.ExecutorType;
+import org.dromara.dynamictp.core.executor.eager.TaskQueue;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.EnvironmentAware;

core/src/main/java/org/dromara/dynamictp/core/spring/DtpPostProcessor.java

@@ -24,11 +24,11 @@
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 import org.dromara.dynamictp.core.DtpRegistry;
 import org.dromara.dynamictp.core.executor.DtpExecutor;
-import org.dromara.dynamictp.core.executor.EagerDtpExecutor;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import org.dromara.dynamictp.core.plugin.DtpInterceptorRegistry;
 import org.dromara.dynamictp.core.support.DynamicTp;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
-import org.dromara.dynamictp.core.support.TaskQueue;
+import org.dromara.dynamictp.core.executor.eager.TaskQueue;
 import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;

core/src/main/java/org/dromara/dynamictp/core/support/ThreadPoolBuilder.java

@@ -25,10 +25,11 @@
 import org.dromara.dynamictp.common.em.RejectedTypeEnum;
 import org.dromara.dynamictp.common.entity.NotifyItem;
 import org.dromara.dynamictp.common.queue.VariableLinkedBlockingQueue;
+import org.dromara.dynamictp.core.executor.eager.TaskQueue;
 import org.dromara.dynamictp.core.reject.RejectHandlerGetter;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrapper;
 import org.dromara.dynamictp.core.executor.DtpExecutor;
-import org.dromara.dynamictp.core.executor.EagerDtpExecutor;
+import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import org.dromara.dynamictp.core.executor.NamedThreadFactory;
 import org.dromara.dynamictp.core.executor.OrderedDtpExecutor;
 import org.dromara.dynamictp.core.executor.ScheduledDtpExecutor;

core/src/main/java/org/dromara/dynamictp/core/support/ThreadPoolExecutorProxy.java

@@ -45,11 +45,12 @@ public class ThreadPoolExecutorProxy extends ThreadPoolExecutor implements TaskE
     /**
      * Reject handler type.
      */
-    private final String rejectHandlerType;
+    private String rejectHandlerType;
 
     public ThreadPoolExecutorProxy(ThreadPoolExecutor executor) {
         super(executor.getCorePoolSize(), executor.getMaximumPoolSize(),
-                executor.getKeepAliveTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS, executor.getQueue(),
+                executor.getKeepAliveTime(TimeUnit.MILLISECONDS),
+                TimeUnit.MILLISECONDS, executor.getQueue(),
                 executor.getThreadFactory(), executor.getRejectedExecutionHandler());
         this.rejectHandlerType = getRejectedExecutionHandler().getClass().getSimpleName();
         setRejectedExecutionHandler(RejectHandlerGetter.getProxy(getRejectedExecutionHandler()));
@@ -58,7 +59,7 @@ public ThreadPoolExecutorProxy(ThreadPoolExecutor executor) {
 
     @Override
     public void execute(Runnable command) {
-        command = getEnhancedTask(command, taskWrappers);
+        command = getEnhancedTask(command);
         AwareManager.execute(this, command);
         super.execute(command);
     }
@@ -76,6 +77,11 @@ protected void afterExecute(Runnable r, Throwable t) {
         AwareManager.afterExecute(this, r, t);
     }
 
+    @Override
+    public List<TaskWrapper> getTaskWrappers() {
+        return taskWrappers;
+    }
+
     @Override
     public void setTaskWrappers(List<TaskWrapper> taskWrappers) {
         this.taskWrappers = taskWrappers;

dependencies/pom.xml

@@ -12,7 +12,7 @@
     <url>https://github.com/yanhom1314/dynamic-tp</url>
 
     <properties>
-        <revision>1.1.4</revision>
+        <revision>1.1.4.1</revision>
         <hutool.version>5.8.12</hutool.version>
         <lombok.version>1.18.24</lombok.version>
         <apollo.version>1.5.0</apollo.version>

pom.xml

@@ -13,7 +13,7 @@
     <url>https://github.com/yanhom1314/dynamic-tp</url>
 
     <properties>
-        <revision>1.1.4</revision>
+        <revision>1.1.4.1</revision>
         <java.version>1.8</java.version>
         <spring-boot.version>2.5.14</spring-boot.version>
         <spring-cloud.version>2020.0.5</spring-cloud.version>

starter/starter-adapter/starter-adapter-webserver/src/main/java/org/dromara/dynamictp/starter/adapter/webserver/tomcat/TomcatExecutorProxy.java

@@ -76,7 +76,7 @@ public TomcatExecutorProxy(ThreadPoolExecutor executor) {
 
     @Override
     public void execute(Runnable command) {
-        command = getEnhancedTask(command, taskWrappers);
+        command = getEnhancedTask(command);
         AwareManager.execute(this, command);
         super.execute(command);
     }
@@ -93,6 +93,11 @@ protected void afterExecute(Runnable r, Throwable t) {
         AwareManager.afterExecute(this, r, t);
     }
 
+    @Override
+    public List<TaskWrapper> getTaskWrappers() {
+        return taskWrappers;
+    }
+
     @Override
     public void setTaskWrappers(List<TaskWrapper> taskWrappers) {
         this.taskWrappers = taskWrappers;