Merge branch 'main' into grad-release

bcgov · Aug 29, 2023 · a572861 · a572861
2 parents c3bdee0 + da79192
commit a572861
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
     <artifactId>educ-grad-graduation-report-api</artifactId>
-    <version>1.8.32</version>
+    <version>1.8.40</version>
     <name>educ-grad-graduation-report-api</name>
     <description>Grad Graduation Report API for GRAD team</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/config/RestWebClient.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/config/RestWebClient.java
@@ -37,7 +37,7 @@ public WebClient webClient() {
         return WebClient.builder().uriBuilderFactory(defaultUriBuilderFactory).exchangeStrategies(ExchangeStrategies.builder()
                 .codecs(configurer -> configurer
                         .defaultCodecs()
-                        .maxInMemorySize(40 * 1024 * 1024)) // 40 MB
+                        .maxInMemorySize(100 * 1024 * 1024)) // 100 MB
                       .build())
                 .build();
     }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/BaseService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/BaseService.java
@@ -56,9 +56,10 @@ protected UUID convertStringToGuid(String studentGuid) {
         return new UUID(ByteBuffer.wrap(data, 0, 8).getLong(), ByteBuffer.wrap(data, 8, 8).getLong());
     }
 
-    protected void processReportGradStudentDataTasksAsync(List<Callable<Object>> tasks, List<ReportGradStudentData> result, int numberOfThreads) {
+    protected void processReportGradStudentDataTasksAsync(List<Callable<Object>> tasks, List<ReportGradStudentData> result) {
+        if(tasks.isEmpty()) return;
         List<Future<Object>> executionResult;
-        ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+        ExecutorService executorService = Executors.newWorkStealingPool();
         try {
             executionResult = executorService.invokeAll(tasks);
             for (Future<?> f : executionResult) {
@@ -73,6 +74,7 @@ protected void processReportGradStudentDataTasksAsync(List<Callable<Object>> tas
             }
         } catch (InterruptedException | ExecutionException ex) {
             logger.error("Multithreading error during the task execution: {}", ex.getLocalizedMessage());
+            Thread.currentThread().interrupt();
         } finally {
             executorService.shutdown();
         }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
@@ -710,7 +710,7 @@ private List<ReportGradStudentData> processReportGradStudentDataList(Page<School
                 tasks.add(pageTask);
             }
 
-            processReportGradStudentDataTasksAsync(tasks, result, totalNumberOfPages);
+            processReportGradStudentDataTasksAsync(tasks, result);
         }
         logger.debug("Completed in {} sec, total objects acquired {}", (System.currentTimeMillis() - startTime) / 1000, result.size());
         return result;