Merge branch 'hotfix-duplicate-taskexecutor' into 'main'
hotfix duplicate bean definition taskexeuctor See merge request fforesight/tenant-commons!16
This commit is contained in:
commit
30cf9a68af
@ -3,7 +3,10 @@ package com.knecon.fforesight.tenantcommons.task;
|
||||
import static org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME;
|
||||
import static org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor.DEFAULT_TASK_EXECUTOR_BEAN_NAME;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.task.TaskExecutorBuilder;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@ -16,6 +19,7 @@ public class ApplicationTaskExecutorBeanConfig {
|
||||
|
||||
@Lazy
|
||||
@Bean(name = {APPLICATION_TASK_EXECUTOR_BEAN_NAME, DEFAULT_TASK_EXECUTOR_BEAN_NAME})
|
||||
@ConditionalOnMissingBean({Executor.class})
|
||||
public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) {
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user