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

Resolve RED-9472 "Feature/" #537

Open
yannik.hampe wants to merge 113 commits from feature/RED-9472 into master
pull from: feature/RED-9472
merge into: Marmelator:master
Conversation 119 Commits 113 Files Changed 78 +1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a011a93fd2 - Show all commits

1
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RuleBuilderService.java
View File

@ -86,6 +86,7 @@ public class RuleBuilderService {
.stream())
.distinct()
.toList());
log.info("merged rules: {}", RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false));
return RuleMergingResult.builder()
.mergedRules(RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false))
.addedGlobalsOffset(ruleFileBluePrintExisting.getGlobals().length())