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

code format, dependecy and test update, logging for reanalysis

Browse Source
This commit is contained in:
Timo 2021-04-20 10:26:27 +03:00
parent 1d4708ad13
commit ba28a3e0d3
7 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/pom.xml
View File

@ -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>

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java
View File

@ -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;

12
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java
View File

@ -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() {

1
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java
View File

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

8
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FilySystemBackedStorageService.java → redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java
View File

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

16
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
View File

@ -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 {

4
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java
View File

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