From 1ccf0ab493fcb367a071641e2fea050cf6ad26cf Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Tue, 14 Dec 2021 12:25:21 +0100 Subject: [PATCH] RED-3061: Logic for value matcher for initials expansion rule is inverted --- .../v1/server/redaction/model/Section.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java index 70cc61a2..6b7ed01d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java @@ -187,12 +187,12 @@ public class Section { public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group, - @Argument(ArgumentType.REGEX) String compiledValuePattern) { + @Argument(ArgumentType.REGEX) String valuePattern) { - Pattern compiledWithoutPattern = null; + Pattern compiledValuePattern = null; - if (compiledValuePattern != null) { - compiledWithoutPattern = Patterns.getCompiledPattern(compiledValuePattern, patternCaseInsensitive); + if (valuePattern != null) { + compiledValuePattern = Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive); } Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive); @@ -204,9 +204,9 @@ public class Section { continue; } - if (compiledValuePattern != null) { - Matcher matcherCompiledValuePattern = compiledWithoutPattern.matcher(entity.getWord()); - if (!matcherCompiledValuePattern.matches()) { + if (valuePattern != null) { + Matcher valueMatcher = compiledValuePattern.matcher(entity.getWord()); + if (!valueMatcher.matches()) { continue; } }