Merge pull request #144 from PublicisSapient/develop

Develop

Author: nehgupta13

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/config/async/executor/TaskExecutionConfig.java

@@ -19,6 +19,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -41,12 +42,14 @@ public static class Pool {
     }
 
     @Bean
+    @Primary
     public TaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
         threadPoolTaskExecutor.setCorePoolSize(this.pool.getCoreSize());
         threadPoolTaskExecutor.setMaxPoolSize(this.pool.getMaxSize());
         threadPoolTaskExecutor.setQueueCapacity(this.pool.getQueueCapacity());
         threadPoolTaskExecutor.setThreadNamePrefix(this.threadNamePrefix);
+        threadPoolTaskExecutor.initialize();
         return threadPoolTaskExecutor;
     }
 

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/processor/AccountItemProcessor.java

@@ -16,13 +16,15 @@
 
 package com.publicissapient.kpidashboard.job.aiusagestatisticscollector.processor;
 
+import org.springframework.batch.item.ItemProcessor;
+
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.model.AIUsageStatistics;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AIUsageStatisticsService;
+
 import jakarta.annotation.Nonnull;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.batch.item.ItemProcessor;
 
 @Slf4j
 @AllArgsConstructor
@@ -31,7 +33,7 @@ public class AccountItemProcessor implements ItemProcessor<PagedAIUsagePerOrgLev
 
     @Override
     public AIUsageStatistics process(@Nonnull PagedAIUsagePerOrgLevel item) {
-        log.debug("Fetching AI usage statistics for level name: {}", item.levelName());
+        log.debug("[ai-usage-statistics-collector job] Fetching AI usage statistics for level name: {}", item.levelName());
         return aiUsageStatisticsService.fetchAIUsageStatistics(item.levelName());
     }
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/reader/AccountItemReader.java

@@ -16,11 +16,13 @@
 
 package com.publicissapient.kpidashboard.job.aiusagestatisticscollector.reader;
 
+import org.springframework.batch.item.ItemReader;
+
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AccountBatchService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.batch.item.ItemReader;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -31,7 +33,7 @@ public class AccountItemReader implements ItemReader<PagedAIUsagePerOrgLevel> {
     @Override
     public PagedAIUsagePerOrgLevel read() {
         PagedAIUsagePerOrgLevel aiUsageStatistics = accountBatchService.getNextAccountPage();
-        log.info("Reader fetched level name: {}", aiUsageStatistics.levelName());
+        log.info("[ai-usage-statistics-collector job] Reader fetched level name: {}", aiUsageStatistics.levelName());
         return aiUsageStatistics;
     }
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/strategy/AIUsageStatisticsJobStrategy.java

@@ -16,6 +16,20 @@
 
 package com.publicissapient.kpidashboard.job.aiusagestatisticscollector.strategy;
 
+import java.util.Optional;
+import java.util.concurrent.Future;
+
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.integration.async.AsyncItemProcessor;
+import org.springframework.batch.integration.async.AsyncItemWriter;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+
 import com.publicissapient.kpidashboard.common.service.ProcessorExecutionTraceLogServiceImpl;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.config.AIUsageStatisticsCollectorJobConfig;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.dto.PagedAIUsagePerOrgLevel;
@@ -28,34 +42,26 @@
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.writer.AccountItemWriter;
 import com.publicissapient.kpidashboard.job.config.base.SchedulingConfig;
 import com.publicissapient.kpidashboard.job.strategy.JobStrategy;
+
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.integration.async.AsyncItemProcessor;
-import org.springframework.batch.integration.async.AsyncItemWriter;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import java.util.Optional;
-import java.util.concurrent.Future;
 
 @Slf4j
 @Component
 @AllArgsConstructor
 public class AIUsageStatisticsJobStrategy implements JobStrategy {
 
-    private final AIUsageStatisticsCollectorJobConfig aiUsageStatisticsCollectorJobConfig;
     private final JobRepository jobRepository;
+
+    private final TaskExecutor taskExecutor;
+
     private final PlatformTransactionManager transactionManager;
+
+    private final AIUsageStatisticsCollectorJobConfig aiUsageStatisticsCollectorJobConfig;
+
+    private final AccountBatchService accountBatchService;
     private final AIUsageStatisticsService aiUsageStatisticsService;
     private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
-    private final AccountBatchService accountBatchService;
-    private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Override
     public String getJobName() {
@@ -92,7 +98,7 @@ private Step chunkProcessAIUsageStatisticsForAccounts() {
     private AsyncItemProcessor<PagedAIUsagePerOrgLevel, AIUsageStatistics> asyncAccountProcessor() {
         AsyncItemProcessor<PagedAIUsagePerOrgLevel, AIUsageStatistics> asyncItemProcessor = new AsyncItemProcessor<>();
         asyncItemProcessor.setDelegate(new AccountItemProcessor(this.aiUsageStatisticsService));
-        asyncItemProcessor.setTaskExecutor(threadPoolTaskExecutor);
+        asyncItemProcessor.setTaskExecutor(taskExecutor);
         return asyncItemProcessor;
     }
 

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/aiusagestatisticscollector/writer/AccountItemWriter.java

@@ -16,15 +16,17 @@
 
 package com.publicissapient.kpidashboard.job.aiusagestatisticscollector.writer;
 
+import java.util.List;
+
+import org.springframework.batch.item.Chunk;
+import org.springframework.batch.item.ItemWriter;
+
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.model.AIUsageStatistics;
 import com.publicissapient.kpidashboard.job.aiusagestatisticscollector.service.AIUsageStatisticsService;
+
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.batch.item.Chunk;
-import org.springframework.batch.item.ItemWriter;
-
-import java.util.List;
 
 @Slf4j
 @AllArgsConstructor
@@ -33,7 +35,7 @@ public class AccountItemWriter implements ItemWriter<AIUsageStatistics> {
 
     @Override
     public void write(@NonNull Chunk<? extends AIUsageStatistics> chunk) {
-        log.info("Received ai usage statistics chunk items for inserting  into database with size: {}", chunk.size());
+        log.info("[ai-usage-statistics-collector job] Received chunk items for inserting into database with size: {}", chunk.size());
         aiUsageStatisticsService.saveAll((List.copyOf(chunk.getItems())));
     }
 }

…gy/KpiMetricsCalculationJobStrategy.java …y/KpiMaturityCalculationJobStrategy.javaai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/strategy/KpiMetricsCalculationJobStrategy.java renamed to ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/strategy/KpiMaturityCalculationJobStrategy.java ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/strategy/KpiMetricsCalculationJobStrategy.java renamed to ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/kpimaturitycalculation/strategy/KpiMaturityCalculationJobStrategy.java

@@ -26,7 +26,7 @@
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.integration.async.AsyncItemProcessor;
 import org.springframework.batch.integration.async.AsyncItemWriter;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 
@@ -47,11 +47,11 @@
 
 @Component
 @RequiredArgsConstructor
-public class KpiMetricsCalculationJobStrategy implements JobStrategy {
+public class KpiMaturityCalculationJobStrategy implements JobStrategy {
 
 	private final JobRepository jobRepository;
 
-	private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
+	private final TaskExecutor taskExecutor;
 
 	private final PlatformTransactionManager platformTransactionManager;
 
@@ -92,7 +92,7 @@ private Step chunkProcessProjects() {
 	private AsyncItemProcessor<ProjectInputDTO, KpiMaturity> asyncProjectProcessor() {
 		AsyncItemProcessor<ProjectInputDTO, KpiMaturity> asyncItemProcessor = new AsyncItemProcessor<>();
 		asyncItemProcessor.setDelegate(new ProjectItemProcessor(this.kpiMaturityCalculationService));
-		asyncItemProcessor.setTaskExecutor(threadPoolTaskExecutor);
+		asyncItemProcessor.setTaskExecutor(taskExecutor);
 		return asyncItemProcessor;
 	}
 

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/job/productivitycalculation/strategy/ProductivityCalculationJobStrategy.java

@@ -26,7 +26,7 @@
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.integration.async.AsyncItemProcessor;
 import org.springframework.batch.integration.async.AsyncItemWriter;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 
@@ -48,18 +48,17 @@
 @Component
 @RequiredArgsConstructor
 public class ProductivityCalculationJobStrategy implements JobStrategy {
+	private final JobRepository jobRepository;
 
-	private final ProductivityCalculationConfig productivityCalculationJobConfig;
-
-	private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
-	private final ProjectBatchService projectBatchService;
-	private final ProductivityCalculationService productivityCalculationService;
+	private final TaskExecutor taskExecutor;
 
 	private final PlatformTransactionManager platformTransactionManager;
 
-	private final JobRepository jobRepository;
+	private final ProductivityCalculationConfig productivityCalculationJobConfig;
 
-	private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
+	private final ProjectBatchService projectBatchService;
+	private final ProductivityCalculationService productivityCalculationService;
+	private final ProcessorExecutionTraceLogServiceImpl processorExecutionTraceLogServiceImpl;
 
 	@Override
 	public String getJobName() {
@@ -90,7 +89,7 @@ private Step chunkProcessProjects() {
 	private AsyncItemProcessor<ProjectInputDTO, Productivity> asyncProjectProcessor() {
 		AsyncItemProcessor<ProjectInputDTO, Productivity> asyncItemProcessor = new AsyncItemProcessor<>();
 		asyncItemProcessor.setDelegate(new ProjectItemProcessor(this.productivityCalculationService));
-		asyncItemProcessor.setTaskExecutor(threadPoolTaskExecutor);
+		asyncItemProcessor.setTaskExecutor(taskExecutor);
 		return asyncItemProcessor;
 	}