From 4d72f265d9f77beca0e212aa057711c2eda002d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E8=93=AC?= Date: Tue, 14 May 2024 00:32:56 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- koupleless-adapter-springboot-2.4.6/pom.xml | 3 ++- koupleless-adapter-springboot-2.7/pom.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koupleless-adapter-springboot-2.4.6/pom.xml b/koupleless-adapter-springboot-2.4.6/pom.xml index 771f380ff..f8fb6072d 100644 --- a/koupleless-adapter-springboot-2.4.6/pom.xml +++ b/koupleless-adapter-springboot-2.4.6/pom.xml @@ -6,7 +6,8 @@ com.alipay.sofa.koupleless koupleless-adapter - 1.2.0 + ${revision} + ../pom.xml diff --git a/koupleless-adapter-springboot-2.7/pom.xml b/koupleless-adapter-springboot-2.7/pom.xml index 204c48c35..3397cf064 100644 --- a/koupleless-adapter-springboot-2.7/pom.xml +++ b/koupleless-adapter-springboot-2.7/pom.xml @@ -6,7 +6,8 @@ com.alipay.sofa.koupleless koupleless-adapter - 1.2.0 + ${revision} + ../pom.xml koupleless-adapter-springboot-2.7 From b153a1421ee8fa10d3e8e6ea21c34e8c04c8327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E8=93=AC?= Date: Wed, 15 May 2024 12:12:45 +0800 Subject: [PATCH 2/9] rename KouplelessScheduledExecutorService & KouplelessExecutorService --- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 873e9c21d..5b3a2fe02 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; @@ -20,7 +20,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorServiceAdaptor executor = new KouplelessExecutorServiceAdaptor(executorService); + KouplelessExecutorService executor = new KouplelessExecutorService(executorService); ClassUtil.setField("threadPoolExecutor", this, executor); return executor; } diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index e0cdffee4..1d9f0364e 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; @@ -24,7 +24,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorServiceAdaptor(scheduledExecutor); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); ClassUtil.setField("scheduledExecutor", this, executor); return executor; } diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 873e9c21d..5b3a2fe02 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; @@ -20,7 +20,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorServiceAdaptor executor = new KouplelessExecutorServiceAdaptor(executorService); + KouplelessExecutorService executor = new KouplelessExecutorService(executorService); ClassUtil.setField("threadPoolExecutor", this, executor); return executor; } diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index e0cdffee4..1d9f0364e 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; @@ -24,7 +24,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorServiceAdaptor(scheduledExecutor); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); ClassUtil.setField("scheduledExecutor", this, executor); return executor; } diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 873e9c21d..5b3a2fe02 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; @@ -20,7 +20,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorServiceAdaptor executor = new KouplelessExecutorServiceAdaptor(executorService); + KouplelessExecutorService executor = new KouplelessExecutorService(executorService); ClassUtil.setField("threadPoolExecutor", this, executor); return executor; } diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index e0cdffee4..1d9f0364e 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorServiceAdaptor; +import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; @@ -24,7 +24,7 @@ protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorServiceAdaptor(scheduledExecutor); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); ClassUtil.setField("scheduledExecutor", this, executor); return executor; } From 152cd6cc29e9317e57853978ffa7372d820c6017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E8=93=AC?= Date: Wed, 15 May 2024 15:55:20 +0800 Subject: [PATCH 3/9] refactor --- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 5b3a2fe02..bf8baf38e 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 1d9f0364e..cb886a0ed 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 5b3a2fe02..bf8baf38e 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 1d9f0364e..cb886a0ed 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 5b3a2fe02..bf8baf38e 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 1d9f0364e..cb886a0ed 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.util.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; From 89528252f7e4577b790b33575bb8823f1c3c00e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E8=93=AC?= Date: Wed, 15 May 2024 17:18:53 +0800 Subject: [PATCH 4/9] refactor --- koupleless-adapter-springboot-2.3/pom.xml | 2 +- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- koupleless-adapter-springboot-2.4.6/pom.xml | 2 +- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- koupleless-adapter-springboot-2.7/pom.xml | 2 +- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 2 +- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koupleless-adapter-springboot-2.3/pom.xml b/koupleless-adapter-springboot-2.3/pom.xml index e9ce9fb47..ae795712f 100644 --- a/koupleless-adapter-springboot-2.3/pom.xml +++ b/koupleless-adapter-springboot-2.3/pom.xml @@ -35,7 +35,7 @@ com.alipay.sofa.koupleless - koupleless-common + koupleless-base-plugin ${revision} provided diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index bf8baf38e..a482a85d1 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index cb886a0ed..ec62abb01 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.4.6/pom.xml b/koupleless-adapter-springboot-2.4.6/pom.xml index f8fb6072d..b0c989a37 100644 --- a/koupleless-adapter-springboot-2.4.6/pom.xml +++ b/koupleless-adapter-springboot-2.4.6/pom.xml @@ -36,7 +36,7 @@ com.alipay.sofa.koupleless - koupleless-common + koupleless-base-plugin ${revision} provided diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index bf8baf38e..a482a85d1 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index cb886a0ed..ec62abb01 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.7/pom.xml b/koupleless-adapter-springboot-2.7/pom.xml index 3397cf064..e1e979be2 100644 --- a/koupleless-adapter-springboot-2.7/pom.xml +++ b/koupleless-adapter-springboot-2.7/pom.xml @@ -35,7 +35,7 @@ com.alipay.sofa.koupleless - koupleless-common + koupleless-base-plugin ${revision} provided diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index bf8baf38e..a482a85d1 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -2,7 +2,7 @@ import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ExecutorService; diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index cb886a0ed..ec62abb01 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -5,7 +5,7 @@ package com.alipay.sofa.koupleless.common; import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.common.api.KouplelessScheduledExecutorService; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ExecutorService; From 7e4ad115b348b692ccec4e874fe42a23aeb1542f Mon Sep 17 00:00:00 2001 From: gaosaroma Date: Mon, 20 May 2024 00:16:53 +0800 Subject: [PATCH 5/9] refactor --- .../pom.xml | 2 +- .../KouplelessThreadPoolTaskExecutor.java | 43 ++++++++++ .../KouplelessThreadPoolTaskScheduler.java | 45 ++++++++++ .../task/TaskExecutionAutoConfiguration.java | 16 ++-- .../task/TaskSchedulingAutoConfiguration.java | 17 ++-- .../pom.xml | 43 ++++++++++ .../KouplelessThreadPoolTaskExecutor.java | 43 ++++++++++ .../task/TaskExecutionAutoConfiguration.java | 16 ++-- .../pom.xml | 43 ++++++++++ .../KouplelessThreadPoolTaskScheduler.java | 45 ++++++++++ .../task/TaskSchedulingAutoConfiguration.java | 19 ++++- .../pom.xml | 2 +- .../KouplelessThreadPoolTaskScheduler.java | 45 ++++++++++ .../task/TaskSchedulingAutoConfiguration.java | 17 ++-- koupleless-adapter-springboot-2.3/pom.xml | 2 +- .../KouplelessThreadPoolTaskExecutor.java | 27 ------ .../KouplelessThreadPoolTaskScheduler.java | 31 ------- .../task/TaskExecutionAutoConfiguration.java | 83 ------------------- .../KouplelessThreadPoolTaskExecutor.java | 27 ------ .../KouplelessThreadPoolTaskScheduler.java | 31 ------- .../KouplelessThreadPoolTaskExecutor.java | 27 ------ .../KouplelessThreadPoolTaskScheduler.java | 31 ------- pom.xml | 6 +- 23 files changed, 366 insertions(+), 295 deletions(-) rename {koupleless-adapter-springboot-2.7 => koupleless-adapter-executor-spring-2.7}/pom.xml (95%) create mode 100644 koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java create mode 100644 koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename {koupleless-adapter-springboot-2.7 => koupleless-adapter-executor-spring-2.7}/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java (86%) rename {koupleless-adapter-springboot-2.7 => koupleless-adapter-executor-spring-2.7}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (85%) create mode 100644 koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml create mode 100644 koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java rename {koupleless-adapter-springboot-2.4.6 => koupleless-adapter-executorservice-spring-2.3-2.6}/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java (86%) create mode 100644 koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml create mode 100644 koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename {koupleless-adapter-springboot-2.3 => koupleless-adapter-scheduler-spring-2.3-2.4.5}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (76%) rename {koupleless-adapter-springboot-2.4.6 => koupleless-adapter-scheduler-spring-2.4.6-2.7}/pom.xml (95%) create mode 100644 koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename {koupleless-adapter-springboot-2.4.6 => koupleless-adapter-scheduler-spring-2.4.6-2.7}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (86%) delete mode 100644 koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java delete mode 100644 koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java delete mode 100644 koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java delete mode 100644 koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java delete mode 100644 koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java delete mode 100644 koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java delete mode 100644 koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java diff --git a/koupleless-adapter-springboot-2.7/pom.xml b/koupleless-adapter-executor-spring-2.7/pom.xml similarity index 95% rename from koupleless-adapter-springboot-2.7/pom.xml rename to koupleless-adapter-executor-spring-2.7/pom.xml index e1e979be2..e611ba582 100644 --- a/koupleless-adapter-springboot-2.7/pom.xml +++ b/koupleless-adapter-executor-spring-2.7/pom.xml @@ -10,7 +10,7 @@ ../pom.xml - koupleless-adapter-springboot-2.7 + koupleless-adapter-executor-spring-2.7 ${revision} diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java new file mode 100644 index 000000000..117bdecf2 --- /dev/null +++ b/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -0,0 +1,43 @@ +/* + * 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 com.alipay.sofa.koupleless.common; + +import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadFactory; + +/** + * @author lianglipeng.llp@alibaba-inc.com + * @version $Id: KouplelessThreadPoolTaskExecutor.java, v 0.1 2024年05月13日 20:51 立蓬 Exp $ + */ +public class KouplelessThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { + + @Override + protected ExecutorService initializeExecutor(ThreadFactory threadFactory, + RejectedExecutionHandler rejectedExecutionHandler) { + + ExecutorService executorService = super.initializeExecutor(threadFactory, + rejectedExecutionHandler); + KouplelessExecutorService executor = new KouplelessExecutorService(executorService); + ClassUtil.setField("threadPoolExecutor", this, executor); + return executor; + } +} \ No newline at end of file diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java new file mode 100644 index 000000000..466125554 --- /dev/null +++ b/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -0,0 +1,45 @@ +/* + * 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 com.alipay.sofa.koupleless.common; + +import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; + +/** + * @author lianglipeng.llp@alibaba-inc.com + * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ + */ +public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { + + @Override + protected ExecutorService initializeExecutor(ThreadFactory threadFactory, + RejectedExecutionHandler rejectedExecutionHandler) { + + ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor( + threadFactory, rejectedExecutionHandler); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService( + scheduledExecutor); + ClassUtil.setField("scheduledExecutor", this, executor); + return executor; + } +} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java similarity index 86% rename from koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java rename to koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java index cbdefc058..884b78163 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java +++ b/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java @@ -1,11 +1,12 @@ /* - * Copyright 2012-2022 the original author or authors. + * 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 * - * Licensed 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 - * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -13,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.boot.autoconfigure.task; import java.util.concurrent.Executor; @@ -75,7 +75,7 @@ public TaskExecutorBuilder taskExecutorBuilder(TaskExecutionProperties propertie @Lazy @Bean(name = { APPLICATION_TASK_EXECUTOR_BEAN_NAME, - AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME }) + AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME }) @ConditionalOnMissingBean(Executor.class) public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) { // 修改了此处 diff --git a/koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 85% rename from koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java index 157a9c957..0f0606a58 100644 --- a/koupleless-adapter-springboot-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java +++ b/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java @@ -1,11 +1,12 @@ /* - * Copyright 2012-2022 the original author or authors. + * 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 * - * Licensed 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 - * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -13,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.boot.autoconfigure.task; import com.alipay.sofa.koupleless.common.KouplelessThreadPoolTaskScheduler; @@ -49,7 +49,8 @@ public class TaskSchedulingAutoConfiguration { @Bean @ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME) - @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, ScheduledExecutorService.class }) + @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, + ScheduledExecutorService.class }) public ThreadPoolTaskScheduler taskScheduler(TaskSchedulerBuilder builder) { return builder.configure(new KouplelessThreadPoolTaskScheduler()); } diff --git a/koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml b/koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml new file mode 100644 index 000000000..fc15ca10c --- /dev/null +++ b/koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.alipay.sofa.koupleless + koupleless-adapter + ${revision} + ../pom.xml + + + koupleless-adapter-executorservice-spring-2.3-2.6 + + + 2.3.5.RELEASE + 1.8 + + + + + org.springframework.boot + spring-boot + ${spring.boot.version} + provided + + + + org.springframework.boot + spring-boot-autoconfigure + ${spring.boot.version} + provided + + + + com.alipay.sofa.koupleless + koupleless-base-plugin + ${revision} + provided + + + + \ No newline at end of file diff --git a/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java new file mode 100644 index 000000000..117bdecf2 --- /dev/null +++ b/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -0,0 +1,43 @@ +/* + * 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 com.alipay.sofa.koupleless.common; + +import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadFactory; + +/** + * @author lianglipeng.llp@alibaba-inc.com + * @version $Id: KouplelessThreadPoolTaskExecutor.java, v 0.1 2024年05月13日 20:51 立蓬 Exp $ + */ +public class KouplelessThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { + + @Override + protected ExecutorService initializeExecutor(ThreadFactory threadFactory, + RejectedExecutionHandler rejectedExecutionHandler) { + + ExecutorService executorService = super.initializeExecutor(threadFactory, + rejectedExecutionHandler); + KouplelessExecutorService executor = new KouplelessExecutorService(executorService); + ClassUtil.setField("threadPoolExecutor", this, executor); + return executor; + } +} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java similarity index 86% rename from koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java rename to koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java index 8c3f65ebb..2b2ec58c2 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java +++ b/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java @@ -1,11 +1,12 @@ /* - * Copyright 2012-2019 the original author or authors. + * 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 * - * Licensed 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 - * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -13,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.boot.autoconfigure.task; import com.alipay.sofa.koupleless.common.KouplelessThreadPoolTaskExecutor; @@ -75,7 +75,7 @@ public TaskExecutorBuilder taskExecutorBuilder(TaskExecutionProperties propertie @Lazy @Bean(name = { APPLICATION_TASK_EXECUTOR_BEAN_NAME, - AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME }) + AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME }) @ConditionalOnMissingBean(Executor.class) public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) { return builder.configure(new KouplelessThreadPoolTaskExecutor()); diff --git a/koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml b/koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml new file mode 100644 index 000000000..bb9f9fac2 --- /dev/null +++ b/koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.alipay.sofa.koupleless + koupleless-adapter + ${revision} + ../pom.xml + + + + koupleless-adapter-scheduler-spring-2.3-2.4.5 + + + 2.3.5.RELEASE + 1.8 + + + + + org.springframework.boot + spring-boot + ${spring.boot.version} + provided + + + + org.springframework.boot + spring-boot-autoconfigure + ${spring.boot.version} + provided + + + + com.alipay.sofa.koupleless + koupleless-base-plugin + ${revision} + provided + + + \ No newline at end of file diff --git a/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java new file mode 100644 index 000000000..466125554 --- /dev/null +++ b/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -0,0 +1,45 @@ +/* + * 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 com.alipay.sofa.koupleless.common; + +import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; + +/** + * @author lianglipeng.llp@alibaba-inc.com + * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ + */ +public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { + + @Override + protected ExecutorService initializeExecutor(ThreadFactory threadFactory, + RejectedExecutionHandler rejectedExecutionHandler) { + + ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor( + threadFactory, rejectedExecutionHandler); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService( + scheduledExecutor); + ClassUtil.setField("scheduledExecutor", this, executor); + return executor; + } +} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 76% rename from koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java index a020c52c0..ed4935932 100644 --- a/koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java +++ b/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java @@ -1,3 +1,19 @@ +/* + * 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.springframework.boot.autoconfigure.task; import java.util.concurrent.ScheduledExecutorService; @@ -35,7 +51,8 @@ public class TaskSchedulingAutoConfiguration { @Bean @ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME) - @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, ScheduledExecutorService.class }) + @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, + ScheduledExecutorService.class }) public ThreadPoolTaskScheduler taskScheduler(TaskSchedulerBuilder builder) { return builder.configure(new KouplelessThreadPoolTaskScheduler()); } diff --git a/koupleless-adapter-springboot-2.4.6/pom.xml b/koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml similarity index 95% rename from koupleless-adapter-springboot-2.4.6/pom.xml rename to koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml index b0c989a37..d0b1a007f 100644 --- a/koupleless-adapter-springboot-2.4.6/pom.xml +++ b/koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml @@ -11,7 +11,7 @@ - koupleless-adapter-springboot-2.4.6 + koupleless-adapter-scheduler-spring-2.4.6-2.7 ${revision} diff --git a/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java new file mode 100644 index 000000000..466125554 --- /dev/null +++ b/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -0,0 +1,45 @@ +/* + * 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 com.alipay.sofa.koupleless.common; + +import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; + +/** + * @author lianglipeng.llp@alibaba-inc.com + * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ + */ +public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { + + @Override + protected ExecutorService initializeExecutor(ThreadFactory threadFactory, + RejectedExecutionHandler rejectedExecutionHandler) { + + ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor( + threadFactory, rejectedExecutionHandler); + ScheduledExecutorService executor = new KouplelessScheduledExecutorService( + scheduledExecutor); + ClassUtil.setField("scheduledExecutor", this, executor); + return executor; + } +} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 86% rename from koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java index 5a5c412f0..69f64ce03 100644 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java +++ b/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java @@ -1,11 +1,12 @@ /* - * Copyright 2012-2019 the original author or authors. + * 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 * - * Licensed 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 - * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -13,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.boot.autoconfigure.task; import java.util.concurrent.ScheduledExecutorService; @@ -51,7 +51,8 @@ public class TaskSchedulingAutoConfiguration { @Bean @ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME) - @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, ScheduledExecutorService.class }) + @ConditionalOnMissingBean({ SchedulingConfigurer.class, TaskScheduler.class, + ScheduledExecutorService.class }) public ThreadPoolTaskScheduler taskScheduler(TaskSchedulerBuilder builder) { return builder.configure(new KouplelessThreadPoolTaskScheduler()); } diff --git a/koupleless-adapter-springboot-2.3/pom.xml b/koupleless-adapter-springboot-2.3/pom.xml index ae795712f..e9ce9fb47 100644 --- a/koupleless-adapter-springboot-2.3/pom.xml +++ b/koupleless-adapter-springboot-2.3/pom.xml @@ -35,7 +35,7 @@ com.alipay.sofa.koupleless - koupleless-base-plugin + koupleless-common ${revision} provided diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java deleted file mode 100644 index a482a85d1..000000000 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.alipay.sofa.koupleless.common; - - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskExecutor.java, v 0.1 2024年05月13日 20:51 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorService executor = new KouplelessExecutorService(executorService); - ClassUtil.setField("threadPoolExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java deleted file mode 100644 index ec62abb01..000000000 --- a/koupleless-adapter-springboot-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Alipay.com Inc. - * Copyright (c) 2004-2024 All Rights Reserved. - */ -package com.alipay.sofa.koupleless.common; - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java deleted file mode 100644 index 8c3f65ebb..000000000 --- a/koupleless-adapter-springboot-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed 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 - * - * https://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.springframework.boot.autoconfigure.task; - -import com.alipay.sofa.koupleless.common.KouplelessThreadPoolTaskExecutor; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.task.TaskExecutionProperties.Shutdown; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.task.TaskExecutorBuilder; -import org.springframework.boot.task.TaskExecutorCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.task.TaskDecorator; -import org.springframework.core.task.TaskExecutor; -import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.Executor; - -/** - * {@link EnableAutoConfiguration Auto-configuration} for {@link TaskExecutor}. - * springboot 2.3.x～2.6.x 均可以用该类覆盖 - * @author Stephane Nicoll - * @author Camille Vienot - * @since 2.1.0 - */ -@ConditionalOnClass(ThreadPoolTaskExecutor.class) -@Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties(TaskExecutionProperties.class) -public class TaskExecutionAutoConfiguration { - - /** - * Bean name of the application {@link TaskExecutor}. - */ - public static final String APPLICATION_TASK_EXECUTOR_BEAN_NAME = "applicationTaskExecutor"; - - @Bean - @ConditionalOnMissingBean - public TaskExecutorBuilder taskExecutorBuilder(TaskExecutionProperties properties, - ObjectProvider taskExecutorCustomizers, - ObjectProvider taskDecorator) { - TaskExecutionProperties.Pool pool = properties.getPool(); - TaskExecutorBuilder builder = new TaskExecutorBuilder(); - builder = builder.queueCapacity(pool.getQueueCapacity()); - builder = builder.corePoolSize(pool.getCoreSize()); - builder = builder.maxPoolSize(pool.getMaxSize()); - builder = builder.allowCoreThreadTimeOut(pool.isAllowCoreThreadTimeout()); - builder = builder.keepAlive(pool.getKeepAlive()); - Shutdown shutdown = properties.getShutdown(); - builder = builder.awaitTermination(shutdown.isAwaitTermination()); - builder = builder.awaitTerminationPeriod(shutdown.getAwaitTerminationPeriod()); - builder = builder.threadNamePrefix(properties.getThreadNamePrefix()); - builder = builder.customizers(taskExecutorCustomizers.orderedStream()::iterator); - builder = builder.taskDecorator(taskDecorator.getIfUnique()); - return builder; - } - - @Lazy - @Bean(name = { APPLICATION_TASK_EXECUTOR_BEAN_NAME, - AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME }) - @ConditionalOnMissingBean(Executor.class) - public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) { - return builder.configure(new KouplelessThreadPoolTaskExecutor()); - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java deleted file mode 100644 index a482a85d1..000000000 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.alipay.sofa.koupleless.common; - - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskExecutor.java, v 0.1 2024年05月13日 20:51 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorService executor = new KouplelessExecutorService(executorService); - ClassUtil.setField("threadPoolExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java deleted file mode 100644 index ec62abb01..000000000 --- a/koupleless-adapter-springboot-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Alipay.com Inc. - * Copyright (c) 2004-2024 All Rights Reserved. - */ -package com.alipay.sofa.koupleless.common; - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java deleted file mode 100644 index a482a85d1..000000000 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.alipay.sofa.koupleless.common; - - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskExecutor.java, v 0.1 2024年05月13日 20:51 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); - KouplelessExecutorService executor = new KouplelessExecutorService(executorService); - ClassUtil.setField("threadPoolExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java deleted file mode 100644 index ec62abb01..000000000 --- a/koupleless-adapter-springboot-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Alipay.com Inc. - * Copyright (c) 2004-2024 All Rights Reserved. - */ -package com.alipay.sofa.koupleless.common; - -import com.alipay.sofa.koupleless.common.util.ClassUtil; -import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; - -/** - * @author lianglipeng.llp@alibaba-inc.com - * @version $Id: KouplelessThreadPoolTaskScheduler.java, v 0.1 2024年05月13日 23:33 立蓬 Exp $ - */ -public class KouplelessThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { - - @Override - protected ExecutorService initializeExecutor( - ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - - ScheduledExecutorService scheduledExecutor = (ScheduledExecutorService) super.initializeExecutor(threadFactory, rejectedExecutionHandler); - ScheduledExecutorService executor = new KouplelessScheduledExecutorService(scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); - return executor; - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9cdf06991..311314f36 100644 --- a/pom.xml +++ b/pom.xml @@ -88,8 +88,10 @@ koupleless-adapter-logback koupleless-adapter-logback-spring-starter-3.0 koupleless-adapter-logback-spring-starter-3.2 - koupleless-adapter-springboot-2.7 - koupleless-adapter-springboot-2.4.6 + koupleless-adapter-executor-spring-2.7 + koupleless-adapter-scheduler-spring-2.4.6-2.7 + koupleless-adapter-executorservice-spring-2.3-2.6 + koupleless-adapter-scheduler-spring-2.3-2.4.5 From 68090d50577676ce448fcba17d05b260d1f26746 Mon Sep 17 00:00:00 2001 From: gaosaroma Date: Mon, 27 May 2024 11:05:21 +0800 Subject: [PATCH 6/9] add java.version for adapter-dubbo-3.1 & adapter-dubbo-3.2 --- koupleless-adapter-dubbo-3.1/pom.xml | 4 ++++ koupleless-adapter-dubbo-3.2/pom.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/koupleless-adapter-dubbo-3.1/pom.xml b/koupleless-adapter-dubbo-3.1/pom.xml index 7b2579d23..b8805e448 100644 --- a/koupleless-adapter-dubbo-3.1/pom.xml +++ b/koupleless-adapter-dubbo-3.1/pom.xml @@ -11,6 +11,10 @@ koupleless-adapter-dubbo-3.1 + + 1.8 + + org.apache.dubbo diff --git a/koupleless-adapter-dubbo-3.2/pom.xml b/koupleless-adapter-dubbo-3.2/pom.xml index 49df1c064..28625d3bf 100644 --- a/koupleless-adapter-dubbo-3.2/pom.xml +++ b/koupleless-adapter-dubbo-3.2/pom.xml @@ -11,6 +11,10 @@ koupleless-adapter-dubbo-3.2 + + 1.8 + + org.apache.dubbo From 2bff8770f0fba98bebf5979865bfa523a6b31e30 Mon Sep 17 00:00:00 2001 From: gaosaroma Date: Mon, 3 Jun 2024 10:57:57 +0800 Subject: [PATCH 7/9] rename adapters --- .../pom.xml | 5 +-- .../KouplelessThreadPoolTaskExecutor.java | 0 .../task/TaskExecutionAutoConfiguration.java | 0 .../pom.xml | 6 +-- .../KouplelessThreadPoolTaskExecutor.java | 0 .../task/TaskExecutionAutoConfiguration.java | 4 +- .../pom.xml | 3 +- .../KouplelessThreadPoolTaskScheduler.java | 0 .../task/TaskSchedulingAutoConfiguration.java | 0 .../pom.xml | 2 +- .../KouplelessThreadPoolTaskScheduler.java | 0 .../task/TaskSchedulingAutoConfiguration.java | 0 .../pom.xml | 42 +++++++++++++++++++ .../KouplelessThreadPoolTaskScheduler.java | 0 .../task/TaskSchedulingAutoConfiguration.java | 0 pom.xml | 9 ++-- 16 files changed, 56 insertions(+), 15 deletions(-) rename {koupleless-adapter-scheduler-spring-2.3-2.4.5 => koupleless-adapter-executorservice-spring-2.3}/pom.xml (95%) rename {koupleless-adapter-executor-spring-2.7 => koupleless-adapter-executorservice-spring-2.3}/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java (100%) rename {koupleless-adapter-executorservice-spring-2.3-2.6 => koupleless-adapter-executorservice-spring-2.3}/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java (100%) rename {koupleless-adapter-executor-spring-2.7 => koupleless-adapter-executorservice-spring-2.7}/pom.xml (89%) rename {koupleless-adapter-executorservice-spring-2.3-2.6 => koupleless-adapter-executorservice-spring-2.7}/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java (100%) rename {koupleless-adapter-executor-spring-2.7 => koupleless-adapter-executorservice-spring-2.7}/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java (100%) rename {koupleless-adapter-executorservice-spring-2.3-2.6 => koupleless-adapter-scheduler-spring-2.3}/pom.xml (94%) rename {koupleless-adapter-executor-spring-2.7 => koupleless-adapter-scheduler-spring-2.3}/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java (100%) rename {koupleless-adapter-scheduler-spring-2.3-2.4.5 => koupleless-adapter-scheduler-spring-2.3}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (100%) rename {koupleless-adapter-scheduler-spring-2.4.6-2.7 => koupleless-adapter-scheduler-spring-2.4.6}/pom.xml (95%) rename {koupleless-adapter-scheduler-spring-2.3-2.4.5 => koupleless-adapter-scheduler-spring-2.4.6}/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java (100%) rename {koupleless-adapter-scheduler-spring-2.4.6-2.7 => koupleless-adapter-scheduler-spring-2.4.6}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (100%) create mode 100644 koupleless-adapter-scheduler-spring-2.7/pom.xml rename {koupleless-adapter-scheduler-spring-2.4.6-2.7 => koupleless-adapter-scheduler-spring-2.7}/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java (100%) rename {koupleless-adapter-executor-spring-2.7 => koupleless-adapter-scheduler-spring-2.7}/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java (100%) diff --git a/koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml b/koupleless-adapter-executorservice-spring-2.3/pom.xml similarity index 95% rename from koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml rename to koupleless-adapter-executorservice-spring-2.3/pom.xml index bb9f9fac2..b3a2bf243 100644 --- a/koupleless-adapter-scheduler-spring-2.3-2.4.5/pom.xml +++ b/koupleless-adapter-executorservice-spring-2.3/pom.xml @@ -9,9 +9,7 @@ ${revision} ../pom.xml - - - koupleless-adapter-scheduler-spring-2.3-2.4.5 + koupleless-adapter-executorservice-spring-2.3 2.3.5.RELEASE @@ -40,4 +38,5 @@ provided + \ No newline at end of file diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java similarity index 100% rename from koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java rename to koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java diff --git a/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/koupleless-adapter-executorservice-spring-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java similarity index 100% rename from koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java rename to koupleless-adapter-executorservice-spring-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java diff --git a/koupleless-adapter-executor-spring-2.7/pom.xml b/koupleless-adapter-executorservice-spring-2.7/pom.xml similarity index 89% rename from koupleless-adapter-executor-spring-2.7/pom.xml rename to koupleless-adapter-executorservice-spring-2.7/pom.xml index e611ba582..fb4007c52 100644 --- a/koupleless-adapter-executor-spring-2.7/pom.xml +++ b/koupleless-adapter-executorservice-spring-2.7/pom.xml @@ -6,11 +6,10 @@ com.alipay.sofa.koupleless koupleless-adapter - ${revision} - ../pom.xml + 1.2.0 - koupleless-adapter-executor-spring-2.7 + koupleless-adapter-executorservice-spring-2.7 ${revision} @@ -18,6 +17,7 @@ 1.8 + org.springframework.boot diff --git a/koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java similarity index 100% rename from koupleless-adapter-executorservice-spring-2.3-2.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java rename to koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/koupleless-adapter-executorservice-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java similarity index 100% rename from koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java rename to koupleless-adapter-executorservice-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java index 884b78163..c9ce3cbb3 100644 --- a/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java +++ b/koupleless-adapter-executorservice-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java @@ -16,8 +16,6 @@ */ package org.springframework.boot.autoconfigure.task; -import java.util.concurrent.Executor; - import com.alipay.sofa.koupleless.common.KouplelessThreadPoolTaskExecutor; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -35,6 +33,8 @@ import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import java.util.concurrent.Executor; + /** * {@link EnableAutoConfiguration Auto-configuration} for {@link TaskExecutor}. * springboot 2.7.x 均可以用该类覆盖 diff --git a/koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml b/koupleless-adapter-scheduler-spring-2.3/pom.xml similarity index 94% rename from koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml rename to koupleless-adapter-scheduler-spring-2.3/pom.xml index fc15ca10c..43cb3e059 100644 --- a/koupleless-adapter-executorservice-spring-2.3-2.6/pom.xml +++ b/koupleless-adapter-scheduler-spring-2.3/pom.xml @@ -10,7 +10,7 @@ ../pom.xml - koupleless-adapter-executorservice-spring-2.3-2.6 + koupleless-adapter-scheduler-spring-2.3 2.3.5.RELEASE @@ -39,5 +39,4 @@ provided - \ No newline at end of file diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java similarity index 100% rename from koupleless-adapter-executor-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename to koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java diff --git a/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-scheduler-spring-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 100% rename from koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-scheduler-spring-2.3/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java diff --git a/koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml b/koupleless-adapter-scheduler-spring-2.4.6/pom.xml similarity index 95% rename from koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml rename to koupleless-adapter-scheduler-spring-2.4.6/pom.xml index d0b1a007f..777e63dcf 100644 --- a/koupleless-adapter-scheduler-spring-2.4.6-2.7/pom.xml +++ b/koupleless-adapter-scheduler-spring-2.4.6/pom.xml @@ -11,7 +11,7 @@ - koupleless-adapter-scheduler-spring-2.4.6-2.7 + koupleless-adapter-scheduler-spring-2.4.6 ${revision} diff --git a/koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java similarity index 100% rename from koupleless-adapter-scheduler-spring-2.3-2.4.5/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename to koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java diff --git a/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 100% rename from koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-scheduler-spring-2.4.6/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java diff --git a/koupleless-adapter-scheduler-spring-2.7/pom.xml b/koupleless-adapter-scheduler-spring-2.7/pom.xml new file mode 100644 index 000000000..85db486f5 --- /dev/null +++ b/koupleless-adapter-scheduler-spring-2.7/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.alipay.sofa.koupleless + koupleless-adapter + 1.2.0 + + + koupleless-adapter-scheduler-spring-2.7 + ${revision} + + + 2.7.0 + 1.8 + + + + + org.springframework.boot + spring-boot + ${spring.boot.version} + provided + + + + org.springframework.boot + spring-boot-autoconfigure + ${spring.boot.version} + provided + + + + com.alipay.sofa.koupleless + koupleless-base-plugin + ${revision} + provided + + + \ No newline at end of file diff --git a/koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java similarity index 100% rename from koupleless-adapter-scheduler-spring-2.4.6-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java rename to koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java diff --git a/koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/koupleless-adapter-scheduler-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java similarity index 100% rename from koupleless-adapter-executor-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java rename to koupleless-adapter-scheduler-spring-2.7/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java diff --git a/pom.xml b/pom.xml index 311314f36..f644d8089 100644 --- a/pom.xml +++ b/pom.xml @@ -88,10 +88,11 @@ koupleless-adapter-logback koupleless-adapter-logback-spring-starter-3.0 koupleless-adapter-logback-spring-starter-3.2 - koupleless-adapter-executor-spring-2.7 - koupleless-adapter-scheduler-spring-2.4.6-2.7 - koupleless-adapter-executorservice-spring-2.3-2.6 - koupleless-adapter-scheduler-spring-2.3-2.4.5 + koupleless-adapter-scheduler-spring-2.4.6 + koupleless-adapter-scheduler-spring-2.3 + koupleless-adapter-scheduler-spring-2.7 + koupleless-adapter-executorservice-spring-2.3 + koupleless-adapter-executorservice-spring-2.7 From 7386fc564d4526ec8a4736731aa370c01e9a700e Mon Sep 17 00:00:00 2001 From: gaosaroma Date: Mon, 3 Jun 2024 11:05:57 +0800 Subject: [PATCH 8/9] fix pom --- koupleless-adapter-executorservice-spring-2.7/pom.xml | 3 ++- koupleless-adapter-scheduler-spring-2.7/pom.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koupleless-adapter-executorservice-spring-2.7/pom.xml b/koupleless-adapter-executorservice-spring-2.7/pom.xml index fb4007c52..5b1c569ae 100644 --- a/koupleless-adapter-executorservice-spring-2.7/pom.xml +++ b/koupleless-adapter-executorservice-spring-2.7/pom.xml @@ -6,7 +6,8 @@ com.alipay.sofa.koupleless koupleless-adapter - 1.2.0 + ${revision} + ../pom.xml koupleless-adapter-executorservice-spring-2.7 diff --git a/koupleless-adapter-scheduler-spring-2.7/pom.xml b/koupleless-adapter-scheduler-spring-2.7/pom.xml index 85db486f5..2655e1114 100644 --- a/koupleless-adapter-scheduler-spring-2.7/pom.xml +++ b/koupleless-adapter-scheduler-spring-2.7/pom.xml @@ -6,7 +6,8 @@ com.alipay.sofa.koupleless koupleless-adapter - 1.2.0 + ${revision} + ../pom.xml koupleless-adapter-scheduler-spring-2.7 From 2a1d32a10b8c5019f51c615ae6bd539435e88ecc Mon Sep 17 00:00:00 2001 From: gaosaroma Date: Mon, 3 Jun 2024 11:19:25 +0800 Subject: [PATCH 9/9] refactor --- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskExecutor.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- .../koupleless/common/KouplelessThreadPoolTaskScheduler.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 117bdecf2..2759c6398 100644 --- a/koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-executorservice-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -16,7 +16,7 @@ */ package com.alipay.sofa.koupleless.common; -import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.common.util.ReflectionUtils; import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -37,7 +37,7 @@ protected ExecutorService initializeExecutor(ThreadFactory threadFactory, ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); KouplelessExecutorService executor = new KouplelessExecutorService(executorService); - ClassUtil.setField("threadPoolExecutor", this, executor); + ReflectionUtils.setField("threadPoolExecutor", this, executor); return executor; } } \ No newline at end of file diff --git a/koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java b/koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java index 117bdecf2..2759c6398 100644 --- a/koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java +++ b/koupleless-adapter-executorservice-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskExecutor.java @@ -16,7 +16,7 @@ */ package com.alipay.sofa.koupleless.common; -import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.common.util.ReflectionUtils; import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -37,7 +37,7 @@ protected ExecutorService initializeExecutor(ThreadFactory threadFactory, ExecutorService executorService = super.initializeExecutor(threadFactory, rejectedExecutionHandler); KouplelessExecutorService executor = new KouplelessExecutorService(executorService); - ClassUtil.setField("threadPoolExecutor", this, executor); + ReflectionUtils.setField("threadPoolExecutor", this, executor); return executor; } } \ No newline at end of file diff --git a/koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 466125554..c45a7f75f 100644 --- a/koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-scheduler-spring-2.3/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -16,7 +16,7 @@ */ package com.alipay.sofa.koupleless.common; -import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.common.util.ReflectionUtils; import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -39,7 +39,7 @@ protected ExecutorService initializeExecutor(ThreadFactory threadFactory, threadFactory, rejectedExecutionHandler); ScheduledExecutorService executor = new KouplelessScheduledExecutorService( scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); + ReflectionUtils.setField("scheduledExecutor", this, executor); return executor; } } \ No newline at end of file diff --git a/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 466125554..c45a7f75f 100644 --- a/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-scheduler-spring-2.4.6/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -16,7 +16,7 @@ */ package com.alipay.sofa.koupleless.common; -import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.common.util.ReflectionUtils; import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -39,7 +39,7 @@ protected ExecutorService initializeExecutor(ThreadFactory threadFactory, threadFactory, rejectedExecutionHandler); ScheduledExecutorService executor = new KouplelessScheduledExecutorService( scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); + ReflectionUtils.setField("scheduledExecutor", this, executor); return executor; } } \ No newline at end of file diff --git a/koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java b/koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java index 466125554..c45a7f75f 100644 --- a/koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java +++ b/koupleless-adapter-scheduler-spring-2.7/src/main/java/com/alipay/sofa/koupleless/common/KouplelessThreadPoolTaskScheduler.java @@ -16,7 +16,7 @@ */ package com.alipay.sofa.koupleless.common; -import com.alipay.sofa.koupleless.common.util.ClassUtil; +import com.alipay.sofa.koupleless.common.util.ReflectionUtils; import com.alipay.sofa.koupleless.plugin.concurrent.KouplelessScheduledExecutorService; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -39,7 +39,7 @@ protected ExecutorService initializeExecutor(ThreadFactory threadFactory, threadFactory, rejectedExecutionHandler); ScheduledExecutorService executor = new KouplelessScheduledExecutorService( scheduledExecutor); - ClassUtil.setField("scheduledExecutor", this, executor); + ReflectionUtils.setField("scheduledExecutor", this, executor); return executor; } } \ No newline at end of file