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

Fix NPE for empty cells

Browse Source
This commit is contained in:
Thierry Göckel 2020-08-13 11:02:09 +02:00
parent 5542a97a38
commit a151a13b4c
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
View File

@ -120,7 +120,12 @@ public class EntityRedactionService {
} }
Map<String, String> result = new HashMap<>(); Map<String, String> result = new HashMap<>();
for (int i = 0; i < keys.size(); i++) { for (int i = 0; i < keys.size(); i++) {
result.put(keys.get(i), values.get(i)); String value = values.get(i);
if (value == null) {
log.warn("Drools does not support null values.");
continue;
}
result.put(keys.get(i), value);
} }
return result; return result;

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

@ -262,8 +262,7 @@ public class RedactionIntegrationTest {
public void redactionTest() throws IOException { public void redactionTest() throws IOException {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S" + ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_21_Volume_3CP_A9396G_B-9_2018-09-06.pdf");
"-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
RedactionRequest request = RedactionRequest.builder() RedactionRequest request = RedactionRequest.builder()
.document(IOUtils.toByteArray(pdfFileResource.getInputStream())) .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))

2
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
View File

@ -101,7 +101,7 @@ rule "8: Redact contact information, if Producer is found"
rule "9: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study" rule "9: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study"
when when
Section(tabularData != null && tabularData.size() > 0 Section(tabularData != null
&& tabularData.containsKey("Vertebrate study Y/N") && tabularData.containsKey("Vertebrate study Y/N")
&& tabularData.get("Vertebrate study Y/N").equals("Y") && tabularData.get("Vertebrate study Y/N").equals("Y")
) )