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

RED-5473: fixed output of value placeholder for empty values by adding type of entry

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2022-12-05 14:27:53 +01:00
parent 318882d8c3
commit e7a05a670e
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,19 +384,8 @@ public class ExcelReportGenerationService {
} }
if (placeholder.equals(REDACTION_VALUE_PLACEHOLDER)) { if (placeholder.equals(REDACTION_VALUE_PLACEHOLDER)) {
// return input -> input.getEntry().getValue() != null ? input.getEntry().getValue().replaceAll("\n", " ").replaceAll(" ", " ") : "";
// return input -> input.getEntry().getValue() != null ? input.getEntry().getValue().replaceAll("\n", " ").replaceAll(" ", " ") : computeValueForSignatureRedactions(input);
return input -> input.getEntry().getValue() != null ? input.getEntry().getValue().replaceAll("\n", " ").replaceAll(" ", " ") : input.getEntry().getEntityDisplayName(); return input -> input.getEntry().getValue() != null ? input.getEntry().getValue().replaceAll("\n", " ").replaceAll(" ", " ") : input.getEntry().getEntityDisplayName();
// return input -> {
// String value = "";
// if (input.getEntry().getValue() != null) {
// value = input.getEntry().getValue().replaceAll("\n", " ").replaceAll(" ", " ");
// } else {
// value = computeValueForSignatureRedactions(input);
// }
// return value;
// };
} }
if (placeholder.equals(REDACTION_ENTITY_DISPLAY_NAME_PLACEHOLDER)) { if (placeholder.equals(REDACTION_ENTITY_DISPLAY_NAME_PLACEHOLDER)) {
return input -> input.getEntry().getEntityDisplayName(); return input -> input.getEntry().getEntityDisplayName();
@ -404,12 +393,6 @@ public class ExcelReportGenerationService {
return input -> ""; return input -> "";
} }
// private String computeValueForSignatureRedactions(PlaceholderInput input) {
//
// System.out.println(input.getEntry().getEntityDisplayName());
// return input.getEntry().getEntityDisplayName();
// }
private void replacePlaceholdersForCell(Cell cell, String search, String replace) { private void replacePlaceholdersForCell(Cell cell, String search, String replace) {

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

@ -36,7 +36,7 @@ public class IuclidFunctionService {
ReportRedactionEntry entry = iterator.next(); ReportRedactionEntry entry = iterator.next();
s.append("P").append(entry.getPage()).append(" "); s.append("P").append(entry.getPage()).append(" ");
if (StringUtils.isBlank(entry.getValue()) || entry.getValue().equalsIgnoreCase("Rectangle")) { if (StringUtils.isBlank(entry.getValue()) || entry.getValue().equalsIgnoreCase("Rectangle")) {
s.append("non-readable content"); s.append(entry.getEntityDisplayName()).append(" - non-readable content");
} else { } else {
s.append(entry.getValue().replaceAll("\n", " ").replaceAll(" ", " ")); s.append(entry.getValue().replaceAll("\n", " ").replaceAll(" ", " "));
} }