code format, dependecy and test update, logging for reanalysis

redaction-service-v1/pom.xml

@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.2.9</version>
+                <version>1.3.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

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;

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<TextBlock> textBlocks;
+    private List<TextBlock> textBlocks = new ArrayList<>();
 
     private int rowSpanStart;
 
-
     @Override
     public String toString() {
 

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());

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<String, File> dataMap = new HashMap<>();
+    private final Map<String, File> 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();
     }

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) {
+        if (this.storageService instanceof FileSystemBackedStorageService) {
-            ((FilySystemBackedStorageService) this.storageService).clearStorage();
+            ((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 {

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();
         }
 
     }