From d466d9b0328d04967b9026a45ff57d49b7f89ec6 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 26 Nov 2020 12:09:19 +0100 Subject: [PATCH] Rename sponsor dictionary to CBI_sponsor --- .../service/redaction/v1/server/RedactionIntegrationTest.java | 4 ++-- .../server/redaction/service/EntityRedactionServiceTest.java | 4 ++-- .../resources/dictionaries/{sponsor.txt => CBI_sponsor.txt} | 0 .../src/test/resources/drools/rules.drl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/{sponsor.txt => CBI_sponsor.txt} (100%) 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 69ddf7fb..02883207 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 @@ -69,7 +69,7 @@ public class RedactionIntegrationTest { private static final String VERTEBRATE = "vertebrate"; private static final String ADDRESS = "CBI_address"; private static final String AUTHOR = "CBI_author"; - private static final String SPONSOR = "sponsor"; + private static final String SPONSOR = "CBI_sponsor"; private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator"; private static final String REDACTION_INDICATOR = "redaction_indicator"; private static final String HINT_ONLY = "hint_only"; @@ -149,7 +149,7 @@ public class RedactionIntegrationTest { .map(this::cleanDictionaryEntry) .collect(Collectors.toSet())); dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>()) - .addAll(ResourceLoader.load("dictionaries/sponsor.txt") + .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt") .stream() .map(this::cleanDictionaryEntry) .collect(Collectors.toSet())); 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 03fd0be9..0d9cf1ab 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 @@ -230,7 +230,7 @@ public class EntityRedactionServiceTest { .build(); when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse); DictionaryResponse sponsorResponse = DictionaryResponse.builder() - .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt"))) + .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))) .build(); when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse); try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) { @@ -340,7 +340,7 @@ public class EntityRedactionServiceTest { .build(); when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse); DictionaryResponse dictionaryResponse = DictionaryResponse.builder() - .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt"))) + .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))) .build(); when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse); try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/sponsor.txt b/redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_sponsor.txt similarity index 100% rename from redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/sponsor.txt rename to redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_sponsor.txt diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl index c8908bd7..30380f9f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl @@ -85,7 +85,7 @@ rule "9: Redact sponsor company" when Section(searchText.toLowerCase().contains("batches produced at")) then - section.redactIfPrecededBy("batches produced at", "sponsor", 9, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)"); + section.redactIfPrecededBy("batches produced at", "CBI_sponsor", 9, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)"); section.addHintAnnotation("batches produced at", "must_redact"); end