dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EDQS - ignore case for name and not ignore for filters

Browse Source
This commit is contained in:
Volodymyr Babak 2025-06-17 17:32:04 +03:00
parent 969b0fec00
commit b0a8b9fc25
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/edqs/src/main/java/org/thingsboard/server/edqs/util/RepositoryUtils.java
View File

@ -324,14 +324,19 @@ public class RepositoryUtils {
public static Pattern toEntityNameSqlLikePattern(String filter) { public static Pattern toEntityNameSqlLikePattern(String filter) {
if (StringUtils.isNotBlank(filter)) { if (StringUtils.isNotBlank(filter)) {
return toSqlLikePattern(filter, "", ".*"); return toSqlLikePattern(filter, "", ".*", true);
} }
return null; return null;
} }
private static Pattern toSqlLikePattern(String value, String prefix, String suffix) { private static Pattern toSqlLikePattern(String value, String prefix, String suffix) {
return toSqlLikePattern(value, prefix, suffix, false);
}
private static Pattern toSqlLikePattern(String value, String prefix, String suffix, boolean ignoreCase) {
String regexValue;
if (value.contains("%") || value.contains("_")) { if (value.contains("%") || value.contains("_")) {
String regexValue = value regexValue = value
.replace("_", ".") .replace("_", ".")
.replace("%", ".*"); .replace("%", ".*");
if ("^".equals(prefix)) { if ("^".equals(prefix)) {
@ -339,10 +344,10 @@ public class RepositoryUtils {
} else if ("$".equals(suffix)) { } else if ("$".equals(suffix)) {
regexValue = (regexValue.startsWith(".*") ? "" : ".*") + regexValue + "$"; regexValue = (regexValue.startsWith(".*") ? "" : ".*") + regexValue + "$";
} }
return Pattern.compile(regexValue, Pattern.CASE_INSENSITIVE);
} else { } else {
return Pattern.compile(prefix + Pattern.quote(value) + suffix, Pattern.CASE_INSENSITIVE); regexValue = prefix + Pattern.quote(value) + suffix;
} }
return ignoreCase ? Pattern.compile(regexValue, Pattern.CASE_INSENSITIVE) : Pattern.compile(regexValue);
} }
@FunctionalInterface @FunctionalInterface