diff --git a/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java b/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java index 98e9d3f50..35c54ba72 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java +++ b/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java @@ -52,6 +52,8 @@ private DynamicTpConst() { } public static final String EXECUTORS_CONFIG_PREFIX = MAIN_PROPERTIES_PREFIX + ".executors["; + public static final String APP_NAME_KEY = "APP.NAME"; + /** * Dtp executor properties const. */ diff --git a/common/src/main/java/org/dromara/dynamictp/common/em/JreEnum.java b/common/src/main/java/org/dromara/dynamictp/common/em/JreEnum.java index fc4863e42..859da958e 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/em/JreEnum.java +++ b/common/src/main/java/org/dromara/dynamictp/common/em/JreEnum.java @@ -92,7 +92,7 @@ private static JreEnum getJre() { int majorVersion = (int) MethodUtils.invokeMethod(javaRunTimeVersion, "major"); return JreEnum.valueOf("JAVA_" + majorVersion); } catch (Exception e) { - log.debug("can't determine current JRE version", e); + log.warn("can't determine current JRE version", e); } return JAVA_8; } diff --git a/common/src/main/java/org/dromara/dynamictp/common/event/AlarmCheckEvent.java b/common/src/main/java/org/dromara/dynamictp/common/event/AlarmCheckEvent.java index c88a7843d..52047ab93 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/event/AlarmCheckEvent.java +++ b/common/src/main/java/org/dromara/dynamictp/common/event/AlarmCheckEvent.java @@ -28,6 +28,6 @@ public class AlarmCheckEvent extends DtpEvent { public AlarmCheckEvent(Object source, DtpProperties dtpProperties) { - super(source, dtpProperties); // 调用父类的构造方法 + super(source, dtpProperties); } } diff --git a/common/src/main/java/org/dromara/dynamictp/common/event/CustomContextRefreshedEvent.java b/common/src/main/java/org/dromara/dynamictp/common/event/CustomContextRefreshedEvent.java index 3a96686ac..5f203d053 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/event/CustomContextRefreshedEvent.java +++ b/common/src/main/java/org/dromara/dynamictp/common/event/CustomContextRefreshedEvent.java @@ -23,9 +23,10 @@ * EventObject related * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public class CustomContextRefreshedEvent extends EventObject { + public CustomContextRefreshedEvent(Object source) { super(source); } diff --git a/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java b/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java index a15aded39..452e0502e 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java +++ b/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java @@ -26,7 +26,7 @@ * DtpEvent related * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ @Getter public abstract class DtpEvent extends EventObject { diff --git a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java index a667b861e..92b33aa86 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java +++ b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.dromara.dynamictp.common.manager; import java.util.Map; @@ -26,7 +25,7 @@ * and retrieve environment properties and profiles. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public interface ContextManager { diff --git a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java index 6db69e54d..e57205a35 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java +++ b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java @@ -15,18 +15,17 @@ * limitations under the License. */ - package org.dromara.dynamictp.common.manager; + import org.dromara.dynamictp.common.util.ExtensionServiceLoader; import java.util.Map; - /** * Helper class for accessing ContextManager and publishing events. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public class ContextManagerHelper { diff --git a/common/src/main/java/org/dromara/dynamictp/common/manager/EventBusManager.java b/common/src/main/java/org/dromara/dynamictp/common/manager/EventBusManager.java index 5d83ffda7..ad13a455e 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/manager/EventBusManager.java +++ b/common/src/main/java/org/dromara/dynamictp/common/manager/EventBusManager.java @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.dromara.dynamictp.common.manager; import com.google.common.eventbus.EventBus; @@ -24,18 +23,19 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; - /** * Manages event registration and posting using EventBus. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ @Slf4j public class EventBusManager { private static final EventBus EVENT_BUS = new EventBus(); + private static final Set REGISTERED_OBJECTS = ConcurrentHashMap.newKeySet(); + private EventBusManager() { } public static void register(Object object) { @@ -67,7 +67,7 @@ public static void destroy() { for (Object object : REGISTERED_OBJECTS) { try { EVENT_BUS.unregister(object); - } catch (Throwable e) { + } catch (Exception e) { log.warn("Attempted to unregister an object that was not registered: {}", object, e); } } diff --git a/common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtils.java b/common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtil.java similarity index 95% rename from common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtils.java rename to common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtil.java index db8764c3c..df043f3c1 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtils.java +++ b/common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtil.java @@ -17,6 +17,7 @@ package org.dromara.dynamictp.common.util; +import lombok.experimental.UtilityClass; import net.sf.cglib.beans.BeanCopier; import java.util.Map; @@ -28,7 +29,9 @@ * @author vzer200 * @since 1.1.8 */ -public class BeanCopierUtils { +@UtilityClass +public class BeanCopierUtil { + private static final Map BEAN_COPIER_CACHE = new ConcurrentHashMap<>(); public static BeanCopier getBeanCopier(Class sourceClass, Class targetClass) { diff --git a/common/src/main/java/org/dromara/dynamictp/common/util/StreamUtil.java b/common/src/main/java/org/dromara/dynamictp/common/util/StreamUtil.java index ce759b9a3..b53d05e9e 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/util/StreamUtil.java +++ b/common/src/main/java/org/dromara/dynamictp/common/util/StreamUtil.java @@ -20,7 +20,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.collections4.CollectionUtils; - import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/dromara/dynamictp/core/lifecycle/LifeCycleManagement.java b/core/src/main/java/org/dromara/dynamictp/core/lifecycle/LifeCycleManagement.java index bb0470ada..349625ddd 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/lifecycle/LifeCycleManagement.java +++ b/core/src/main/java/org/dromara/dynamictp/core/lifecycle/LifeCycleManagement.java @@ -23,7 +23,7 @@ * as well as handling auto startup and shutdown phases. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public interface LifeCycleManagement { diff --git a/core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java b/core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java index ff463a2e5..071faf7a7 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java +++ b/core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java @@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.common.em.CollectorTypeEnum; import org.dromara.dynamictp.common.entity.ThreadPoolStats; -import org.dromara.dynamictp.common.util.BeanCopierUtils; +import org.dromara.dynamictp.common.util.BeanCopierUtil; import org.dromara.dynamictp.common.util.CommonUtil; import java.util.ArrayList; @@ -61,7 +61,7 @@ public void collect(ThreadPoolStats threadPoolStats) { if (Objects.isNull(oldStats)) { GAUGE_CACHE.put(threadPoolStats.getPoolName(), threadPoolStats); } else { - BeanCopierUtils.copyProperties(threadPoolStats, oldStats); + BeanCopierUtil.copyProperties(threadPoolStats, oldStats); } gauge(GAUGE_CACHE.get(threadPoolStats.getPoolName())); } diff --git a/core/src/main/java/org/dromara/dynamictp/core/notifier/manager/NotifyFilterBuilder.java b/core/src/main/java/org/dromara/dynamictp/core/notifier/manager/NotifyFilterBuilder.java index 4cb104b4b..a7355788f 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/notifier/manager/NotifyFilterBuilder.java +++ b/core/src/main/java/org/dromara/dynamictp/core/notifier/manager/NotifyFilterBuilder.java @@ -58,7 +58,7 @@ public static InvokerChain getAlarmInvokerChain() { } public static InvokerChain getCommonInvokerChain() { - val filters = ContextManagerHelper.getBeansOfType(NotifyFilter.class); + val filters = ContextManagerHelper.getBeansOfType(NotifyFilter.class); Collection noticeFilters = Lists.newArrayList(filters.values()); noticeFilters.add(new NoticeBaseFilter()); noticeFilters = noticeFilters.stream() diff --git a/core/src/main/java/org/dromara/dynamictp/core/support/ExecutorWrapper.java b/core/src/main/java/org/dromara/dynamictp/core/support/ExecutorWrapper.java index 862e94ba0..dc4a71310 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/support/ExecutorWrapper.java +++ b/core/src/main/java/org/dromara/dynamictp/core/support/ExecutorWrapper.java @@ -20,7 +20,7 @@ import lombok.Data; import org.dromara.dynamictp.common.em.NotifyItemEnum; import org.dromara.dynamictp.common.entity.NotifyItem; -import org.dromara.dynamictp.common.util.BeanCopierUtils; +import org.dromara.dynamictp.common.util.BeanCopierUtil; import org.dromara.dynamictp.core.aware.AwareManager; import org.dromara.dynamictp.core.aware.RejectHandlerAware; import org.dromara.dynamictp.core.aware.TaskEnhanceAware; @@ -164,7 +164,7 @@ public static ExecutorWrapper of(DtpExecutor executor) { */ public ExecutorWrapper capture() { ExecutorWrapper executorWrapper = new ExecutorWrapper(); - BeanCopierUtils.copyProperties(this, executorWrapper); + BeanCopierUtil.copyProperties(this, executorWrapper); executorWrapper.executor = new CapturedExecutor(this.getExecutor()); return executorWrapper; } diff --git a/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializer.java b/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializer.java index da835f8a2..1c4d0634d 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializer.java +++ b/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializer.java @@ -43,6 +43,8 @@ default int getOrder() { /** * Init. + * + * @param args args */ - void init(); + void init(Object... args); } diff --git a/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializerExecutor.java b/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializerExecutor.java index 54fdecaff..5bd2b66e3 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializerExecutor.java +++ b/core/src/main/java/org/dromara/dynamictp/core/support/init/DtpInitializerExecutor.java @@ -34,7 +34,7 @@ public class DtpInitializerExecutor { private static final AtomicBoolean INITIALIZED = new AtomicBoolean(false); - public static void init() { + public static void init(Object... args) { if (!INITIALIZED.compareAndSet(false, true)) { return; } @@ -43,6 +43,6 @@ public static void init() { return; } loadedInitializers.sort(Comparator.comparingInt(DtpInitializer::getOrder)); - loadedInitializers.forEach(DtpInitializer::init); + loadedInitializers.forEach(i -> i.init(args)); } } diff --git a/example/example-adapter/example-adapter-brpc/src/main/java/org/dromara/dynamictp/example/BrpcExampleApplication.java b/example/example-adapter/example-adapter-brpc/src/main/java/org/dromara/dynamictp/example/BrpcExampleApplication.java index b04b01e42..2aeb7e6d5 100644 --- a/example/example-adapter/example-adapter-brpc/src/main/java/org/dromara/dynamictp/example/BrpcExampleApplication.java +++ b/example/example-adapter/example-adapter-brpc/src/main/java/org/dromara/dynamictp/example/BrpcExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import com.baidu.cloud.starlight.springcloud.server.annotation.StarlightScan; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java b/example/example-adapter/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java index 39ddb6cb0..ec79d2c01 100644 --- a/example/example-adapter/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java +++ b/example/example-adapter/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java index 0d34af7df..c3572760b 100644 --- a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java +++ b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java index 7b0f9cc46..c1f71f36f 100644 --- a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java +++ b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java index 7b0f9cc46..c1f71f36f 100644 --- a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java +++ b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.2.10/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.2.10/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java index 7b0f9cc46..c1f71f36f 100644 --- a/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.2.10/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java +++ b/example/example-adapter/example-adapter-dubbo/example-adapter-apache-dubbo/example-adapter-apache-dubbo-3.2.10/src/main/java/org/dromara/dynamictp/example/DubboExampleApplication.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.example; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java b/example/example-adapter/example-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java index da31d9968..393bdc749 100644 --- a/example/example-adapter/example-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java +++ b/example/example-adapter/example-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-hystrix/src/main/java/org/dromara/dynamictp/example/HystrixExampleApplication.java b/example/example-adapter/example-adapter-hystrix/src/main/java/org/dromara/dynamictp/example/HystrixExampleApplication.java index fddb6dfc8..b0df0248b 100644 --- a/example/example-adapter/example-adapter-hystrix/src/main/java/org/dromara/dynamictp/example/HystrixExampleApplication.java +++ b/example/example-adapter/example-adapter-hystrix/src/main/java/org/dromara/dynamictp/example/HystrixExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.hystrix.EnableHystrix; diff --git a/example/example-adapter/example-adapter-motan/src/main/java/org/dromara/dynamictp/example/MotanExampleApplication.java b/example/example-adapter/example-adapter-motan/src/main/java/org/dromara/dynamictp/example/MotanExampleApplication.java index fbdda1e0f..9a3cdfce0 100644 --- a/example/example-adapter/example-adapter-motan/src/main/java/org/dromara/dynamictp/example/MotanExampleApplication.java +++ b/example/example-adapter/example-adapter-motan/src/main/java/org/dromara/dynamictp/example/MotanExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ImportResource; diff --git a/example/example-adapter/example-adapter-okhttp3/src/main/java/org/dromara/dynamictp/example/Okhttp3ExampleApplication.java b/example/example-adapter/example-adapter-okhttp3/src/main/java/org/dromara/dynamictp/example/Okhttp3ExampleApplication.java index 605bc3548..af86f8577 100644 --- a/example/example-adapter/example-adapter-okhttp3/src/main/java/org/dromara/dynamictp/example/Okhttp3ExampleApplication.java +++ b/example/example-adapter/example-adapter-okhttp3/src/main/java/org/dromara/dynamictp/example/Okhttp3ExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-rabbitmq/src/main/java/org/dromara/dynamictp/example/RabbitMqExampleApplication.java b/example/example-adapter/example-adapter-rabbitmq/src/main/java/org/dromara/dynamictp/example/RabbitMqExampleApplication.java index 26b7e10e3..74afa2997 100644 --- a/example/example-adapter/example-adapter-rabbitmq/src/main/java/org/dromara/dynamictp/example/RabbitMqExampleApplication.java +++ b/example/example-adapter/example-adapter-rabbitmq/src/main/java/org/dromara/dynamictp/example/RabbitMqExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-adapter/example-adapter-rocketmq/src/main/java/org/dromara/dynamictp/example/RocketMqExampleApplication.java b/example/example-adapter/example-adapter-rocketmq/src/main/java/org/dromara/dynamictp/example/RocketMqExampleApplication.java index dfd8bafd6..7bf6368ef 100644 --- a/example/example-adapter/example-adapter-rocketmq/src/main/java/org/dromara/dynamictp/example/RocketMqExampleApplication.java +++ b/example/example-adapter/example-adapter-rocketmq/src/main/java/org/dromara/dynamictp/example/RocketMqExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-apollo/src/main/java/org/dromara/dynamictp/example/ApolloExampleApplication.java b/example/example-apollo/src/main/java/org/dromara/dynamictp/example/ApolloExampleApplication.java index 51fc8003a..b05d9ee10 100644 --- a/example/example-apollo/src/main/java/org/dromara/dynamictp/example/ApolloExampleApplication.java +++ b/example/example-apollo/src/main/java/org/dromara/dynamictp/example/ApolloExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-consul-cloud/src/main/java/org/dromara/dynamictp/example/CloudConsulExampleApplication.java b/example/example-consul-cloud/src/main/java/org/dromara/dynamictp/example/CloudConsulExampleApplication.java index 45c828aeb..b2a84df29 100644 --- a/example/example-consul-cloud/src/main/java/org/dromara/dynamictp/example/CloudConsulExampleApplication.java +++ b/example/example-consul-cloud/src/main/java/org/dromara/dynamictp/example/CloudConsulExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-etcd/src/main/java/org/dromara/dynamictp/example/EtcdExampleApplication.java b/example/example-etcd/src/main/java/org/dromara/dynamictp/example/EtcdExampleApplication.java index 79a1ed1d3..ea791018a 100644 --- a/example/example-etcd/src/main/java/org/dromara/dynamictp/example/EtcdExampleApplication.java +++ b/example/example-etcd/src/main/java/org/dromara/dynamictp/example/EtcdExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-huawei-cloud/src/main/java/org/dromara/dynamictp/example/HuaweiCloudExampleApplication.java b/example/example-huawei-cloud/src/main/java/org/dromara/dynamictp/example/HuaweiCloudExampleApplication.java index 057c08698..e3b2e52a8 100644 --- a/example/example-huawei-cloud/src/main/java/org/dromara/dynamictp/example/HuaweiCloudExampleApplication.java +++ b/example/example-huawei-cloud/src/main/java/org/dromara/dynamictp/example/HuaweiCloudExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-nacos-cloud/src/main/java/org/dromara/dynamictp/example/NacosCloudExampleApplication.java b/example/example-nacos-cloud/src/main/java/org/dromara/dynamictp/example/NacosCloudExampleApplication.java index f1ae3f329..ea720b218 100644 --- a/example/example-nacos-cloud/src/main/java/org/dromara/dynamictp/example/NacosCloudExampleApplication.java +++ b/example/example-nacos-cloud/src/main/java/org/dromara/dynamictp/example/NacosCloudExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-nacos/src/main/java/org/dromara/dynamictp/example/NacosExampleApplication.java b/example/example-nacos/src/main/java/org/dromara/dynamictp/example/NacosExampleApplication.java index 415158078..1ca14c7d5 100644 --- a/example/example-nacos/src/main/java/org/dromara/dynamictp/example/NacosExampleApplication.java +++ b/example/example-nacos/src/main/java/org/dromara/dynamictp/example/NacosExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-polaris-cloud/src/main/java/org/dromara/dynamictp/example/PolarisCloudExampleApplication.java b/example/example-polaris-cloud/src/main/java/org/dromara/dynamictp/example/PolarisCloudExampleApplication.java index 98952342e..05e4818b0 100644 --- a/example/example-polaris-cloud/src/main/java/org/dromara/dynamictp/example/PolarisCloudExampleApplication.java +++ b/example/example-polaris-cloud/src/main/java/org/dromara/dynamictp/example/PolarisCloudExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-zookeeper-cloud/src/main/java/org/dromara/dynamictp/example/CloudZookeeperExampleApplication.java b/example/example-zookeeper-cloud/src/main/java/org/dromara/dynamictp/example/CloudZookeeperExampleApplication.java index 68d9d65bc..833aa8290 100644 --- a/example/example-zookeeper-cloud/src/main/java/org/dromara/dynamictp/example/CloudZookeeperExampleApplication.java +++ b/example/example-zookeeper-cloud/src/main/java/org/dromara/dynamictp/example/CloudZookeeperExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example/example-zookeeper/src/main/java/org/dromara/dynamictp/example/ZookeeperExampleApplication.java b/example/example-zookeeper/src/main/java/org/dromara/dynamictp/example/ZookeeperExampleApplication.java index c3b635717..ea5c47123 100644 --- a/example/example-zookeeper/src/main/java/org/dromara/dynamictp/example/ZookeeperExampleApplication.java +++ b/example/example-zookeeper/src/main/java/org/dromara/dynamictp/example/ZookeeperExampleApplication.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.example; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; diff --git a/jvmti/pom.xml b/jvmti/pom.xml index 5245ae3b4..3e69b217d 100644 --- a/jvmti/pom.xml +++ b/jvmti/pom.xml @@ -17,4 +17,4 @@ jvmti-runtime - \ No newline at end of file + diff --git a/logging/src/main/java/org/dromara/dynamictp/logging/AbstractDtpLogging.java b/logging/src/main/java/org/dromara/dynamictp/logging/AbstractDtpLogging.java index ce10c5440..a61f97fc3 100644 --- a/logging/src/main/java/org/dromara/dynamictp/logging/AbstractDtpLogging.java +++ b/logging/src/main/java/org/dromara/dynamictp/logging/AbstractDtpLogging.java @@ -17,10 +17,10 @@ package org.dromara.dynamictp.logging; -import org.dromara.dynamictp.common.properties.DtpProperties; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.dromara.dynamictp.common.manager.ContextManagerHelper; +import org.dromara.dynamictp.common.properties.DtpProperties; import java.io.File; import java.io.FileNotFoundException; @@ -40,7 +40,6 @@ public abstract class AbstractDtpLogging { protected static final String MONITOR_LOG_NAME = "DTP.MONITOR.LOG"; private static final String CLASSPATH_PREFIX = "classpath:"; private static final String LOGGING_PATH = "LOG.PATH"; - private static final String APP_NAME = "APP.NAME"; static { try { @@ -52,17 +51,12 @@ public abstract class AbstractDtpLogging { } else { System.setProperty(LOGGING_PATH, logPath); } - - String appName = ContextManagerHelper.getEnvironmentProperty("spring.application.name"); - appName = StringUtils.isNotBlank(appName) ? appName : "application"; - System.setProperty(APP_NAME, appName); } catch (Exception e) { log.error("DynamicTp logging env init failed, if collectType is not logging, this error can be ignored.", e); } } public URL getResourceUrl(String resource) throws IOException { - if (resource.startsWith(CLASSPATH_PREFIX)) { String path = resource.substring(CLASSPATH_PREFIX.length()); ClassLoader classLoader = DtpLoggingInitializer.class.getClassLoader(); diff --git a/spring/pom.xml b/spring/pom.xml index 1591425db..b01cff1dc 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -10,7 +10,6 @@ dynamic-tp-spring - org.springframework @@ -20,7 +19,6 @@ org.dromara.dynamictp dynamic-tp-core - - \ No newline at end of file + diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/AbstractSpringRefresher.java b/spring/src/main/java/org/dromara/dynamictp/spring/AbstractSpringRefresher.java index 26db6b03f..15810bb5d 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/AbstractSpringRefresher.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/AbstractSpringRefresher.java @@ -27,7 +27,7 @@ * Abstract class for refreshing properties in a Spring environment. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ @Slf4j public abstract class AbstractSpringRefresher extends AbstractRefresher implements EnvironmentAware { diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanConfiguration.java b/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanConfiguration.java index 0ff02ad7b..6cdc1d767 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanConfiguration.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanConfiguration.java @@ -23,12 +23,13 @@ import org.dromara.dynamictp.core.lifecycle.DtpLifecycle; import org.dromara.dynamictp.core.lifecycle.LifeCycleManagement; import org.dromara.dynamictp.core.support.DtpBannerPrinter; +import org.dromara.dynamictp.spring.lifecycle.DtpLifecycleSpringAdapter; +import org.dromara.dynamictp.spring.listener.DtpApplicationListener; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; - /** * DtpBaseBeanConfiguration related * diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanDefinitionRegistrar.java b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBaseBeanDefinitionRegistrar.java similarity index 80% rename from spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanDefinitionRegistrar.java rename to spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBaseBeanDefinitionRegistrar.java index ebb75b5e6..f62a75088 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBaseBeanDefinitionRegistrar.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBaseBeanDefinitionRegistrar.java @@ -15,12 +15,15 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.annotation; import com.google.common.collect.Lists; import org.dromara.dynamictp.common.timer.HashedWheelTimer; import org.dromara.dynamictp.core.executor.NamedThreadFactory; +import org.dromara.dynamictp.spring.DtpPostProcessor; +import org.dromara.dynamictp.spring.holder.SpringContextHolder; +import org.dromara.dynamictp.spring.util.BeanRegistrationUtil; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.type.AnnotationMetadata; @@ -44,10 +47,10 @@ public class DtpBaseBeanDefinitionRegistrar implements ImportBeanDefinitionRegis @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { registerHashedWheelTimer(registry); - SpringBeanHelper.registerIfAbsent(registry, APPLICATION_CONTEXT_HOLDER, SpringContextHolder.class); + BeanRegistrationUtil.registerIfAbsent(registry, APPLICATION_CONTEXT_HOLDER, SpringContextHolder.class); // ApplicationContextHolder and HashedWheelTimer are required in DtpExecutor execute method, so they must be registered first - SpringBeanHelper.registerIfAbsent(registry, DTP_POST_PROCESSOR, DtpPostProcessor.class, + BeanRegistrationUtil.registerIfAbsent(registry, DTP_POST_PROCESSOR, DtpPostProcessor.class, null, Lists.newArrayList(APPLICATION_CONTEXT_HOLDER, HASHED_WHEEL_TIMER)); } @@ -57,6 +60,6 @@ private void registerHashedWheelTimer(BeanDefinitionRegistry registry) { 10, TimeUnit.MILLISECONDS }; - SpringBeanHelper.registerIfAbsent(registry, HASHED_WHEEL_TIMER, HashedWheelTimer.class, constructorArgs); + BeanRegistrationUtil.registerIfAbsent(registry, HASHED_WHEEL_TIMER, HashedWheelTimer.class, constructorArgs); } } diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBeanDefinitionRegistrar.java b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java similarity index 97% rename from spring/src/main/java/org/dromara/dynamictp/spring/DtpBeanDefinitionRegistrar.java rename to spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java index eebd2ff35..f8f291627 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpBeanDefinitionRegistrar.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.annotation; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -31,6 +31,7 @@ import org.dromara.dynamictp.core.reject.RejectHandlerGetter; import org.dromara.dynamictp.core.support.BinderHelper; import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers; +import org.dromara.dynamictp.spring.util.BeanRegistrationUtil; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; @@ -94,7 +95,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B Class executorTypeClass = ExecutorType.getClass(e.getExecutorType()); Map propertyValues = buildPropertyValues(e); Object[] args = buildConstructorArgs(executorTypeClass, e); - SpringBeanHelper.register(registry, e.getThreadPoolName(), executorTypeClass, propertyValues, args); + BeanRegistrationUtil.register(registry, e.getThreadPoolName(), executorTypeClass, propertyValues, args); }); } diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpConfigurationSelector.java b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpConfigurationSelector.java similarity index 94% rename from spring/src/main/java/org/dromara/dynamictp/spring/DtpConfigurationSelector.java rename to spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpConfigurationSelector.java index e2b9ce29a..bc979277b 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpConfigurationSelector.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpConfigurationSelector.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.annotation; import org.apache.commons.lang3.BooleanUtils; +import org.dromara.dynamictp.spring.DtpBaseBeanConfiguration; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.DeferredImportSelector; import org.springframework.core.Ordered; diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/EnableDynamicTp.java b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/EnableDynamicTp.java similarity index 96% rename from spring/src/main/java/org/dromara/dynamictp/spring/EnableDynamicTp.java rename to spring/src/main/java/org/dromara/dynamictp/spring/annotation/EnableDynamicTp.java index 6b7c9a579..c1c54a00c 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/EnableDynamicTp.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/annotation/EnableDynamicTp.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.annotation; import org.springframework.context.annotation.Import; diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/SpringContextHolder.java b/spring/src/main/java/org/dromara/dynamictp/spring/holder/SpringContextHolder.java similarity index 98% rename from spring/src/main/java/org/dromara/dynamictp/spring/SpringContextHolder.java rename to spring/src/main/java/org/dromara/dynamictp/spring/holder/SpringContextHolder.java index d361b7c64..40b466e05 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/SpringContextHolder.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/holder/SpringContextHolder.java @@ -15,8 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; - +package org.dromara.dynamictp.spring.holder; import org.dromara.dynamictp.common.manager.ContextManager; import org.springframework.beans.BeansException; @@ -27,12 +26,11 @@ import java.util.Map; import java.util.Objects; - /** * Manages the Spring ApplicationContext and provides access to beans and environment properties. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public class SpringContextHolder implements ContextManager, ApplicationContextAware { diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/initializer/SpringDtpInitializer.java b/spring/src/main/java/org/dromara/dynamictp/spring/initializer/SpringDtpInitializer.java new file mode 100644 index 000000000..4ab1199fd --- /dev/null +++ b/spring/src/main/java/org/dromara/dynamictp/spring/initializer/SpringDtpInitializer.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.dromara.dynamictp.spring.initializer; + +import org.dromara.dynamictp.core.support.init.DtpInitializer; +import org.springframework.context.ConfigurableApplicationContext; + +import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_NAME_KEY; + +/** + * SpringDtpInitializer related + * + * @author yanhom + * @since 1.1.0 + */ +public class SpringDtpInitializer implements DtpInitializer { + + private static final String SPRING_APP_NAME_KEY = "spring.application.name"; + + @Override + public String getName() { + return "SpringDtpInitializer"; + } + + @Override + public void init(Object... args) { + ConfigurableApplicationContext c = (ConfigurableApplicationContext) args[0]; + String appName = c.getEnvironment().getProperty(SPRING_APP_NAME_KEY, "application"); + System.setProperty(APP_NAME_KEY, appName); + } +} diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpLifecycleSpringAdapter.java b/spring/src/main/java/org/dromara/dynamictp/spring/lifecycle/DtpLifecycleSpringAdapter.java similarity index 96% rename from spring/src/main/java/org/dromara/dynamictp/spring/DtpLifecycleSpringAdapter.java rename to spring/src/main/java/org/dromara/dynamictp/spring/lifecycle/DtpLifecycleSpringAdapter.java index 904828c17..bcde1437b 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpLifecycleSpringAdapter.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/lifecycle/DtpLifecycleSpringAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.lifecycle; import org.dromara.dynamictp.core.lifecycle.LifeCycleManagement; import org.springframework.context.SmartLifecycle; @@ -24,10 +24,12 @@ * Adapts LifeCycleManagement to Spring's SmartLifecycle interface. * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 */ public class DtpLifecycleSpringAdapter implements SmartLifecycle { + private final LifeCycleManagement lifeCycleManagement; + private boolean isRunning = false; public DtpLifecycleSpringAdapter(LifeCycleManagement lifeCycleManagement) { diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/DtpApplicationListener.java b/spring/src/main/java/org/dromara/dynamictp/spring/listener/DtpApplicationListener.java similarity index 95% rename from spring/src/main/java/org/dromara/dynamictp/spring/DtpApplicationListener.java rename to spring/src/main/java/org/dromara/dynamictp/spring/listener/DtpApplicationListener.java index a8f92d9a8..bd243a083 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/DtpApplicationListener.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/listener/DtpApplicationListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.listener; import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.common.event.CustomContextRefreshedEvent; @@ -26,7 +26,7 @@ * DtpApplicationListener related * * @author vzer200 - * @since 1.1.8 + * @since 1.2.0 **/ @Slf4j public class DtpApplicationListener extends OnceApplicationContextEventListener { diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/OnceApplicationContextEventListener.java b/spring/src/main/java/org/dromara/dynamictp/spring/listener/OnceApplicationContextEventListener.java similarity index 98% rename from spring/src/main/java/org/dromara/dynamictp/spring/OnceApplicationContextEventListener.java rename to spring/src/main/java/org/dromara/dynamictp/spring/listener/OnceApplicationContextEventListener.java index ee0323a0b..df92f601d 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/OnceApplicationContextEventListener.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/listener/OnceApplicationContextEventListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.listener; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/YamlPropertySourceFactory.java b/spring/src/main/java/org/dromara/dynamictp/spring/support/YamlPropertySourceFactory.java similarity index 97% rename from spring/src/main/java/org/dromara/dynamictp/spring/YamlPropertySourceFactory.java rename to spring/src/main/java/org/dromara/dynamictp/spring/support/YamlPropertySourceFactory.java index 05d0069be..c568d3868 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/YamlPropertySourceFactory.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/support/YamlPropertySourceFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.support; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/SpringBeanHelper.java b/spring/src/main/java/org/dromara/dynamictp/spring/util/BeanRegistrationUtil.java similarity index 97% rename from spring/src/main/java/org/dromara/dynamictp/spring/SpringBeanHelper.java rename to spring/src/main/java/org/dromara/dynamictp/spring/util/BeanRegistrationUtil.java index 5e15c85df..cb0abcbfa 100644 --- a/spring/src/main/java/org/dromara/dynamictp/spring/SpringBeanHelper.java +++ b/spring/src/main/java/org/dromara/dynamictp/spring/util/BeanRegistrationUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.dynamictp.spring; +package org.dromara.dynamictp.spring.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -35,9 +35,9 @@ * @since 1.0.4 **/ @Slf4j -public final class SpringBeanHelper { +public final class BeanRegistrationUtil { - private SpringBeanHelper() { } + private BeanRegistrationUtil() { } public static void register(BeanDefinitionRegistry registry, String beanName, diff --git a/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.common.manager.ContextManager b/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.common.manager.ContextManager index c1fd3b234..8f0c75319 100644 --- a/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.common.manager.ContextManager +++ b/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.common.manager.ContextManager @@ -1 +1 @@ -org.dromara.dynamictp.spring.SpringContextHolder +org.dromara.dynamictp.spring.holder.SpringContextHolder diff --git a/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.core.support.init.DtpInitializer b/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.core.support.init.DtpInitializer new file mode 100644 index 000000000..327ad8d07 --- /dev/null +++ b/spring/src/main/resources/META-INF/services/org.dromara.dynamictp.core.support.init.DtpInitializer @@ -0,0 +1 @@ +org.dromara.dynamictp.spring.initializer.SpringDtpInitializer \ No newline at end of file diff --git a/starter/starter-adapter/starter-adapter-webserver/src/main/java/org/dromara/dynamictp/starter/adapter/webserver/AbstractWebServerDtpAdapter.java b/starter/starter-adapter/starter-adapter-webserver/src/main/java/org/dromara/dynamictp/starter/adapter/webserver/AbstractWebServerDtpAdapter.java index 8b899a338..96bd26c90 100644 --- a/starter/starter-adapter/starter-adapter-webserver/src/main/java/org/dromara/dynamictp/starter/adapter/webserver/AbstractWebServerDtpAdapter.java +++ b/starter/starter-adapter/starter-adapter-webserver/src/main/java/org/dromara/dynamictp/starter/adapter/webserver/AbstractWebServerDtpAdapter.java @@ -22,7 +22,7 @@ import org.dromara.dynamictp.common.manager.ContextManagerHelper; import org.dromara.dynamictp.common.properties.DtpProperties; import org.dromara.dynamictp.core.converter.ExecutorConverter; -import org.dromara.dynamictp.spring.SpringContextHolder; +import org.dromara.dynamictp.spring.holder.SpringContextHolder; import org.springframework.boot.web.context.WebServerApplicationContext; import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.boot.web.server.WebServer; diff --git a/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java b/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java index 441fc91fe..414c2741a 100644 --- a/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java +++ b/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/binder/SpringBootPropertiesBinder.java @@ -65,7 +65,6 @@ public void bindDtpProperties(Object environment, DtpProperties dtpProperties) { throw new IllegalArgumentException("Invalid environment type, expected org.springframework.core.env.Environment"); } Environment env = (Environment) environment; - beforeBind(env, dtpProperties); try { Class.forName("org.springframework.boot.context.properties.bind.Binder"); diff --git a/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/initializer/DtpApplicationContextInitializer.java b/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/initializer/DtpApplicationContextInitializer.java index ed9b6645b..bc9ae931d 100644 --- a/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/initializer/DtpApplicationContextInitializer.java +++ b/starter/starter-common/src/main/java/org/dromara/dynamictp/starter/common/initializer/DtpApplicationContextInitializer.java @@ -31,6 +31,6 @@ public class DtpApplicationContextInitializer implements ApplicationContextIniti @Override public void initialize(ConfigurableApplicationContext applicationContext) { - DtpInitializerExecutor.init(); + DtpInitializerExecutor.init(applicationContext); } } diff --git a/test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilsTest.java b/test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilTest.java similarity index 90% rename from test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilsTest.java rename to test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilTest.java index acbcbef7f..ab63d390b 100644 --- a/test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilsTest.java +++ b/test/test-common/src/test/java/org/dromara/dynamictp/test/common/util/BeanCopierUtilTest.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.test.common.util; import net.sf.cglib.beans.BeanCopier; -import org.dromara.dynamictp.common.util.BeanCopierUtils; +import org.dromara.dynamictp.common.util.BeanCopierUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ * @author vzer200 * @since 1.1.8 */ -public class BeanCopierUtilsTest { +public class BeanCopierUtilTest { private SourceClass source; private TargetClass target; @@ -50,7 +50,7 @@ public void setUp() { @Test public void testCopyProperties() { // 使用BeanCopierUtils复制属性 - BeanCopierUtils.copyProperties(source, target); + BeanCopierUtil.copyProperties(source, target); // 验证目标对象的属性值是否正确复制 assertEquals(source.getId(), target.getId()); @@ -63,7 +63,7 @@ public void testCopyPropertiesWithNullValues() { // 测试当源对象中有空值时的情况 source.setName(null); - BeanCopierUtils.copyProperties(source, target); + BeanCopierUtil.copyProperties(source, target); assertEquals(source.getId(), target.getId()); assertNull(target.getName()); // 名称为空时应正确复制 @@ -73,8 +73,8 @@ public void testCopyPropertiesWithNullValues() { @Test public void testBeanCopierCache() { // 测试BeanCopier缓存机制是否有效 - BeanCopier firstCopier = BeanCopierUtils.getBeanCopier(SourceClass.class, TargetClass.class); - BeanCopier secondCopier = BeanCopierUtils.getBeanCopier(SourceClass.class, TargetClass.class); + BeanCopier firstCopier = BeanCopierUtil.getBeanCopier(SourceClass.class, TargetClass.class); + BeanCopier secondCopier = BeanCopierUtil.getBeanCopier(SourceClass.class, TargetClass.class); assertSame(firstCopier, secondCopier); // 同样的source和target类应返回同一个BeanCopier实例 } diff --git a/test/test-configcenter/src/test/java/org/dromara/dynamictp/test/configcenter/DtpBaseTest.java b/test/test-configcenter/src/test/java/org/dromara/dynamictp/test/configcenter/DtpBaseTest.java index c15964c06..3cc40c567 100644 --- a/test/test-configcenter/src/test/java/org/dromara/dynamictp/test/configcenter/DtpBaseTest.java +++ b/test/test-configcenter/src/test/java/org/dromara/dynamictp/test/configcenter/DtpBaseTest.java @@ -17,8 +17,8 @@ package org.dromara.dynamictp.test.configcenter; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.BeforeAll; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/notify/AbstractDtpNotifierTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/notify/AbstractDtpNotifierTest.java index 7d1697f3b..31402d14c 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/notify/AbstractDtpNotifierTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/notify/AbstractDtpNotifierTest.java @@ -36,7 +36,7 @@ import org.dromara.dynamictp.core.support.ExecutorWrapper; import org.dromara.dynamictp.core.support.ThreadPoolCreator; import org.dromara.dynamictp.core.executor.DtpExecutor; -import org.dromara.dynamictp.spring.SpringContextHolder; +import org.dromara.dynamictp.spring.holder.SpringContextHolder; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/Config.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/Config.java index e096c4b45..972552a9e 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/Config.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/Config.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.test.core.spring; import org.dromara.dynamictp.core.support.DynamicTp; -import org.dromara.dynamictp.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpBaseBeanConfigurationTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpBaseBeanConfigurationTest.java index d20025fbf..0124de69e 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpBaseBeanConfigurationTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpBaseBeanConfigurationTest.java @@ -21,6 +21,9 @@ import org.dromara.dynamictp.core.monitor.DtpMonitor; import org.dromara.dynamictp.core.support.DtpBannerPrinter; import org.dromara.dynamictp.spring.*; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.holder.SpringContextHolder; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpLifecycleSpringAdapterTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpLifecycleSpringAdapterTest.java index b8bd7058d..a56bc3c5e 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpLifecycleSpringAdapterTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpLifecycleSpringAdapterTest.java @@ -18,7 +18,7 @@ package org.dromara.dynamictp.test.core.spring; import org.dromara.dynamictp.core.lifecycle.LifeCycleManagement; -import org.dromara.dynamictp.spring.DtpLifecycleSpringAdapter; +import org.dromara.dynamictp.spring.lifecycle.DtpLifecycleSpringAdapter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java index a4c323bb6..db43d6c87 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/DtpPostProcessorTest.java @@ -19,8 +19,8 @@ import org.dromara.dynamictp.core.DtpRegistry; import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java index 98e0f1903..79164635d 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/PropertiesBinderTest.java @@ -22,8 +22,8 @@ import com.google.common.collect.Maps; import org.dromara.dynamictp.common.properties.DtpProperties; import org.dromara.dynamictp.core.support.BinderHelper; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/SpringContextHolderTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/SpringContextHolderTest.java index 7a5f467c4..4005571a0 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/SpringContextHolderTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/spring/SpringContextHolderTest.java @@ -17,7 +17,7 @@ package org.dromara.dynamictp.test.core.spring; -import org.dromara.dynamictp.spring.SpringContextHolder; +import org.dromara.dynamictp.spring.holder.SpringContextHolder; import org.junit.jupiter.api.*; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/DtpLifecycleSupportTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/DtpLifecycleSupportTest.java index 6d58eccc0..5a05047f1 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/DtpLifecycleSupportTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/DtpLifecycleSupportTest.java @@ -23,7 +23,7 @@ import org.dromara.dynamictp.core.notifier.manager.NotifyHelper; import org.dromara.dynamictp.core.support.DtpLifecycleSupport; import org.dromara.dynamictp.core.support.ExecutorWrapper; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/DtpExecutorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/DtpExecutorTest.java index 28c68dca4..afac8d175 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/DtpExecutorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/DtpExecutorTest.java @@ -21,8 +21,8 @@ import org.dromara.dynamictp.core.DtpRegistry; import org.dromara.dynamictp.core.notifier.manager.AlarmManager; import org.dromara.dynamictp.core.support.ExecutorWrapper; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/EagerDtpExecutorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/EagerDtpExecutorTest.java index 472009eb9..a7b029f5f 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/EagerDtpExecutorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/EagerDtpExecutorTest.java @@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.core.DtpRegistry; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/OrderedDtpExecutorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/OrderedDtpExecutorTest.java index 0d5611c63..41671a9cf 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/OrderedDtpExecutorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/OrderedDtpExecutorTest.java @@ -25,8 +25,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.MDC; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/PriorityDtpExecutorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/PriorityDtpExecutorTest.java index 2bbacb2da..9fd72c693 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/PriorityDtpExecutorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/PriorityDtpExecutorTest.java @@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.core.executor.priority.PriorityDtpExecutor; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/ScheduledDtpExecutorTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/ScheduledDtpExecutorTest.java index 191fbcd7e..cb60abdba 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/ScheduledDtpExecutorTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/ScheduledDtpExecutorTest.java @@ -19,8 +19,8 @@ import org.dromara.dynamictp.core.DtpRegistry; import org.dromara.dynamictp.core.executor.ScheduledDtpExecutor; -import org.dromara.dynamictp.spring.EnableDynamicTp; -import org.dromara.dynamictp.spring.YamlPropertySourceFactory; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; +import org.dromara.dynamictp.spring.support.YamlPropertySourceFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java index 8c5a82986..3fc5d59c4 100644 --- a/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java +++ b/test/test-core/src/test/java/org/dromara/dynamictp/test/core/thread/proxy/ThreadPoolExecutorProxyTest.java @@ -23,7 +23,7 @@ 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.spring.EnableDynamicTp; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/test/test-core/src/test/resources/META-INF/spring.factories b/test/test-core/src/test/resources/META-INF/spring.factories index 7856b020a..a753c9a83 100644 --- a/test/test-core/src/test/resources/META-INF/spring.factories +++ b/test/test-core/src/test/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.dromara.dynamictp.spring.DtpBaseBeanConfiguration,\ -org.dromara.dynamictp.spring.DtpBaseBeanDefinitionRegistrar,\ -org.dromara.dynamictp.spring.DtpBeanDefinitionRegistrar +org.dromara.dynamictp.spring.annotation.DtpBaseBeanDefinitionRegistrar,\ +org.dromara.dynamictp.spring.annotation.DtpBeanDefinitionRegistrar