From 5b24c3a52c934cfe7fd0d2c89c39176ffab3bab8 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 20 Apr 2021 10:56:19 +0300 Subject: [PATCH] fixed some test issues --- .../ObjectMapperConfiguration.java | 43 ------------------- .../controller/RedactionController.java | 4 +- .../segmentation/PdfSegmentationService.java | 23 +++++----- .../storage/RedactionStorageService.java | 2 +- 4 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/configuration/ObjectMapperConfiguration.java diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/configuration/ObjectMapperConfiguration.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/configuration/ObjectMapperConfiguration.java deleted file mode 100644 index 44d3c2b7..00000000 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/configuration/ObjectMapperConfiguration.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.iqser.red.service.redaction.v1.server.configuration; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.module.SimpleModule; -import org.apache.pdfbox.pdmodel.font.PDFont; -import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -import java.io.IOException; - -@Configuration -public class ObjectMapperConfiguration { - - - @Bean - @Primary - public ObjectMapper objectMapper() { - var objectMapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule("SimpleModule", - new Version(1, 0, 0, null)); -// simpleModule.addSerializer(new ItemSerializer()); - simpleModule.addSerializer(PDFont.class, new PDFontSerializer()); - simpleModule.addSerializer(PDTrueTypeFont.class, new PDFontSerializer()); - objectMapper.registerModule(simpleModule); - - return objectMapper; - } - - - public static class PDFontSerializer extends JsonSerializer { - - @Override - public void serialize(PDFont t, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - jsonGenerator.writeNull(); - } - } -} 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 250001a7..63a212b8 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 @@ -59,7 +59,7 @@ public class RedactionController implements RedactionResource { try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) { pdDocument.setAllSecurityToBeRemoved(true); - + dictionaryService.updateDictionary(redactionLog.getRuleSetId()); annotationService.annotate(pdDocument, redactionLog, sectionsGrid); @@ -131,7 +131,7 @@ public class RedactionController implements RedactionResource { try { var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN)); - classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream); + classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true); } catch (Exception e) { throw new RedactionException(e); } 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 21276881..be4fa972 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 @@ -45,6 +45,10 @@ public class PdfSegmentationService { public Document parseDocument(InputStream documentInputStream) throws IOException { + return parseDocument(documentInputStream, false); + } + + public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException { PDDocument pdDocument = null; try { //create tempFile @@ -84,24 +88,23 @@ public class PdfSegmentationService { Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings .getVertical()); + page.setRotation(rotation); - - tableExtractionService.extractTables(cleanRulings, page); - - buildPageStatistics(page); - page.setLandscape(isLandscape || isRotated); - page.setPageNumber(pageNumber); - increaseDocumentStatistics(page, document); - page.setImages(stripper.getImages()); - imageClassificationService.classifyImages(page); + tableExtractionService.extractTables(cleanRulings, page); + buildPageStatistics(page); + increaseDocumentStatistics(page, document); + + + if (!ignoreImages) { + imageClassificationService.classifyImages(page); + } pages.add(page); - } document.setPages(pages); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java index c9792c0f..2c96bd05 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java @@ -50,7 +50,7 @@ public class RedactionStorageService { try { return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class); } catch (IOException e) { - throw new RuntimeException("Could not convert Text", e); + throw new RuntimeException("Could not convert RedactionLog", e); } }