Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-2841: INC6207970 Rule for initials expansion should be applied only to dictionary entries without whitespaces

Browse Source
This commit is contained in:
aoezyetimoglu 2021-12-07 13:04:10 +01:00
parent 8d881d4ca6
commit 7198e1ae50
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
View File

@ -142,18 +142,18 @@ public class Section {
@ThenAction
public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
@Argument(ArgumentType.REGEX) String pattern,
@Argument(ArgumentType.REGEX) String suffixPattern,
@Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
@Argument(ArgumentType.INTEGER) int group,
@Argument(ArgumentType.REGEX) String withoutPattern) {
@Argument(ArgumentType.REGEX) String compiledValuePattern) {
Pattern compiledWithoutPattern = null;
Pattern compiledValuePat = null;
if (withoutPattern != null) {
compiledWithoutPattern = Patterns.getCompiledPattern(withoutPattern, patternCaseInsensitive);
if (compiledValuePattern != null) {
compiledValuePat = Patterns.getCompiledPattern(compiledValuePattern, patternCaseInsensitive);
}
Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
Set<Entity> expanded = new HashSet<>();
for (Entity entity : entities) {
@ -162,9 +162,9 @@ public class Section {
continue;
}
if(withoutPattern != null) {
Matcher matcherWithout = compiledWithoutPattern.matcher(entity.getWord());
if (matcherWithout.find()) {
if(compiledValuePattern != null) {
Matcher matcherCompiledValuePattern = compiledValuePat.matcher(entity.getWord());
if (!matcherCompiledValuePattern.find()) {
continue;
}
}