From 7fa175509ad79558f597a812d75ea464b00d8b43 Mon Sep 17 00:00:00 2001
From: Maverick Studer <maverick.studer@knecon.com>
Date: Thu, 18 Jul 2024 16:17:00 +0200
Subject: [PATCH] hotfix duplicate bean definition taskexeuctor

---
 .../tenantcommons/task/ApplicationTaskExecutorBeanConfig.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/knecon/fforesight/tenantcommons/task/ApplicationTaskExecutorBeanConfig.java b/src/main/java/com/knecon/fforesight/tenantcommons/task/ApplicationTaskExecutorBeanConfig.java
index 301dec2..58d2487 100644
--- a/src/main/java/com/knecon/fforesight/tenantcommons/task/ApplicationTaskExecutorBeanConfig.java
+++ b/src/main/java/com/knecon/fforesight/tenantcommons/task/ApplicationTaskExecutorBeanConfig.java
@@ -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();
     }