Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6036 

Slight refactoring to make the WildcardFinder class use a static method
so that we don't have to allocate throw away objects that will
immediately be garbage collected.
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-02-04 16:53:02 +00:00
parent 5eeb62a6be
commit 33dded13df
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
View File

@ -169,7 +169,7 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
static boolean hasWildcards(String selector) {
return new WildcardFinder(selector).hasWildcards();
return WildcardFinder.hasWildcards(selector);
}
@Override
@ -317,17 +317,16 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
Pattern.CASE_INSENSITIVE);
private static final String REGEX_SPECIAL = ".+?*(){}[]\\-";
private final Matcher matcher;
WildcardFinder(String selector) {
this.matcher = LIKE_PATTERN.matcher(selector);
}
private String getLike() {
private static String getLike(final Matcher matcher) {
return matcher.group("like");
}
private String getEscape() {
private static boolean hasLikeOperator(final Matcher matcher) {
return matcher.find();
}
private static String getEscape(final Matcher matcher) {
String escapeChar = matcher.group("escape");
if (escapeChar == null) {
return null;
@ -337,21 +336,19 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
return escapeChar;
}
private boolean hasLikeOperator() {
return matcher.find();
}
boolean hasWildcardInCurrentMatch() {
private static boolean hasWildcardInCurrentMatch(final Matcher matcher) {
String wildcards = "[_%]";
if (getEscape() != null) {
wildcards = "(^|[^" + getEscape() + "])" + wildcards;
if (getEscape(matcher) != null) {
wildcards = "(^|[^" + getEscape(matcher) + "])" + wildcards;
}
return Pattern.compile(wildcards).matcher(getLike()).find();
return Pattern.compile(wildcards).matcher(getLike(matcher)).find();
}
public boolean hasWildcards() {
while(hasLikeOperator()) {
if (hasWildcardInCurrentMatch())
public static boolean hasWildcards(String selector) {
Matcher matcher = LIKE_PATTERN.matcher(selector);
while(hasLikeOperator(matcher)) {
if (hasWildcardInCurrentMatch(matcher))
return true;
}
return false;