diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml index 124e5ae4..501ae19c 100644 --- a/redaction-service-v1/pom.xml +++ b/redaction-service-v1/pom.xml @@ -32,7 +32,7 @@ com.iqser.red platform-commons-dependency - 1.2.9 + 1.3.0 import pom diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java index 04e394f8..d8e72d22 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java @@ -2,11 +2,13 @@ package com.iqser.red.service.redaction.v1.server.parsing.model; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.SneakyThrows; import org.apache.pdfbox.text.TextPosition; import org.springframework.beans.BeanUtils; @Data +@NoArgsConstructor public class RedTextPosition { private String textMatrix; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java index 6d65518c..e38c8cf2 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java @@ -3,19 +3,23 @@ package com.iqser.red.service.redaction.v1.server.redaction.model; import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock; import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence; import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities; -import lombok.Value; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; -@Value +@Data +@NoArgsConstructor +@AllArgsConstructor public class CellValue { - private List textBlocks; + private List textBlocks = new ArrayList<>(); private int rowSpanStart; - @Override public String toString() { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java index 90c964fb..a5bcd4f3 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java @@ -128,6 +128,7 @@ public class ReanalyzeService { } } + log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest); if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) { redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion()); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FilySystemBackedStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java similarity index 85% rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FilySystemBackedStorageService.java rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java index 9cc8537f..e37034ce 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FilySystemBackedStorageService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java @@ -12,11 +12,11 @@ import java.io.FileOutputStream; import java.util.HashMap; import java.util.Map; -public class FilySystemBackedStorageService extends StorageService { +public class FileSystemBackedStorageService extends StorageService { - private Map dataMap = new HashMap<>(); + private final Map dataMap = new HashMap<>(); - public FilySystemBackedStorageService() { + public FileSystemBackedStorageService() { super(null, null); } @@ -44,7 +44,7 @@ public class FilySystemBackedStorageService extends StorageService { public void clearStorage() { this.dataMap.forEach((k, v) -> { - // v.delete(); + v.delete(); }); this.dataMap.clear(); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index 7200b7a7..c74b653e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -134,7 +134,7 @@ public class RedactionIntegrationTest { @Bean @Primary public StorageService inmemoryStorage() { - return new FilySystemBackedStorageService(); + return new FileSystemBackedStorageService(); } } @@ -142,8 +142,8 @@ public class RedactionIntegrationTest { @After public void cleanupStorage() { - if (this.storageService instanceof FilySystemBackedStorageService) { - ((FilySystemBackedStorageService) this.storageService).clearStorage(); + if (this.storageService instanceof FileSystemBackedStorageService) { + ((FileSystemBackedStorageService) this.storageService).clearStorage(); } } @@ -458,16 +458,6 @@ public class RedactionIntegrationTest { assertThat(result).isNotNull(); } - @Test - public void testXXX() { - AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_08_Volume_3CA_B-6_2018-09-06.pdf"); - MemoryStats.printMemoryStats(); - AnalyzeResult result = redactionController.analyze(request); - assertThat(result).isNotNull(); - } - - - @Test public void noExceptionShouldBeThrownForAnyFiles() throws IOException { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java index 8c19e0d6..32fe65ee 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java @@ -2,7 +2,7 @@ package com.iqser.red.service.redaction.v1.server.redaction.service; import com.amazonaws.services.s3.AmazonS3; import com.iqser.red.service.configuration.v1.api.model.*; -import com.iqser.red.service.redaction.v1.server.FilySystemBackedStorageService; +import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService; import com.iqser.red.service.redaction.v1.server.classification.model.Document; import com.iqser.red.service.redaction.v1.server.client.DictionaryClient; import com.iqser.red.service.redaction.v1.server.client.RulesClient; @@ -97,7 +97,7 @@ public class EntityRedactionServiceTest { @Bean @Primary public StorageService inmemoryStorage() { - return new FilySystemBackedStorageService(); + return new FileSystemBackedStorageService(); } }