treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-843

Browse source
This commit is contained in:
Aleksey Kulikov 2025-05-21 19:08:55 +03:00
parent 86b832d03c
commit d5349a6e5e
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/ValidateSymbolsRule.java
View file

@ -103,26 +103,28 @@ public final class ValidateSymbolsRule<R> implements IValidationRule<ImdgValidat
String forHash = validationSymbols.stream().map(ValidationSymbols::getSymbols).collect(Collectors.joining()); String forHash = validationSymbols.stream().map(ValidationSymbols::getSymbols).collect(Collectors.joining());
Integer hash = forHash.hashCode(); Integer hash = forHash.hashCode();
if (!Objects.equals(allowedSymbolsHash.get(), hash)) { if (!Objects.equals(allowedSymbolsHash.get(), hash)) {
Matcher matcher = rangePattern.matcher(forHash); for (ValidationSymbols symbols : validationSymbols) {
Set<Character> currAllowedSymbols = new HashSet<>(); Matcher matcher = rangePattern.matcher(symbols.getSymbols());
while (matcher.find()) { Set<Character> currAllowedSymbols = new HashSet<>();
String part = matcher.group(); while (matcher.find()) {
if (part.length() == 3 && part.charAt(1) == '-') { String part = matcher.group();
char start = part.charAt(0); if (part.length() == 3 && part.charAt(1) == '-') {
char end = part.charAt(2); char start = part.charAt(0);
if (start > end) { char end = part.charAt(2);
log.warn("Invalid character range: {}, skipped", part); if (start > end) {
continue; log.warn("Invalid character range: {}, skipped", part);
continue;
}
for (char c = start; c <= end; c++) {
currAllowedSymbols.add(c);
}
} else {
currAllowedSymbols.add(part.charAt(0));
} }
for (char c = start; c <= end; c++) {
currAllowedSymbols.add(c);
}
} else {
currAllowedSymbols.add(part.charAt(0));
} }
allowedSymbols.set(currAllowedSymbols);
allowedSymbolsHash.set(hash);
} }
allowedSymbols.set(currAllowedSymbols);
allowedSymbolsHash.set(hash);
} }
} }