From a767df39d37512fc7d51aac915cff7e5e97d325a Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 13 Nov 2024 11:38:37 +0100 Subject: [PATCH] RED-9472: seperation of system rules pmd fix --- .../service/drools/RuleCompilationResultParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/RuleCompilationResultParser.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/RuleCompilationResultParser.java index 65ad8cad..8e8ae2e3 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/RuleCompilationResultParser.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/RuleCompilationResultParser.java @@ -32,8 +32,12 @@ import lombok.experimental.UtilityClass; public class RuleCompilationResultParser { private final static Pattern ruleIdentifierInCodeFinder = Pattern.compile( - "\\b(?:redact|apply|skip|remove|ignore|applyWithLineBreaks|applyWithReferences|skipWithReferences)\\s*\\(\\s*\"([a-zA-Z0-9]+.\\d+.\\d+)\"\\s*,\\s*.*(?:\\s*,\\s*.*)\\s*?\\)"); - + "\\b(?:redact|apply|skip|remove|ignore|applyWithLineBreaks|applyWithReferences|skipWithReferences)" + + "\\s*\\(\\s*" + + "\"([a-zA-Z0-9]+\\.\\d+\\.\\d+)\"" + + "\\s*,\\s*[^,\\)]*(?:\\s*,\\s*[^,\\)]*)*" + + "\\s*\\)" + ); @SneakyThrows public RuleCompilationResult buildRuleCompilationResultFromRuleString(String ruleString, boolean removedImports) {