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 +14 -14
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f22a7c450e - Show all commits

3
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
View File

@ -63,6 +63,7 @@ public class RuleBuilderController implements RuleBuilderResource {
}
try {
var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules()));
log.info("result of validation: " + droolsValidation);
droolsValidationResponse = DroolsValidationResponse.builder()
.syntaxErrorMessages(droolsValidation.getSyntaxErrorMessages()
.stream()
@ -99,7 +100,7 @@ public class RuleBuilderController implements RuleBuilderResource {
} catch (Exception e) {
throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
}
log.info("result after validation: {}",rulesUpdateRequest);
log.info("result after validation: {}", rulesUpdateRequest);
return new ResponseEntity<>(rulesUploadResponse, HttpStatus.OK);
}

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

@ -69,25 +69,24 @@ public class RuleBuilderService {
.map(String::trim)
.collect(Collectors.toSet());
ruleFileBluePrintExisting.setImports(uniqueImports.stream()
.collect(Collectors.joining("")));
.collect(Collectors.joining("")));
Set<String> uniqueGlobals = Arrays.stream((ruleFileBluePrintExisting.getGlobals() + mergedRuleFileBlueprint.getGlobals()).replaceAll("\n", "").split("import"))
.map(String::trim)
.collect(Collectors.toSet());
ruleFileBluePrintExisting.setGlobals(uniqueGlobals.stream()
.collect(Collectors.joining("")));
.collect(Collectors.joining("")));
ruleFileBluePrintExisting.setFunctions(Stream.concat(ruleFileBluePrintExisting.getFunctions()
.stream(),
mergedRuleFileBlueprint.getFunctions()
.stream())
.distinct()
.toList());
.stream(),
mergedRuleFileBlueprint.getFunctions()
.stream())
.distinct()
.toList());
ruleFileBluePrintExisting.setDeclarations(Stream.concat(ruleFileBluePrintExisting.getDeclarations()
.stream(),
mergedRuleFileBlueprint.getDeclarations()
.stream())
.distinct()
.toList());
log.info("merged rules: {}", RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false));
.stream(),
mergedRuleFileBlueprint.getDeclarations()
.stream())
.distinct()
.toList());
return RuleMergingResult.builder()
.mergedRules(RuleFileFactory.buildRuleString(mergedRuleFileBlueprint, false, false))
.addedGlobalsOffset(mergedRuleFileBlueprint.getGlobals().length())