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

Pull request #107: RED-2817

Browse Source 
Merge in RED/redaction-report-service from RED-2817-rrs1 to master

* commit 'dbf23750b318747f7368ed4e46649331c6e0f23f':
  RED-2817 Redactions with new-line included in IUCLID-Report too
This commit is contained in:
Ali Oezyetimoglu 2021-11-22 08:58:08 +01:00
commit aface67e13
3 changed files with 8445 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java
View File

@ -37,7 +37,7 @@ public class IuclidFunctionService {
if(StringUtils.isBlank(entry.getValue()) || entry.getValue().equalsIgnoreCase("Rectangle")) {
s.append("non-readable content");
} else {
s.append(entry.getValue());
s.append(entry.getValue().replaceAll("\n", " ").replaceAll(" ", " "));
}
if (iterator.hasNext()) {
s.append(", ");

2
redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
View File

@ -423,7 +423,7 @@ public class RedactionReportIntegrationTest {
public void testIuclidReport() {
String dossierTemplateId = "dossierTemplateId";
ClassPathResource redactionLogResource = new ClassPathResource("files/redaction-log.json");
ClassPathResource redactionLogResource = new ClassPathResource("files/redactionLog2817.json");
RedactionLog redactionLog = objectMapper.readValue(redactionLogResource.getInputStream(), RedactionLog.class);

8443
redaction-report-service-v1/redaction-report-service-server-v1/src/test/resources/files/redactionLog2817.json Normal file
View File

File diff suppressed because it is too large Load Diff