Commit 117b593d authored by lihao's avatar lihao

use TaskPoolFactory.class created by constructor

parent 18621ff6
......@@ -13,6 +13,7 @@
<packaging>pom</packaging>
<modules>
<module>task-executor-core</module>
<module>task-executor-spring-boot-starter</module>
</modules>
<properties>
......
......@@ -64,6 +64,7 @@ public class TaskExecutor<T, U, R> {
}
countDownLatch = new CountDownLatch(data.size());
AtomicInteger failCount = new AtomicInteger();
data.forEach(d -> pool.execute(() -> {
try {
Object apply = t.getHandler().apply(d, t.getContext());
......
......@@ -8,22 +8,22 @@ import java.util.concurrent.TimeUnit;
* @author lihao
*/
public class TaskPoolFactory {
TaskPoolFactory() {
public TaskPoolFactory() {
// ignore
}
public static <T, U, R> TaskExecutor<T, U, R> createExecutor() {
public <T, U, R> TaskExecutor<T, U, R> createExecutor() {
int core = Runtime.getRuntime().availableProcessors();
int poolSize = Math.min(core / 2, 4);
return createExecutor(new ThreadPoolExecutor(poolSize, poolSize + 1, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>()), 15L, TimeUnit.SECONDS);
}
public static <T, U, R> TaskExecutor<T, U, R> createExecutor(ThreadPoolExecutor pool) {
public <T, U, R> TaskExecutor<T, U, R> createExecutor(ThreadPoolExecutor pool) {
return createExecutor(pool, 15L, TimeUnit.SECONDS);
}
public static <T, U, R> TaskExecutor<T, U, R> createExecutor(ThreadPoolExecutor pool, Long timeOut, TimeUnit timeUnit) {
public <T, U, R> TaskExecutor<T, U, R> createExecutor(ThreadPoolExecutor pool, Long timeOut, TimeUnit timeUnit) {
return new TaskExecutor<>(pool, timeOut, timeUnit);
}
}
......@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
public class TaskTests {
private int SLEEP_TIME = 1000;
private int SLEEP_TIME = 100;
private List<User> list;
......@@ -27,7 +27,8 @@ public class TaskTests {
@Test
public void multiTaskLoopNoArgsTest() {
TaskExecutor<User, User, String> executor = TaskPoolFactory.createExecutor();
TaskPoolFactory taskPoolFactory = new TaskPoolFactory();
TaskExecutor<User, User, String> executor = taskPoolFactory.createExecutor();
executor.init((data, context) -> {
data.setName(data.getName() + "handle");
try {
......@@ -46,7 +47,8 @@ public class TaskTests {
@Test
public void multiTaskLoopWithArgsTest() {
TaskExecutor<User, User, String> executor = TaskPoolFactory.createExecutor(new ThreadPoolExecutor(8, 9,
TaskPoolFactory taskPoolFactory = new TaskPoolFactory();
TaskExecutor<User, User, String> executor = taskPoolFactory.createExecutor(new ThreadPoolExecutor(8, 9,
0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()), 60L, TimeUnit.SECONDS);
executor.init((data, context) -> {
......@@ -68,7 +70,8 @@ public class TaskTests {
@Test
public void failCaseTest() {
TaskExecutor<User, User, String> executor = TaskPoolFactory.createExecutor();
TaskPoolFactory taskPoolFactory = new TaskPoolFactory();
TaskExecutor<User, User, String> executor = taskPoolFactory.createExecutor();
executor.init((data, context) -> {
data.setName(data.getName() + "handle");
......@@ -88,7 +91,8 @@ public class TaskTests {
@Test
public void errorRecordCallbackTest() {
TaskExecutor<User, User, String> executor = TaskPoolFactory.createExecutor();
TaskPoolFactory taskPoolFactory = new TaskPoolFactory();
TaskExecutor<User, User, String> executor = taskPoolFactory.createExecutor();
List<User> errors = Collections.synchronizedList(new ArrayList<>());
executor.init((data, context) -> {
data.setName(data.getName() + "handle");
......
<?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">
<parent>
<artifactId>task-executor-kit</artifactId>
<groupId>com.mushiny</groupId>
<version>1.0.0-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>task-executor-spring-boot-starter</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<spring-cloud-alibaba.version>2.2.7.RELEASE</spring-cloud-alibaba.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
<!-- 自动依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
<!-- 将被@ConfigurationProperties注解的类的属性注入到元属性 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${spring-cloud-alibaba.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mushiny</groupId>
<artifactId>task-executor-core</artifactId>
<version>1.0.0-RELEASE</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package com.mushiny.task.executor.autoconfig;
import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
import com.mushiny.task.executor.core.TaskPoolFactory;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import java.util.concurrent.ThreadPoolExecutor;
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(value = TaskExecutorProperties.class)
@AutoConfigureAfter(NacosConfigAutoConfiguration.class)
public class TaskExecutorAutoConfiguration {
@ConditionalOnMissingBean
public ThreadPoolExecutor listLoopThreadPool() {
return null;
}
@ConditionalOnBean(name={"listLoopThreadPool"})
public TaskPoolFactory taskPoolFactory () {
return new TaskPoolFactory();
}
}
package com.mushiny.task.executor.autoconfig;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.concurrent.TimeUnit;
@ConfigurationProperties(prefix = "com.mushiny.tools.task.executor")
public class TaskExecutorProperties {
private TaskPool pool;
class TaskPool {
private Integer corePoolSize;
private Integer maximumPoolSize;
private Long keepAliveTime;
private TimeUnit timeUnit;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment