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
This commit is contained in:
yhampe 2024-10-21 10:33:52 +02:00
parent 848de2bc4f
commit d497c3689f
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.Assert;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iqser.red.service.redaction.v1.model.RuleBuilderModel; import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
@ -61,6 +61,14 @@ public class RuleBuilderService {
log.info("starting to merge user rules update with system rules"); log.info("starting to merge user rules update with system rules");
RuleFileBluePrint ruleFileBluePrintExisting = RuleFileParser.buildBluePrintFromRulesString(existingRules); RuleFileBluePrint ruleFileBluePrintExisting = RuleFileParser.buildBluePrintFromRulesString(existingRules);
RuleFileBluePrint mergedRuleFileBlueprint = RuleFileParser.buildBluePrintFromRulesString(userUpdatedRules, true); RuleFileBluePrint mergedRuleFileBlueprint = RuleFileParser.buildBluePrintFromRulesString(userUpdatedRules, true);
mergedRuleFileBlueprint.getRuleClasses()
.forEach(ruleClass -> {
if (systemRules.stream()
.map(RuleType::name)
.toList().contains(ruleClass.ruleType().name())) {
throw new RuntimeException("No system rule updates allowed in user rule update.");
}
});
removeAllRulesExceptSystemRulesAndCheck(ruleFileBluePrintExisting); removeAllRulesExceptSystemRulesAndCheck(ruleFileBluePrintExisting);
ruleFileBluePrintExisting.getRuleClasses() ruleFileBluePrintExisting.getRuleClasses()
.stream() .stream()
@ -71,6 +79,16 @@ public class RuleBuilderService {
.forEach(mergedRuleFileBlueprint::addRule); .forEach(mergedRuleFileBlueprint::addRule);
mergedRuleFileBlueprint.setImports(ruleFileBluePrintExisting.getImports() + mergedRuleFileBlueprint.getImports()); mergedRuleFileBlueprint.setImports(ruleFileBluePrintExisting.getImports() + mergedRuleFileBlueprint.getImports());
mergedRuleFileBlueprint.setGlobals(ruleFileBluePrintExisting.getGlobals() + mergedRuleFileBlueprint.getGlobals()); mergedRuleFileBlueprint.setGlobals(ruleFileBluePrintExisting.getGlobals() + mergedRuleFileBlueprint.getGlobals());
mergedRuleFileBlueprint.setFunctions(Stream.concat(ruleFileBluePrintExisting.getFunctions()
.stream(),
mergedRuleFileBlueprint.getFunctions()
.stream())
.toList());
mergedRuleFileBlueprint.setDeclarations(Stream.concat(ruleFileBluePrintExisting.getDeclarations()
.stream(),
mergedRuleFileBlueprint.getDeclarations()
.stream())
.toList());
log.info("finished merging user rules update with system rules"); log.info("finished merging user rules update with system rules");
RuleMergingResult mergingResult = RuleMergingResult.builder() RuleMergingResult mergingResult = RuleMergingResult.builder()
.mergedRules(RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false)) .mergedRules(RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false))
@ -89,7 +107,11 @@ public class RuleBuilderService {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
removeAllRulesExceptSystemRules(ruleFileBluePrint); removeAllRulesExceptSystemRules(ruleFileBluePrint);
ruleFileBluePrint.getRuleClasses() ruleFileBluePrint.getRuleClasses()
.forEach(ruleClass -> Assert.assertTrue("there was an error removing all rules except system rules", systemRuleNames.contains(ruleClass.ruleType().name()))); .forEach(ruleClass -> {
if (systemRuleNames.contains(ruleClass.ruleType().name())) {
throw new RuntimeException("there was an error removing all rules except system rules");
}
});
} }
@ -122,7 +144,9 @@ public class RuleBuilderService {
.ifPresent(ruleClass -> ruleClass.ruleUnits() .ifPresent(ruleClass -> ruleClass.ruleUnits()
.stream() .stream()
.forEach(remainingSystemRules::add)); .forEach(remainingSystemRules::add));
Assert.assertTrue("There was an error removing the system rules from the file", remainingSystemRules.isEmpty()); if (!remainingSystemRules.isEmpty()) {
throw new RuntimeException("There was an error removing the system rules from the file");
}
} }
} }