From f22a7c450eb0c3af3ae238e2bb0bb607c52b9a7d Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 13 Dec 2024 13:19:16 +0100 Subject: [PATCH] RED-9472: seperation of system rules adding logs for bug investigation --- .../controller/RuleBuilderController.java | 3 ++- .../v1/server/service/RuleBuilderService.java | 25 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java index 8c452b07..7d0957b9 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java @@ -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); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RuleBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RuleBuilderService.java index e4d023a2..d3a7352e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RuleBuilderService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RuleBuilderService.java @@ -69,25 +69,24 @@ public class RuleBuilderService { .map(String::trim) .collect(Collectors.toSet()); ruleFileBluePrintExisting.setImports(uniqueImports.stream() - .collect(Collectors.joining(""))); + .collect(Collectors.joining(""))); Set 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())