From 37125f14fd6aaba76f3a9e78880933a480195cf6 Mon Sep 17 00:00:00 2001 From: lmaldacker Date: Mon, 8 Feb 2021 16:22:26 +0100 Subject: [PATCH] Add logs --- .../redaction/v1/server/controller/RedactionController.java | 2 ++ .../v1/server/redaction/service/AnnotationService.java | 3 ++- .../v1/server/redaction/service/EntityRedactionService.java | 5 +++++ .../server/redaction/service/RedactionLogCreatorService.java | 4 ++++ .../v1/server/segmentation/PdfSegmentationService.java | 4 ++++ .../v1/server/segmentation/SectionsBuilderService.java | 5 +++++ .../tableextraction/service/RulingCleaningService.java | 2 ++ .../tableextraction/service/TableExtractionService.java | 5 +++++ 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java index 2631ec79..8ce9511d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java @@ -51,6 +51,8 @@ public class RedactionController implements RedactionResource { @Override public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) { + log.info("Starting redaction analysis..."); + try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) { pdDocument.setAllSecurityToBeRemoved(true); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnnotationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnnotationService.java index 9af17d2f..c46e5550 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnnotationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnnotationService.java @@ -39,7 +39,7 @@ public class AnnotationService { public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException { - + log.info("Annotating document."); Map> redactionLogPerPage = convertRedactionLog(redactionLog); for (int page = 1; page <= document.getNumberOfPages(); page++) { @@ -56,6 +56,7 @@ public class AnnotationService { addAnnotations(logEntries, pdPage, page); } } + log.info("Finished document annotation."); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java index 7be4069b..adeb96a4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java @@ -50,6 +50,8 @@ public class EntityRedactionService { public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions) { + log.info("Processing document."); + dictionaryService.updateDictionary(ruleSetId); KieContainer container = droolsExecutionService.updateRules(ruleSetId); long rulesVersion = droolsExecutionService.getRulesVersion(ruleSetId); @@ -93,6 +95,9 @@ public class EntityRedactionService { classifiedDoc.setDictionaryVersion(dictionary.getVersion()); classifiedDoc.setRulesVersion(rulesVersion); + + log.info("Finished document processing."); + } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index 19e61ab6..10c8098a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -47,6 +47,8 @@ public class RedactionLogCreatorService { public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions, String ruleSetId) { + log.info("Creating redaction log."); + Set manualRedactionPages = getManualRedactionPages(manualRedactions); for (int page = 1; page <= numberOfPages; page++) { @@ -65,6 +67,8 @@ public class RedactionLogCreatorService { addImageEntries(classifiedDoc, page, ruleSetId); } } + + log.info("Finished redaction log creation."); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java index 0e6f43f3..8b38961b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java @@ -39,6 +39,8 @@ public class PdfSegmentationService { public Document parseDocument(PDDocument pdDocument) throws IOException { + log.info("Parsing document."); + Document document = new Document(); List pages = new ArrayList<>(); @@ -91,6 +93,8 @@ public class PdfSegmentationService { sectionsBuilderService.buildSections(document); + log.info("Finished document parsing."); + return document; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java index e9e3c6e5..2c68c992 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java @@ -24,6 +24,8 @@ public class SectionsBuilderService { public void buildSections(Document document) { + log.info("Building sections."); + List chunkWords = new ArrayList<>(); List chunkBlockList = new ArrayList<>(); List
headers = new ArrayList<>(); @@ -87,6 +89,9 @@ public class SectionsBuilderService { document.setParagraphs(chunkBlockList); document.setHeaders(headers); document.setFooters(footers); + + log.info("Finished section building."); + } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/RulingCleaningService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/RulingCleaningService.java index 82ca3bb7..9df63762 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/RulingCleaningService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/RulingCleaningService.java @@ -20,6 +20,8 @@ public class RulingCleaningService { public CleanRulings getCleanRulings(List rulings, float minCharWidth, float maxCharHeight) { + log.info("Getting clean rulings."); + if (!rulings.isEmpty()) { snapPoints(rulings, minCharWidth, maxCharHeight); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/TableExtractionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/TableExtractionService.java index 3dddd34a..0fbe1e77 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/TableExtractionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/service/TableExtractionService.java @@ -28,6 +28,8 @@ public class TableExtractionService { public void extractTables(CleanRulings cleanRulings, Page page) { + log.info("Extracting tables."); + List cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical()); List toBeRemoved = new ArrayList<>(); @@ -78,6 +80,9 @@ public class TableExtractionService { } page.getTextBlocks().removeAll(toBeRemoved); + + log.info("Finished table extraction."); + }