optimize package structure

dromara · Nov 6, 2024 · 7bd8d69 · 7bd8d69
1 parent 82d5da7
commit 7bd8d69
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 23 deletions.
diff --git a/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java b/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java
@@ -43,7 +43,7 @@
 import org.dromara.dynamictp.core.notifier.manager.NoticeManager;
 import org.dromara.dynamictp.core.support.ExecutorAdapter;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrapper;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers;
 

diff --git a/...dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java b/...dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java
@@ -35,7 +35,7 @@
 import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.jvmti.JVMTI;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;

diff --git a/...ter-liteflow/src/main/java/org/dromara/dynamictp/adapter/liteflow/LiteflowDtpAdapter.java b/...ter-liteflow/src/main/java/org/dromara/dynamictp/adapter/liteflow/LiteflowDtpAdapter.java
@@ -26,7 +26,7 @@
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 
 import java.util.Map;
 import java.util.concurrent.ExecutorService;

diff --git a/...ter-rocketmq/src/main/java/org/dromara/dynamictp/adapter/rocketmq/RocketMqDtpAdapter.java b/...ter-rocketmq/src/main/java/org/dromara/dynamictp/adapter/rocketmq/RocketMqDtpAdapter.java
@@ -29,7 +29,7 @@
 import org.dromara.dynamictp.adapter.common.AbstractDtpAdapter;
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.jvmti.JVMTI;
 
 import java.util.Objects;

diff --git a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java
@@ -18,7 +18,7 @@
 package org.dromara.dynamictp.core.executor;
 
 import org.dromara.dynamictp.common.em.JreEnum;
-import org.dromara.dynamictp.core.support.ScheduledThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ScheduledThreadPoolExecutorProxy;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/main/java/org/dromara/dynamictp/core/refresher/AbstractRefresher.java b/core/src/main/java/org/dromara/dynamictp/core/refresher/AbstractRefresher.java
@@ -27,7 +27,7 @@
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.core.DtpRegistry;
 import org.dromara.dynamictp.core.handler.ConfigHandler;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 
 
 import java.io.IOException;

diff --git a/.../dynamictp/core/support/BinderHelper.java → ...ctp/core/support/binder/BinderHelper.java b/.../dynamictp/core/support/BinderHelper.java → ...ctp/core/support/binder/BinderHelper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.support.binder;
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.pattern.singleton.Singleton;
@@ -43,7 +43,7 @@ private static PropertiesBinder getBinder() {
         }
         final PropertiesBinder loadedFirstBinder = ExtensionServiceLoader.getFirst(PropertiesBinder.class);
         if (Objects.isNull(loadedFirstBinder)) {
-            log.error("DynamicTp refresh, no SPI for org.dromara.dynamictp.core.support.PropertiesBinder.");
+            log.error("DynamicTp refresh, no SPI for org.dromara.dynamictp.core.support.binder.PropertiesBinder.");
             return null;
         }
         Singleton.INST.single(PropertiesBinder.class, loadedFirstBinder);

diff --git a/...amictp/core/support/PropertiesBinder.java → ...core/support/binder/PropertiesBinder.java b/...amictp/core/support/PropertiesBinder.java → ...core/support/binder/PropertiesBinder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.support.binder;
 
 import org.dromara.dynamictp.common.properties.DtpProperties;
 

diff --git a/...ort/ScheduledThreadPoolExecutorProxy.java → ...oxy/ScheduledThreadPoolExecutorProxy.java b/...ort/ScheduledThreadPoolExecutorProxy.java → ...oxy/ScheduledThreadPoolExecutorProxy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.support.proxy;
 
 import org.dromara.dynamictp.common.util.ExecutorUtil;
 import org.dromara.dynamictp.core.aware.AwareManager;

diff --git a/...core/support/ThreadPoolExecutorProxy.java → ...upport/proxy/ThreadPoolExecutorProxy.java b/...core/support/ThreadPoolExecutorProxy.java → ...upport/proxy/ThreadPoolExecutorProxy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.dynamictp.core.support;
+package org.dromara.dynamictp.core.support.proxy;
 
 import org.dromara.dynamictp.common.util.ExecutorUtil;
 import org.dromara.dynamictp.core.aware.AwareManager;

diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java b/spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java
@@ -30,8 +30,8 @@
 import org.dromara.dynamictp.core.executor.eager.TaskQueue;
 import org.dromara.dynamictp.core.support.DynamicTp;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
-import org.dromara.dynamictp.core.support.ScheduledThreadPoolExecutorProxy;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ScheduledThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrapper;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers;
 import org.springframework.beans.BeansException;

diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java
@@ -29,7 +29,7 @@
 import org.dromara.dynamictp.core.executor.eager.TaskQueue;
 import org.dromara.dynamictp.core.executor.priority.PriorityDtpExecutor;
 import org.dromara.dynamictp.core.reject.RejectHandlerGetter;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers;
 import org.dromara.dynamictp.spring.util.BeanRegistrationUtil;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;

diff --git a/...src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java b/...src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java
@@ -21,7 +21,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.common.util.DtpPropertiesBinderUtil;
-import org.dromara.dynamictp.core.support.PropertiesBinder;
+import org.dromara.dynamictp.core.support.binder.PropertiesBinder;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValues;
 import org.springframework.boot.context.properties.bind.Bindable;

diff --git a/...a.dynamictp.core.support.PropertiesBinder → ...ictp.core.support.binder.PropertiesBinder b/...a.dynamictp.core.support.PropertiesBinder → ...ictp.core.support.binder.PropertiesBinder
diff --git a/...java/org/dromara/dynamictp/starter/etcd/autoconfigure/EtcdConfigEnvironmentProcessor.java b/...java/org/dromara/dynamictp/starter/etcd/autoconfigure/EtcdConfigEnvironmentProcessor.java
@@ -20,7 +20,7 @@
 import lombok.SneakyThrows;
 import lombok.val;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.starter.etcd.util.EtcdUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;

diff --git a/...starter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/refresher/EtcdListener.java b/...starter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/refresher/EtcdListener.java
@@ -24,7 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.starter.etcd.util.EtcdUtil;
 
 /**

diff --git a/...tarter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/refresher/EtcdRefresher.java b/...tarter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/refresher/EtcdRefresher.java
@@ -19,7 +19,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.spring.AbstractSpringRefresher;
 import org.dromara.dynamictp.starter.etcd.util.EtcdUtil;
 import org.springframework.beans.factory.DisposableBean;

diff --git a/...a/org/dromara/dynamictp/starter/zookeeper/autoconfigure/ZkConfigEnvironmentProcessor.java b/...a/org/dromara/dynamictp/starter/zookeeper/autoconfigure/ZkConfigEnvironmentProcessor.java
@@ -19,7 +19,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.starter.zookeeper.util.CuratorUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;

diff --git a/.../test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java b/.../test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java
@@ -18,7 +18,7 @@
 package org.dromara.dynamictp.test.core.spring;
 
 import org.dromara.dynamictp.core.DtpRegistry;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.spring.annotation.EnableDynamicTp;
 import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory;
 import org.junit.jupiter.api.Assertions;

diff --git a/.../test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java b/.../test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java
@@ -21,7 +21,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.core.support.BinderHelper;
+import org.dromara.dynamictp.core.support.binder.BinderHelper;
 import org.dromara.dynamictp.spring.annotation.EnableDynamicTp;
 import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory;
 import org.junit.jupiter.api.Assertions;

diff --git a/...c/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java b/...c/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java
@@ -22,7 +22,7 @@
 import org.dromara.dynamictp.core.aware.AwareManager;
 import org.dromara.dynamictp.core.executor.NamedThreadFactory;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.spring.annotation.EnableDynamicTp;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

diff --git a/...re/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorTest.java b/...re/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorTest.java
@@ -18,7 +18,7 @@
 package org.dromara.dynamictp.test.core.thread.proxy;
 
 import org.dromara.dynamictp.core.executor.NamedThreadFactory;
-import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
+import org.dromara.dynamictp.core.support.proxy.ThreadPoolExecutorProxy;
 import org.junit.Assert;
 import org.junit.Test;