From 88155dc211e96e5852f66a130fbbb9ea7069d8f8 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 13 Dec 2024 15:27:41 +0100 Subject: [PATCH] RED-9472: seperation of system rules fixed checkstyle --- .../server/rulesmanagement/models/RuleFileBluePrint.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java index 303430c3..420cc936 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java @@ -75,17 +75,14 @@ public class RuleFileBluePrint { Set newGlobals = Arrays.stream(other.getGlobals().split("\n")) .map(String::trim) .filter(line -> !line.isEmpty()) + .map(line -> line.startsWith(GLOBAL_PREFIX) ? line : GLOBAL_PREFIX + line) .collect(Collectors.toCollection(LinkedHashSet::new)); + // Combine globals while maintaining order and format StringBuilder globalsBuilder = new StringBuilder(); Stream.concat(existingGlobals.stream(), newGlobals.stream()) .distinct() - .forEach(global -> { - if (!global.startsWith(GLOBAL_PREFIX)) { - global = GLOBAL_PREFIX + global; - } - globalsBuilder.append(global).append("\n"); - }); + .forEach(globalLine -> globalsBuilder.append(globalLine).append("\n")); this.globals = globalsBuilder.toString().trim(); }