diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java index c0853b6..eb1997b 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java @@ -159,7 +159,7 @@ public class ExcelTemplateReportGenerationService { } } } - log.info("Calculate Placeholder Cells took: {}", System.currentTimeMillis() - start); + log.debug("Calculate Placeholder Cells took: {}", System.currentTimeMillis() - start); return new ExcelModel(placeholderCellPos, placeholderRow, columnWidths, cellsToCopy, false); } @@ -180,7 +180,7 @@ public class ExcelTemplateReportGenerationService { } rowIndex.getAndIncrement(); }); - log.info("Adding rows took: {}", System.currentTimeMillis() - start); + log.debug("Adding rows took: {}", System.currentTimeMillis() - start); excelModel.setPlaceholderRow(rowIndex.getAndIncrement()); return excelModel; 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 69613d9..26415d1 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 @@ -56,9 +56,6 @@ public class ReportGenerationService { private final ExcelTemplateReportGenerationService excelTemplateReportGenerationService; private final GeneratePlaceholderService generatePlaceholderService; - @Value("${redaction-report-service.numberOfReportGenerationThreads:4}") - private int numberOfReportGenerationThreads; - @SneakyThrows public List generateReport(ReportRequestMessage reportMessage) { @@ -119,8 +116,6 @@ public class ReportGenerationService { List reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds() .get(j), fileStatus.isExcluded()); -// ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads); - var isLastFile = j == reportMessage.getFileIds().size() - 1; for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks) { @@ -142,9 +137,6 @@ public class ReportGenerationService { } -// executor.shutdown(); -// executor.awaitTermination(1, TimeUnit.DAYS); - long end = System.currentTimeMillis(); log.info("Successfully processed {}/{} fileIds for downloadId {}, took {}", i, reportMessage.getFileIds() .size(), reportMessage.getDownloadId(), end - start); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java index 6ab5e81..339a982 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java @@ -56,7 +56,7 @@ public class WordReportGenerationService { var placeholderFunctions = computePlaceholderPos(table); addTableRows(table, reportEntries, fileStatus.getFilename(), fileStatus, placeholderModel.getFileAttributePlaceHolders(), placeholderFunctions); long t2 = System.currentTimeMillis(); - log.warn("Table time: {}", (t2 - t1)); + log.debug("Table time: {}", (t2 - t1)); t1 = System.currentTimeMillis(); replaceTextPlaceholders(doc, placeholderModel, dossier, fileStatus, table, reportEntries); @@ -66,7 +66,7 @@ public class WordReportGenerationService { } t2 = System.currentTimeMillis(); - log.warn("Text time: {}", (t2 - t1)); + log.debug("Text time: {}", (t2 - t1)); long end = System.currentTimeMillis();