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 
adding logs for bug investigation
This commit is contained in:
yhampe 2024-12-13 13:19:16 +01:00
parent bdb29a0e35
commit d2994f9e14
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 { try {
var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules())); var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules()));
log.info("result of validation: " + droolsValidation);
droolsValidationResponse = DroolsValidationResponse.builder() droolsValidationResponse = DroolsValidationResponse.builder()
.syntaxErrorMessages(droolsValidation.getSyntaxErrorMessages() .syntaxErrorMessages(droolsValidation.getSyntaxErrorMessages()
.stream() .stream()
@ -99,7 +100,7 @@ public class RuleBuilderController implements RuleBuilderResource {
} catch (Exception e) { } catch (Exception e) {
throw new RulesValidationException("Could not test rules: " + e.getMessage(), 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); 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) .map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
ruleFileBluePrintExisting.setImports(uniqueImports.stream() ruleFileBluePrintExisting.setImports(uniqueImports.stream()
.collect(Collectors.joining(""))); .collect(Collectors.joining("")));
Set<String> uniqueGlobals = Arrays.stream((ruleFileBluePrintExisting.getGlobals() + mergedRuleFileBlueprint.getGlobals()).replaceAll("\n", "").split("import")) Set<String> uniqueGlobals = Arrays.stream((ruleFileBluePrintExisting.getGlobals() + mergedRuleFileBlueprint.getGlobals()).replaceAll("\n", "").split("import"))
.map(String::trim) .map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
ruleFileBluePrintExisting.setGlobals(uniqueGlobals.stream() ruleFileBluePrintExisting.setGlobals(uniqueGlobals.stream()
.collect(Collectors.joining(""))); .collect(Collectors.joining("")));
ruleFileBluePrintExisting.setFunctions(Stream.concat(ruleFileBluePrintExisting.getFunctions() ruleFileBluePrintExisting.setFunctions(Stream.concat(ruleFileBluePrintExisting.getFunctions()
.stream(), .stream(),
mergedRuleFileBlueprint.getFunctions() mergedRuleFileBlueprint.getFunctions()
.stream()) .stream())
.distinct() .distinct()
.toList()); .toList());
ruleFileBluePrintExisting.setDeclarations(Stream.concat(ruleFileBluePrintExisting.getDeclarations() ruleFileBluePrintExisting.setDeclarations(Stream.concat(ruleFileBluePrintExisting.getDeclarations()
.stream(), .stream(),
mergedRuleFileBlueprint.getDeclarations() mergedRuleFileBlueprint.getDeclarations()
.stream()) .stream())
.distinct() .distinct()
.toList()); .toList());
log.info("merged rules: {}", RuleFileFactory.buildRuleString(ruleFileBluePrintExisting, false, false));
return RuleMergingResult.builder() return RuleMergingResult.builder()
.mergedRules(RuleFileFactory.buildRuleString(mergedRuleFileBlueprint, false, false)) .mergedRules(RuleFileFactory.buildRuleString(mergedRuleFileBlueprint, false, false))
.addedGlobalsOffset(mergedRuleFileBlueprint.getGlobals().length()) .addedGlobalsOffset(mergedRuleFileBlueprint.getGlobals().length())