GRAD2-2505: StepScope reader & writer warnings are resolved.

bcgov · Feb 15, 2024 · 0204c0a · 0204c0a
1 parent f771516
commit 0204c0a
Show file tree

Hide file tree

Showing 13 changed files with 164 additions and 173 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java
@@ -91,11 +91,9 @@ public class JobLauncherController {
     private final GradBatchHistoryService gradBatchHistoryService;
     private final DistributionRunStatusUpdateProcessor distributionRunStatusUpdateProcessor;
 
-    @Autowired
-    JsonTransformer jsonTransformer;
+    private final JsonTransformer jsonTransformer;
 
-    @Autowired
-    GradSchoolOfRecordFilter gradSchoolOfRecordFilter;
+    private final GradSchoolOfRecordFilter gradSchoolOfRecordFilter;
 
     @Autowired
     public JobLauncherController(
@@ -106,14 +104,18 @@ public JobLauncherController(
             RestUtils restUtils,
             GradDashboardService gradDashboardService,
             GradBatchHistoryService gradBatchHistoryService,
-            DistributionRunStatusUpdateProcessor distributionRunStatusUpdateProcessor) {
+            DistributionRunStatusUpdateProcessor distributionRunStatusUpdateProcessor,
+            JsonTransformer jsonTransformer,
+            GradSchoolOfRecordFilter gradSchoolOfRecordFilter) {
         this.jobLauncher = jobLauncher;
         this.asyncJobLauncher = asyncJobLauncher;
         this.jobRegistry = jobRegistry;
         this.restUtils = restUtils;
         this.gradDashboardService = gradDashboardService;
         this.gradBatchHistoryService = gradBatchHistoryService;
         this.distributionRunStatusUpdateProcessor = distributionRunStatusUpdateProcessor;
+        this.jsonTransformer = jsonTransformer;
+        this.gradSchoolOfRecordFilter = gradSchoolOfRecordFilter;
     }
 
     @GetMapping(EducGradBatchGraduationApiConstants.EXECUTE_REG_GRAD_BATCH_JOB)

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchStatusEnum.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchStatusEnum.java
@@ -3,5 +3,10 @@
 public enum BatchStatusEnum {
     STARTED,
     COMPLETED,
-    FAILED;
+    FAILED,
+    STARTING,
+    STOPPING,
+    STOPPED,
+    ABANDONED,
+    UNKNOWN;
 }
diff --git a/...ca/bc/gov/educ/api/batchgraduation/listener/SpecialRunCompletionNotificationListener.java b/...ca/bc/gov/educ/api/batchgraduation/listener/SpecialRunCompletionNotificationListener.java
@@ -1,23 +1,17 @@
 package ca.bc.gov.educ.api.batchgraduation.listener;
 
-import ca.bc.gov.educ.api.batchgraduation.model.StudentSearchRequest;
 import ca.bc.gov.educ.api.batchgraduation.rest.RestUtils;
 import ca.bc.gov.educ.api.batchgraduation.util.JsonTransformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.ZoneId;
 import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import static ca.bc.gov.educ.api.batchgraduation.util.EducGradBatchGraduationApiConstants.SEARCH_REQUEST;
 
 @Component
 public class SpecialRunCompletionNotificationListener extends BaseRunCompletionNotificationListener {

diff --git a/...java/ca/bc/gov/educ/api/batchgraduation/processor/RunProjectedGradAlgorithmProcessor.java b/...java/ca/bc/gov/educ/api/batchgraduation/processor/RunProjectedGradAlgorithmProcessor.java
@@ -3,6 +3,8 @@
 import ca.bc.gov.educ.api.batchgraduation.model.GraduationStudentRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.UUID;
 
@@ -11,7 +13,8 @@ public class RunProjectedGradAlgorithmProcessor extends BaseProcessor {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RunProjectedGradAlgorithmProcessor.class);
 
 	@Override
-	public GraduationStudentRecord process(UUID key) throws Exception {
+	@Nullable
+	public GraduationStudentRecord process(@NonNull UUID key) throws Exception {
 		GraduationStudentRecord item = getItem(key);
 		if (item != null) {
 			LOGGER.info("Processing partitionData = {}", item.getProgram());

diff --git a/...n/java/ca/bc/gov/educ/api/batchgraduation/processor/RunRegularGradAlgorithmProcessor.java b/...n/java/ca/bc/gov/educ/api/batchgraduation/processor/RunRegularGradAlgorithmProcessor.java
@@ -3,6 +3,8 @@
 import ca.bc.gov.educ.api.batchgraduation.model.GraduationStudentRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.UUID;
 
@@ -11,9 +13,9 @@ public class RunRegularGradAlgorithmProcessor extends BaseProcessor {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RunRegularGradAlgorithmProcessor.class);
 
 	@Override
-	public GraduationStudentRecord process(UUID key) throws Exception {
+	@Nullable
+	public GraduationStudentRecord process(@NonNull UUID key) throws Exception {
 		GraduationStudentRecord item = getItem(key);
-//		Thread.sleep(60000);
 		if (item != null) {
 			LOGGER.info("Processing partitionData = {}", item.getProgram());
 			summaryDTO.setBatchId(batchId);

diff --git a/...n/java/ca/bc/gov/educ/api/batchgraduation/processor/RunSpecialGradAlgorithmProcessor.java b/...n/java/ca/bc/gov/educ/api/batchgraduation/processor/RunSpecialGradAlgorithmProcessor.java
@@ -3,6 +3,8 @@
 import ca.bc.gov.educ.api.batchgraduation.model.GraduationStudentRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.UUID;
 
@@ -11,7 +13,8 @@ public class RunSpecialGradAlgorithmProcessor extends BaseProcessor {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RunSpecialGradAlgorithmProcessor.class);
 
 	@Override
-	public GraduationStudentRecord process(UUID key) throws Exception {
+	@Nullable
+	public GraduationStudentRecord process(@NonNull UUID key) throws Exception {
 		GraduationStudentRecord item = getItem(key);
 		if (item != null) {
 			LOGGER.info("Processing partitionData = {}", item.getProgram());

diff --git a/.../bc/gov/educ/api/batchgraduation/processor/RunSpecialProjectedGradAlgorithmProcessor.java b/.../bc/gov/educ/api/batchgraduation/processor/RunSpecialProjectedGradAlgorithmProcessor.java
@@ -3,6 +3,8 @@
 import ca.bc.gov.educ.api.batchgraduation.model.GraduationStudentRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.UUID;
 
@@ -11,7 +13,8 @@ public class RunSpecialProjectedGradAlgorithmProcessor extends BaseProcessor {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RunSpecialProjectedGradAlgorithmProcessor.class);
 
 	@Override
-	public GraduationStudentRecord process(UUID key) throws Exception {
+	@Nullable
+	public GraduationStudentRecord process(@NonNull UUID key) throws Exception {
 		GraduationStudentRecord item = getItem(key);
 		if (item != null) {
 			LOGGER.info("Processing partitionData = {}", item.getProgram());

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/BaseWriter.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/BaseWriter.java
@@ -22,12 +22,14 @@ public abstract class BaseWriter implements ItemWriter<GraduationStudentRecord>
     AlgorithmSummaryDTO summaryDTO;
 
     protected void saveBatchStatus(GraduationStudentRecord item) {
-        if (summaryDTO.getErrors().containsKey(item.getStudentID())) {
-            ProcessError v = summaryDTO.getErrors().get(item.getStudentID());
-            gradBatchHistoryService.updateBatchStatusForStudent(batchId, item.getStudentID(), BatchStatusEnum.FAILED, v.getReason() + "-" + v.getDetail());
-            summaryDTO.getErrors().remove(item.getStudentID());
-        } else {
-            gradBatchHistoryService.updateBatchStatusForStudent(batchId, item.getStudentID(), BatchStatusEnum.COMPLETED, null);
+        if (item != null) {
+            if (summaryDTO.getErrors().containsKey(item.getStudentID())) {
+                ProcessError v = summaryDTO.getErrors().get(item.getStudentID());
+                gradBatchHistoryService.updateBatchStatusForStudent(batchId, item.getStudentID(), BatchStatusEnum.FAILED, v.getReason() + "-" + v.getDetail());
+                summaryDTO.getErrors().remove(item.getStudentID());
+            } else {
+                gradBatchHistoryService.updateBatchStatusForStudent(batchId, item.getStudentID(), BatchStatusEnum.COMPLETED, null);
+            }
         }
     }
 }
diff --git a/...src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/TvrRunBatchPerformanceWriter.java b/...src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/TvrRunBatchPerformanceWriter.java
@@ -1,20 +1,14 @@
 package ca.bc.gov.educ.api.batchgraduation.writer;
 
 import ca.bc.gov.educ.api.batchgraduation.model.GraduationStudentRecord;
-import ca.bc.gov.educ.api.batchgraduation.service.GradBatchHistoryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.Chunk;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class TvrRunBatchPerformanceWriter extends BaseWriter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TvrRunBatchPerformanceWriter.class);
 
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
-    @Autowired
-    GradBatchHistoryService gradBatchHistoryService;
-
     @Override
     public void write(Chunk<? extends GraduationStudentRecord> list) throws Exception {
         if(!list.isEmpty()) {

diff --git a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/config/BatchConfig.java b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/config/BatchConfig.java
@@ -7,6 +7,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +25,15 @@ public JobLauncher asyncJobLauncher(JobRepository jobRepository) throws Exceptio
         return jobLauncher;
     }
 
+    @Bean(name = "jobLauncher")
+    public JobLauncher jobLauncher(JobRepository jobRepository) throws Exception {
+        TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
+        jobLauncher.setJobRepository(jobRepository);
+        jobLauncher.setTaskExecutor(new SyncTaskExecutor());
+        jobLauncher.afterPropertiesSet();
+        return jobLauncher;
+    }
+
     @Bean
     public ThreadPoolTaskScheduler threadPoolTaskScheduler(){
         ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();

diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml
@@ -67,6 +67,8 @@ authorization:
   password: abc
 
 batch:
+  transaction:
+    chunk-size: 1
   partitions:
     number: 10
   regalg:

diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -51,9 +51,9 @@ PARSER_CONFIG="
 ###########################################################
 echo Creating config map "$APP_NAME"-config-map
 oc create -n "$OPENSHIFT_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
- --from-literal=CONNECTION_TIMEOUT="60000" \
+ --from-literal=CONNECTION_TIMEOUT="30000" \
  --from-literal=GRAD_TRAX_API="http://educ-grad-trax-api.$OPENSHIFT_NAMESPACE-$envValue.svc.cluster.local:8080/" \
- --from-literal=MAX_LIFETIME="590000" \
+ --from-literal=MAX_LIFETIME="420000" \
  --from-literal=GRAD_STUDENT_API="http://educ-grad-student-api.$OPENSHIFT_NAMESPACE-$envValue.svc.cluster.local:8080/" \
  --from-literal=MAXIMUM_POOL_SIZE="25" \
  --from-literal=APP_LOG_LEVEL="$APP_LOG_LEVEL" \