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

RED-9472: seperation of system rules

Browse Source 
fixed checkstyle
This commit is contained in:
yhampe 2024-12-13 15:27:41 +01:00
parent 9cb19fb0f7
commit 88155dc211
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java
View File

@ -75,17 +75,14 @@ public class RuleFileBluePrint {
Set<String> newGlobals = Arrays.stream(other.getGlobals().split("\n")) Set<String> newGlobals = Arrays.stream(other.getGlobals().split("\n"))
.map(String::trim) .map(String::trim)
.filter(line -> !line.isEmpty()) .filter(line -> !line.isEmpty())
.map(line -> line.startsWith(GLOBAL_PREFIX) ? line : GLOBAL_PREFIX + line)
.collect(Collectors.toCollection(LinkedHashSet::new)); .collect(Collectors.toCollection(LinkedHashSet::new));
// Combine globals while maintaining order and format
StringBuilder globalsBuilder = new StringBuilder(); StringBuilder globalsBuilder = new StringBuilder();
Stream.concat(existingGlobals.stream(), newGlobals.stream()) Stream.concat(existingGlobals.stream(), newGlobals.stream())
.distinct() .distinct()
.forEach(global -> { .forEach(globalLine -> globalsBuilder.append(globalLine).append("\n"));
if (!global.startsWith(GLOBAL_PREFIX)) {
global = GLOBAL_PREFIX + global;
}
globalsBuilder.append(global).append("\n");
});
this.globals = globalsBuilder.toString().trim(); this.globals = globalsBuilder.toString().trim();
} }