Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

fixed some test issues

Browse Source
This commit is contained in:
Timo 2021-04-20 10:56:19 +03:00
parent 385dff63ce
commit 5b24c3a52c
4 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/configuration/ObjectMapperConfiguration.java
View File

@ -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<PDFont> {
@Override
public void serialize(PDFont t, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
jsonGenerator.writeNull();
}
}
}

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java
View File

@ -131,7 +131,7 @@ public class RedactionController implements RedactionResource {
try { try {
var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN)); 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) { } catch (Exception e) {
throw new RedactionException(e); throw new RedactionException(e);
} }

23
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java
View File

@ -45,6 +45,10 @@ public class PdfSegmentationService {
public Document parseDocument(InputStream documentInputStream) throws IOException { public Document parseDocument(InputStream documentInputStream) throws IOException {
return parseDocument(documentInputStream, false);
}
public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
PDDocument pdDocument = null; PDDocument pdDocument = null;
try { try {
//create tempFile //create tempFile
@ -84,24 +88,23 @@ public class PdfSegmentationService {
Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
.getVertical()); .getVertical());
page.setRotation(rotation); page.setRotation(rotation);
tableExtractionService.extractTables(cleanRulings, page);
buildPageStatistics(page);
page.setLandscape(isLandscape || isRotated); page.setLandscape(isLandscape || isRotated);
page.setPageNumber(pageNumber); page.setPageNumber(pageNumber);
increaseDocumentStatistics(page, document);
page.setImages(stripper.getImages()); page.setImages(stripper.getImages());
imageClassificationService.classifyImages(page); tableExtractionService.extractTables(cleanRulings, page);
buildPageStatistics(page);
increaseDocumentStatistics(page, document);
if (!ignoreImages) {
imageClassificationService.classifyImages(page);
}
pages.add(page); pages.add(page);
} }
document.setPages(pages); document.setPages(pages);

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
View File

@ -50,7 +50,7 @@ public class RedactionStorageService {
try { try {
return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class); return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Could not convert Text", e); throw new RuntimeException("Could not convert RedactionLog", e);
} }
} }