-
Notifications
You must be signed in to change notification settings - Fork 11
feature: 添加springboot 2.3.x - 2.7.x 线程池适配:ThreadPoolTaskScheduler, ThreadPoolTaskScheduler #13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 10 commits
4d72f26
b153a14
152cd6c
8952825
7e4ad11
68090d5
53f24a1
2bff877
dc95038
7386fc5
2a1d32a
831980d
f6cfb3f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-adapter</artifactId> | ||
| <version>${revision}</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <artifactId>koupleless-adapter-executorservice-spring-2.3</artifactId> | ||
|
|
||
| <properties> | ||
| <spring.boot.version>2.3.5.RELEASE</spring.boot.version> | ||
| <java.version>1.8</java.version> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-autoconfigure</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-base-plugin</artifactId> | ||
| <version>${revision}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
|
Comment on lines
+33
to
+41
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reconsider the use of reflection for setting fields. The use of - ReflectionUtils.setField("threadPoolExecutor", this, executor);
+ // Recommended to add a setter method in the parent class if possible
+ this.setThreadPoolExecutor(executor);
|
||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * 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 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<TaskExecutorCustomizer> taskExecutorCustomizers, | ||
| ObjectProvider<TaskDecorator> 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()); | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-adapter</artifactId> | ||
| <version>${revision}</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>koupleless-adapter-executorservice-spring-2.7</artifactId> | ||
| <version>${revision}</version> | ||
|
|
||
| <properties> | ||
| <spring.boot.version>2.7.0</spring.boot.version> | ||
| <java.version>1.8</java.version> | ||
| </properties> | ||
|
|
||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-autoconfigure</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-base-plugin</artifactId> | ||
| <version>${revision}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
|
Comment on lines
+33
to
+41
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider alternatives to using reflection for setting fields to enhance type safety and maintainability. As with the Spring 2.3 version, using reflection here can lead to maintenance issues and is less type-safe. Consider modifying the design to allow setting the executor without reflection. |
||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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 com.alipay.sofa.koupleless.common.KouplelessThreadPoolTaskExecutor; | ||
| import org.springframework.beans.factory.ObjectProvider; | ||
| import org.springframework.boot.autoconfigure.AutoConfiguration; | ||
| 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.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.7.x 均可以用该类覆盖 | ||
| * @author Stephane Nicoll | ||
| * @author Camille Vienot | ||
| * @since 2.1.0 | ||
| */ | ||
| @ConditionalOnClass(ThreadPoolTaskExecutor.class) | ||
| @AutoConfiguration | ||
| @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<TaskExecutorCustomizer> taskExecutorCustomizers, | ||
| ObjectProvider<TaskDecorator> 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()); | ||
| } | ||
|
|
||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-adapter</artifactId> | ||
| <version>${revision}</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>koupleless-adapter-scheduler-spring-2.3</artifactId> | ||
|
|
||
| <properties> | ||
| <spring.boot.version>2.3.5.RELEASE</spring.boot.version> | ||
| <java.version>1.8</java.version> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-autoconfigure</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.alipay.sofa.koupleless</groupId> | ||
| <artifactId>koupleless-base-plugin</artifactId> | ||
| <version>${revision}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider alternatives to using reflection for setting fields to enhance type safety and maintainability.
Reflection can lead to maintenance issues and is less type-safe. If possible, consider modifying the design to allow setting the executor without reflection, perhaps through constructor injection or a setter method.