From 38777292aed55fb6d974622d89b5143b6af2f146 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 29 Sep 2021 19:19:55 +0300 Subject: [PATCH] type refactor --- .../v1/api/model/ReportRequestMessage.java | 10 ++-- .../v1/api/model/ReportResultMessage.java | 6 +- .../v1/api/resource/PlaceholderResource.java | 6 +- .../v1/api/resource/StatusReportResource.java | 3 +- .../pom.xml | 16 ++--- .../client/DossierAttributesClient.java | 3 +- .../client/DossierAttributesConfigClient.java | 5 +- .../v1/server/client/DossierClient.java | 3 +- .../client/FileAttributesConfigClient.java | 3 +- .../v1/server/client/FileStatusClient.java | 3 +- .../v1/server/client/RedactionLogClient.java | 3 +- .../server/client/ReportTemplateClient.java | 3 +- .../configuration/MessagingConfiguration.java | 3 +- .../controller/PlaceholderController.java | 8 +-- .../controller/StatusReportController.java | 12 ++-- .../v1/server/model/MultiFileWorkbook.java | 3 +- .../ExcelTemplateReportGenerationService.java | 59 +++++-------------- .../v1/server/service/PlaceholderService.java | 9 ++- .../service/RedactionLogConverterService.java | 19 +++--- .../service/ReportGenerationService.java | 18 +++--- .../server/service/ReportMessageReceiver.java | 22 ++++--- .../StatusReportGenerationService.java | 28 ++++----- .../service/WordReportGenerationService.java | 55 +++++------------ .../server/storage/ReportStorageService.java | 12 ++-- .../v1/server/utils/ResourceLoader.java | 10 ++-- 25 files changed, 112 insertions(+), 210 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java index c5e4ad8..dfa01be 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java @@ -1,15 +1,15 @@ package com.iqser.red.service.redaction.report.v1.api.model; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + @Data @Builder @AllArgsConstructor diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java index 337e669..a02d933 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportResultMessage.java @@ -1,13 +1,13 @@ package com.iqser.red.service.redaction.report.v1.api.model; -import java.util.ArrayList; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Data @Builder @AllArgsConstructor diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/PlaceholderResource.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/PlaceholderResource.java index 28eeed8..0186c4a 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/PlaceholderResource.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/PlaceholderResource.java @@ -1,10 +1,10 @@ package com.iqser.red.service.redaction.report.v1.api.resource; -import java.util.List; - import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import java.util.List; + public interface PlaceholderResource { String PLACEHOLDERS_PATH = "/placeholders"; @@ -13,6 +13,4 @@ public interface PlaceholderResource { List getPlaceholders(); - - } diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/StatusReportResource.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/StatusReportResource.java index 6e2b9d3..53228e4 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/StatusReportResource.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/resource/StatusReportResource.java @@ -1,11 +1,10 @@ package com.iqser.red.service.redaction.report.v1.api.resource; +import com.iqser.red.service.redaction.report.v1.api.model.StatusReportResponse; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import com.iqser.red.service.redaction.report.v1.api.model.StatusReportResponse; - public interface StatusReportResource { String STATUS_REPORT = "/statusReport"; diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml index 55a80ac..039be29 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml +++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml @@ -24,15 +24,11 @@ com.iqser.red.service redaction-service-api-v1 - 3.5.0 + 3.6.0 com.iqser.red.service - file-management-service-api-v1 - - - com.iqser.red.service - configuration-service-api-v1 + persistence-service-api-v1 @@ -40,15 +36,11 @@ com.iqser.red.service persistence-service-api-v1 - 0.18.0 + 0.22.0 com.iqser.red.service - file-management-service-api-v1 - - - com.iqser.red.service - configuration-service-api-v1 + redaction-service-api-v1 diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesClient.java index fe686be..7416110 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesClient.java @@ -1,9 +1,8 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.DossierAttributesResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "DossierAttributesResource", url = "${persistence-service.url}") public interface DossierAttributesClient extends DossierAttributesResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesConfigClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesConfigClient.java index cc21957..8ef52f8 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesConfigClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierAttributesConfigClient.java @@ -1,9 +1,8 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.DossierAttributesConfigResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "DossierAttributesConfigResource", url = "${persistence-service.url}") public interface DossierAttributesConfigClient extends DossierAttributesConfigResource { -} \ No newline at end of file +} diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierClient.java index b0759dd..c6c773f 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/DossierClient.java @@ -1,8 +1,7 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.DossierResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "DossierResource", url = "${persistence-service.url}") public interface DossierClient extends DossierResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileAttributesConfigClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileAttributesConfigClient.java index 91353fc..8276cfe 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileAttributesConfigClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileAttributesConfigClient.java @@ -1,8 +1,7 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.FileAttributesConfigResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "FileAttributesResource", url = "${persistence-service.url}") public interface FileAttributesConfigClient extends FileAttributesConfigResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileStatusClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileStatusClient.java index cc05c85..cdaad36 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileStatusClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/FileStatusClient.java @@ -1,8 +1,7 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.StatusResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "StatusResource", url = "${persistence-service.url}") public interface FileStatusClient extends StatusResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/RedactionLogClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/RedactionLogClient.java index 4f60561..6f2bf72 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/RedactionLogClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/RedactionLogClient.java @@ -1,8 +1,7 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.RedactionLogResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "RedactionLogResource", url = "${persistence-service.url}") public interface RedactionLogClient extends RedactionLogResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/ReportTemplateClient.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/ReportTemplateClient.java index d58c4c5..072a765 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/ReportTemplateClient.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/client/ReportTemplateClient.java @@ -1,8 +1,7 @@ package com.iqser.red.service.redaction.report.v1.server.client; -import org.springframework.cloud.openfeign.FeignClient; - import com.iqser.red.service.persistence.service.v1.api.resources.ReportTemplateResource; +import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "ReportTemplateResource", url = "${persistence-service.url}") public interface ReportTemplateClient extends ReportTemplateResource { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java index 47ec712..66a1403 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java @@ -1,12 +1,11 @@ package com.iqser.red.service.redaction.report.v1.server.configuration; +import lombok.RequiredArgsConstructor; import org.springframework.amqp.core.Queue; import org.springframework.amqp.core.QueueBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import lombok.RequiredArgsConstructor; - @Configuration @RequiredArgsConstructor public class MessagingConfiguration { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/PlaceholderController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/PlaceholderController.java index fe4a4de..c59d328 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/PlaceholderController.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/PlaceholderController.java @@ -1,14 +1,12 @@ package com.iqser.red.service.redaction.report.v1.server.controller; -import java.util.List; - -import org.springframework.web.bind.annotation.RestController; - import com.iqser.red.service.redaction.report.v1.api.resource.PlaceholderResource; import com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; @Slf4j @RestController diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java index c76102e..78e1553 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java @@ -1,16 +1,14 @@ package com.iqser.red.service.redaction.report.v1.server.controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestController; - import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; import com.iqser.red.service.redaction.report.v1.api.model.StatusReportResponse; import com.iqser.red.service.redaction.report.v1.api.resource.StatusReportResource; import com.iqser.red.service.redaction.report.v1.server.client.DossierClient; import com.iqser.red.service.redaction.report.v1.server.service.StatusReportGenerationService; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @@ -25,9 +23,9 @@ public class StatusReportController implements StatusReportResource { @Override public StatusReportResponse generateStatusReport(@PathVariable(DOSSIER_ID) String dossierId) { - Dossier dossier = dossierClient.getDossierById(dossierId); - byte[] report = statusReportGenerationService.generateReport(dossier); - return new StatusReportResponse(report, dossier.getDossierName() + ".xlsx"); + Dossier dossier = dossierClient.getDossierById(dossierId); + byte[] report = statusReportGenerationService.generateReport(dossier); + return new StatusReportResponse(report, dossier.getDossierName() + ".xlsx"); } } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/MultiFileWorkbook.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/MultiFileWorkbook.java index 5c79918..6b9f01f 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/MultiFileWorkbook.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/model/MultiFileWorkbook.java @@ -1,9 +1,8 @@ package com.iqser.red.service.redaction.report.v1.server.model; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - import lombok.AllArgsConstructor; import lombok.Data; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; @Data @AllArgsConstructor 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 430a2a8..7b28342 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 @@ -1,45 +1,5 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.DOSSIER_NAME_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.EXCERPT_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FILE_NAME_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ENG; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ENG_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_GER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_GER_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_TIME_ISO; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_TIME_ISO_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_PARAGRAPH_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_REASON_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.PAGE_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.PARAGRAPH_PLACEHOLDER; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; - -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.CreationHelper; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Service; - import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute; @@ -50,11 +10,22 @@ import com.iqser.red.service.redaction.report.v1.server.client.DossierAttributes import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesConfigClient; import com.iqser.red.service.redaction.report.v1.server.model.ImagePlaceholder; import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry; -import com.iqser.red.service.redaction.report.v1.server.storage.ReportStorageService; - import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Service; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Pattern; + +import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.*; @Slf4j @Service @@ -82,7 +53,7 @@ public class ExcelTemplateReportGenerationService { if (dossierAttribute.getDossierAttributeConfigId().equals(attributeConfig.getId())) { if (attributeConfig.getType().equals(DossierAttributeType.IMAGE)) { - if(dossierAttribute.getValue() != null) { + if (dossierAttribute.getValue() != null) { if (dossierAttribute.getValue().startsWith("data:")) { imagePlaceholders.add(new ImagePlaceholder(attributeConfig.getPlaceholder(), Base64.getDecoder() .decode(dossierAttribute.getValue().split(",")[1]))); @@ -92,7 +63,7 @@ public class ExcelTemplateReportGenerationService { } } } else { - if(dossierAttribute.getValue() == null){ + if (dossierAttribute.getValue() == null) { dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), ""); } else { dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue()); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/PlaceholderService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/PlaceholderService.java index cd5980e..93dee16 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/PlaceholderService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/PlaceholderService.java @@ -1,12 +1,11 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import java.time.format.DateTimeFormatter; -import java.util.List; - -import org.springframework.stereotype.Service; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.format.DateTimeFormatter; +import java.util.List; @Slf4j @Service diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java index 478866b..0847e95 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java @@ -1,12 +1,5 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.springframework.stereotype.Service; - import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis; import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry; @@ -14,6 +7,12 @@ import com.iqser.red.service.redaction.v1.model.ChangeType; import com.iqser.red.service.redaction.v1.model.ManualRedactionType; import com.iqser.red.service.redaction.v1.model.Rectangle; import com.iqser.red.service.redaction.v1.model.RedactionLog; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; @Service public class RedactionLogConverterService { @@ -27,7 +26,7 @@ public class RedactionLogConverterService { if (entry.isRedacted()) { - if(entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges().get(entry.getChanges().size() -1).getType().equals(ChangeType.REMOVED)){ + if (entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges().get(entry.getChanges().size() - 1).getType().equals(ChangeType.REMOVED)) { return; } @@ -85,11 +84,11 @@ public class RedactionLogConverterService { } private String checkTextForNull(String text) { - if(text == null) { + if (text == null) { return ""; } return text; } -} \ No newline at end of file +} 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 800d603..af4c92e 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 @@ -1,13 +1,5 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Service; - import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; import com.iqser.red.service.redaction.report.v1.api.model.ReportRequestMessage; @@ -22,9 +14,15 @@ import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEnt import com.iqser.red.service.redaction.report.v1.server.storage.ReportStorageService; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Service; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; @Slf4j @Service @@ -82,7 +80,7 @@ public class ReportGenerationService { for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks) { excelTemplateReportGenerationService.generateReport(reportEntries, reportMessage.getDossierTemplateId(), multiFileWorkbook.getWorkbook(), fileStatus, project, j == reportMessage.getFileIds() - .size() - 1 ? true : false); + .size() - 1); } for (ReportTemplate reportTemplate : singleFilesTemplates) { if (reportTemplate.getFileName().endsWith(".xlsx")) { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java index 433621f..7fc04d0 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportMessageReceiver.java @@ -1,23 +1,21 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import static com.iqser.red.service.redaction.report.v1.server.configuration.MessagingConfiguration.REPORT_QUEUE; -import static com.iqser.red.service.redaction.report.v1.server.configuration.MessagingConfiguration.REPORT_RESULT_QUEUE; - -import java.util.List; - -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.stereotype.Service; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.redaction.report.v1.api.model.ReportRequestMessage; import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage; import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.stereotype.Service; + +import java.util.List; + +import static com.iqser.red.service.redaction.report.v1.server.configuration.MessagingConfiguration.REPORT_QUEUE; +import static com.iqser.red.service.redaction.report.v1.server.configuration.MessagingConfiguration.REPORT_RESULT_QUEUE; @Slf4j @Service @@ -59,4 +57,4 @@ public class ReportMessageReceiver { } } -} \ No newline at end of file +} diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java index 823a994..0357dad 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java @@ -1,30 +1,22 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig; +import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesConfigClient; +import com.iqser.red.service.redaction.report.v1.server.client.FileStatusClient; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import org.apache.poi.xssf.usermodel.*; +import org.springframework.stereotype.Service; import java.io.ByteArrayOutputStream; -import java.io.File; import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.apache.poi.xssf.usermodel.XSSFFont; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Service; - -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig; -import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesConfigClient; -import com.iqser.red.service.redaction.report.v1.server.client.FileStatusClient; - -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; +import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO; @Service @RequiredArgsConstructor @@ -95,7 +87,7 @@ public class StatusReportGenerationService { Iterator> iterator = fileAttributes.entrySet().iterator(); while (iterator.hasNext()) { var nextElement = iterator.next(); - if(attributesAssignment.get(nextElement.getKey()) != null) { + if (attributesAssignment.get(nextElement.getKey()) != null) { XSSFCell cell = row.createCell(attributesAssignment.get(nextElement.getKey())); cell.setCellValue(nextElement.getValue()); sheet.autoSizeColumn(attributesAssignment.get(nextElement.getKey())); 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 cb10cb4..9979441 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 @@ -1,44 +1,5 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.DOSSIER_NAME_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.EXCERPT_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FILE_NAME_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ENG; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ENG_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_GER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_GER_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ISO_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_TIME_ISO; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_TIME_ISO_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_PARAGRAPH_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.JUSTIFICATION_REASON_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.PAGE_PLACEHOLDER; -import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.PARAGRAPH_PLACEHOLDER; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.util.Units; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; -import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableCell; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.springframework.stereotype.Service; - import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; @@ -52,8 +13,20 @@ import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesCon import com.iqser.red.service.redaction.report.v1.server.model.ImagePlaceholder; import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry; import com.iqser.red.service.redaction.report.v1.server.storage.ReportStorageService; - import lombok.RequiredArgsConstructor; +import org.apache.poi.openxml4j.exceptions.InvalidFormatException; +import org.apache.poi.util.Units; +import org.apache.poi.xwpf.usermodel.*; +import org.springframework.stereotype.Service; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.util.*; +import java.util.regex.Pattern; + +import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.*; @Service @RequiredArgsConstructor @@ -92,7 +65,7 @@ public class WordReportGenerationService { } } } else { - if(dossierAttribute.getValue() == null){ + if (dossierAttribute.getValue() == null) { dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), ""); } else { dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue()); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/storage/ReportStorageService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/storage/ReportStorageService.java index 7de2188..da6274c 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/storage/ReportStorageService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/storage/ReportStorageService.java @@ -1,16 +1,12 @@ package com.iqser.red.service.redaction.report.v1.server.storage; -import java.io.IOException; -import java.util.UUID; - +import com.iqser.red.storage.commons.service.StorageService; +import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; import org.springframework.stereotype.Service; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.redaction.v1.model.RedactionLog; -import com.iqser.red.storage.commons.service.StorageService; - -import lombok.RequiredArgsConstructor; +import java.io.IOException; +import java.util.UUID; @Service @RequiredArgsConstructor diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/utils/ResourceLoader.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/utils/ResourceLoader.java index 23f1b96..14ca120 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/utils/ResourceLoader.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/utils/ResourceLoader.java @@ -1,11 +1,11 @@ package com.iqser.red.service.redaction.report.v1.server.utils; +import lombok.experimental.UtilityClass; + import java.io.IOException; import java.io.InputStream; import java.net.URL; -import lombok.experimental.UtilityClass; - @UtilityClass public class ResourceLoader { @@ -15,9 +15,9 @@ public class ResourceLoader { if (resource == null) { throw new IllegalArgumentException("could not load classpath resource: " + classpathPath); } - try (InputStream is = resource.openStream()){ - return is.readAllBytes(); - } catch (IOException e){ + try (InputStream is = resource.openStream()) { + return is.readAllBytes(); + } catch (IOException e) { throw new IllegalArgumentException("could not load classpath resource: " + classpathPath, e); } }