From f1ebfef248a9e432ff0e923a65cb910fdfa60569 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 13 May 2022 16:34:18 +0200 Subject: [PATCH] RED-4036: Revert parallel processing --- .../service/ReportGenerationService.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java index 6447a4e..dbdfaba 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java @@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Service @RequiredArgsConstructor +@SuppressWarnings("PMD") public class ReportGenerationService { private final ReportStorageService reportStorageService; @@ -111,30 +112,30 @@ public class ReportGenerationService { List reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds() .get(j), fileStatus.isExcluded()); - ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads); +// ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads); var isLastFile = j == reportMessage.getFileIds() .size() - 1; for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks) - executor.submit(() -> excelTemplateReportGenerationService.generateReport(reportEntries, + excelTemplateReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileWorkbook.getTemplateName(), - multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile)); + multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile); for (MultiFileDocument multiFileDocument : multiFileDocuments) { - executor.submit(() -> - wordReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileDocument.getTemplateName(), multiFileDocument.getDocument(), fileStatus, dossier, isLastFile) - ); + + wordReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileDocument.getTemplateName(), multiFileDocument.getDocument(), fileStatus, dossier, isLastFile); + } for (ReportTemplate reportTemplate : singleFilesTemplates) { - executor.submit(() -> - storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate)) - ); + + storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate)); + } - executor.shutdown(); - executor.awaitTermination(1, TimeUnit.DAYS); +// executor.shutdown(); +// executor.awaitTermination(1, TimeUnit.DAYS); long end = System.currentTimeMillis(); log.info("Successfully processed {}/{} fileIds for downloadId {}, took {}", i, reportMessage.getFileIds()