update async task executor bean to unique name

eclipse-xpanse · Jan 2, 2024 · f590dc7 · f590dc7
1 parent 7703f86
commit f590dc7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/DeployService.java b/modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/DeployService.java
@@ -561,7 +561,7 @@ private DeployServiceEntity flushDestroyServiceEntity(DeployResult destroyResult
      * @param deployTask          deployTask
      * @param deployServiceEntity deployServiceEntity
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public void asyncPurgeService(Deployment deployment, DeployTask deployTask,
                                   DeployServiceEntity deployServiceEntity) {
         purgeService(deployment, deployTask, deployServiceEntity);
@@ -788,7 +788,7 @@ private void maskSensitiveFields(DeployServiceEntity deployServiceEntity) {
      * @param deployRequest deploy request.
      * @return new deployed service entity.
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public CompletableFuture<DeployServiceEntity> deployServiceById(UUID newId,
                                                                 String userId,
                                                                 DeployRequest deployRequest) {
@@ -808,7 +808,7 @@ public CompletableFuture<DeployServiceEntity> deployServiceById(UUID newId,
     /**
      * Destroy service by deployed service id.
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public CompletableFuture<DeployServiceEntity> destroyServiceById(String id) {
         MDC.put(TASK_ID, id);
         DeployServiceEntity deployServiceEntity = getDeployServiceEntity(UUID.fromString(id));

diff --git a/...ployment/src/main/java/org/eclipse/xpanse/modules/deployment/async/TaskConfiguration.java b/...ployment/src/main/java/org/eclipse/xpanse/modules/deployment/async/TaskConfiguration.java
@@ -25,7 +25,7 @@ public class TaskConfiguration {
      *
      * @return executor
      */
-    @Bean("taskExecutor")
+    @Bean("xpanseAsyncTaskExecutor")
     public Executor taskExecutor() {
         ServiceThreadPoolTaskExecutor executor = new ServiceThreadPoolTaskExecutor();
         executor.setCorePoolSize(CPU_COUNT * 2);

diff --git a/...n/java/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeployment.java b/...n/java/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeployment.java
@@ -36,6 +36,7 @@
 import org.eclipse.xpanse.modules.orchestrator.deployment.DeployValidationResult;
 import org.eclipse.xpanse.modules.orchestrator.deployment.Deployment;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Component;
 
@@ -63,8 +64,10 @@ public class TerraformDeployment implements Deployment {
     @Autowired
     public TerraformDeployment(
             DeployEnvironments deployEnvironments,
-            TerraformLocalConfig terraformLocalConfig, PluginManager pluginManager,
-            DeployService deployService, Executor taskExecutor) {
+            TerraformLocalConfig terraformLocalConfig,
+            PluginManager pluginManager,
+            DeployService deployService,
+            @Qualifier("xpanseAsyncTaskExecutor") Executor taskExecutor) {
         this.deployEnvironments = deployEnvironments;
         this.terraformLocalConfig = terraformLocalConfig;
         this.pluginManager = pluginManager;

diff --git a/...va/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeploymentTest.java b/...va/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeploymentTest.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.Executor;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.xpanse.modules.deployment.DeployService;
+import org.eclipse.xpanse.modules.deployment.async.TaskConfiguration;
 import org.eclipse.xpanse.modules.deployment.deployers.terraform.config.TerraformLocalConfig;
 import org.eclipse.xpanse.modules.deployment.utils.DeployEnvironments;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
@@ -53,7 +54,7 @@
 
 @ExtendWith({SpringExtension.class})
 @ContextConfiguration(classes = {TerraformDeployment.class, DeployEnvironments.class,
-        PluginManager.class, TerraformLocalConfig.class, DeployService.class, Executor.class})
+        PluginManager.class, TerraformLocalConfig.class, DeployService.class, TaskConfiguration.class})
 class TerraformDeploymentTest {
 
     private final UUID id = UUID.randomUUID();

diff --git a/...ava/org/eclipse/xpanse/modules/servicetemplate/utils/ServiceTemplateOpenApiGenerator.java b/...ava/org/eclipse/xpanse/modules/servicetemplate/utils/ServiceTemplateOpenApiGenerator.java
@@ -89,7 +89,7 @@ public String getOpenApi(ServiceTemplateEntity serviceTemplateEntity) {
      *
      * @param registerService Registered services.
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public void generateServiceApi(ServiceTemplateEntity registerService) {
         createServiceApi(registerService);
     }
@@ -99,7 +99,7 @@ public void generateServiceApi(ServiceTemplateEntity registerService) {
      *
      * @param registerService Registered services.
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public void updateServiceApi(ServiceTemplateEntity registerService) {
         File file =
                 new File(this.openApiGeneratorJarManage.getOpenApiWorkdir(),
@@ -115,7 +115,7 @@ public void updateServiceApi(ServiceTemplateEntity registerService) {
      *
      * @param id ID of registered service.
      */
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public void deleteServiceApi(String id) {
         File file = new File(this.openApiGeneratorJarManage.getOpenApiWorkdir(),
                 id + OPENAPI_FILE_EXTENSION);

diff --git a/...orkflow/src/main/java/org/eclipse/xpanse/modules/workflow/utils/WorkflowProcessUtils.java b/...orkflow/src/main/java/org/eclipse/xpanse/modules/workflow/utils/WorkflowProcessUtils.java
@@ -58,7 +58,7 @@ public ProcessInstance startProcess(String processKey, Map<String, Object> varia
         return runtimeService.startProcessInstanceByKey(processKey, variable);
     }
 
-    @Async("taskExecutor")
+    @Async("xpanseAsyncTaskExecutor")
     public void asyncStartProcess(String processKey, Map<String, Object> variable) {
         startProcess(processKey, variable);
     }