Skip to content

Commit fddcecd

Browse files
committed
remove residual spring related from the core
1 parent e858bc2 commit fddcecd

File tree

7 files changed

+20
-29
lines changed

7 files changed

+20
-29
lines changed

common/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
<artifactId>dynamic-tp-common</artifactId>
1212

1313
<dependencies>
14-
<dependency>
15-
<groupId>org.springframework</groupId>
16-
<artifactId>spring-context</artifactId>
17-
</dependency>
18-
1914
<dependency>
2015
<groupId>org.slf4j</groupId>
2116
<artifactId>slf4j-api</artifactId>
@@ -60,6 +55,7 @@
6055
<groupId>cglib</groupId>
6156
<artifactId>cglib</artifactId>
6257
</dependency>
58+
6359
<dependency>
6460
<groupId>org.yaml</groupId>
6561
<artifactId>snakeyaml</artifactId>

common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private DtpProperties() { }
4343
private boolean enabled = true;
4444

4545
/**
46-
* Environment, if not set, will use "spring.profiles.active".
46+
* Environment, if not set, will use "APP.ENV".
4747
*/
4848
private String env;
4949

core/src/main/java/org/dromara/dynamictp/core/lifecycle/DtpLifecycle.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,37 +59,23 @@ public boolean isRunning() {
5959
return this.running.get();
6060
}
6161

62-
/**
63-
* Compatible with lower versions of spring.
64-
*
65-
* @param callback callback
66-
*/
6762
@Override
6863
public void stop(Runnable callback) {
6964
stop();
7065
callback.run();
7166
}
7267

73-
/**
74-
* Compatible with lower versions of spring.
75-
*
76-
* @return isAutoStartup
77-
*/
7868
@Override
7969
public boolean isAutoStartup() {
8070
return true;
8171
}
8272

83-
/**
84-
* Compatible with lower versions of spring.
85-
*
86-
* @return phase
87-
*/
8873
@Override
8974
public int getPhase() {
9075
return Integer.MAX_VALUE;
9176
}
9277

78+
@Override
9379
public void shutdownInternal() {
9480
DtpMonitor.destroy();
9581
AlarmManager.destroy();

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/JMXCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import lombok.extern.slf4j.Slf4j;
2121
import org.dromara.dynamictp.common.em.CollectorTypeEnum;
2222
import org.dromara.dynamictp.common.entity.ThreadPoolStats;
23+
import org.dromara.dynamictp.common.util.BeanCopierUtil;
2324
import org.dromara.dynamictp.core.monitor.collector.AbstractCollector;
24-
import org.springframework.beans.BeanUtils;
2525

2626
import javax.management.JMException;
2727
import javax.management.MBeanServer;
@@ -49,7 +49,7 @@ public class JMXCollector extends AbstractCollector {
4949
public void collect(ThreadPoolStats threadPoolStats) {
5050
if (GAUGE_CACHE.containsKey(threadPoolStats.getPoolName())) {
5151
ThreadPoolStats poolStats = GAUGE_CACHE.get(threadPoolStats.getPoolName());
52-
BeanUtils.copyProperties(threadPoolStats, poolStats);
52+
BeanCopierUtil.copyProperties(threadPoolStats, poolStats);
5353
} else {
5454
try {
5555
MBeanServer server = ManagementFactory.getPlatformMBeanServer();

core/src/main/java/org/dromara/dynamictp/core/notifier/AbstractDtpNotifier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.dromara.dynamictp.common.entity.NotifyPlatform;
2929
import org.dromara.dynamictp.common.entity.TpMainFields;
3030
import org.dromara.dynamictp.common.notifier.Notifier;
31+
import org.dromara.dynamictp.common.util.BeanCopierUtil;
3132
import org.dromara.dynamictp.common.util.CommonUtil;
3233
import org.dromara.dynamictp.common.util.DateUtil;
3334
import org.dromara.dynamictp.core.notifier.alarm.AlarmCounter;
@@ -37,7 +38,6 @@
3738
import org.dromara.dynamictp.core.support.ExecutorWrapper;
3839
import org.dromara.dynamictp.core.system.SystemMetricManager;
3940
import org.slf4j.MDC;
40-
import org.springframework.beans.BeanUtils;
4141

4242
import java.lang.reflect.Field;
4343
import java.util.List;
@@ -182,7 +182,7 @@ protected String formatReceivers(String receives) {
182182

183183
private NotifyPlatform newTargetPlatform(NotifyPlatform platform) {
184184
NotifyPlatform targetPlatform = new NotifyPlatform();
185-
BeanUtils.copyProperties(platform, targetPlatform);
185+
BeanCopierUtil.copyProperties(platform, targetPlatform);
186186

187187
BaseNotifyCtx context = DtpNotifyCtxHolder.get();
188188
NotifyItem item = context.getNotifyItem();

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.dromara.dynamictp.core.support;
1919

2020
import lombok.extern.slf4j.Slf4j;
21-
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
2221

2322
import java.util.Objects;
2423
import java.util.concurrent.ExecutorService;
@@ -28,8 +27,7 @@
2827
import java.util.concurrent.TimeUnit;
2928

3029
/**
31-
* DtpLifecycleSupport which mainly implements Spring bean's lifecycle management,
32-
* mimics spring internal thread pool {@link ThreadPoolTaskExecutor}.
30+
* DtpLifecycleSupport which mainly implements ThreadPoolExecutor's lifecycle management.
3331
*
3432
* @author yanhom
3533
* @since 1.0.3

spring/src/main/java/org/dromara/dynamictp/spring/lifecycle/DtpLifecycleSpringAdapter.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,28 @@ public boolean isRunning() {
5353
return isRunning;
5454
}
5555

56+
@Override
5657
public void stop(Runnable callback) {
57-
lifeCycleManagement.stop();
58+
lifeCycleManagement.stop(callback);
5859
callback.run();
5960
isRunning = false;
6061
}
6162

63+
/**
64+
* Compatible with lower versions of spring.
65+
*
66+
* @return isAutoStartup
67+
*/
6268
@Override
6369
public boolean isAutoStartup() {
6470
return lifeCycleManagement.isAutoStartup();
6571
}
6672

73+
/**
74+
* Compatible with lower versions of spring.
75+
*
76+
* @return phase
77+
*/
6778
@Override
6879
public int getPhase() {
6980
return lifeCycleManagement.getPhase();

0 commit comments

Comments
 (0)