Skip to content

Clean up ConfigurerImpl: replace MatcherHolder with immutable PatternHolder #2956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnodet wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −37
Open

Clean up ConfigurerImpl: replace MatcherHolder with immutable PatternHolder #2956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 20 additions & 37 deletions core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

Expand Down Expand Up @@ -58,24 +57,15 @@ public class ConfigurerImpl extends BeanConfigurerSupport
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurerImpl.class);

private Set<ApplicationContext> appContexts;
private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions = new TreeMap<>();
private final Map<String, List<PatternHolder>> wildCardBeanDefinitions = new HashMap<>();
private BeanFactory beanFactory;

@SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable")
static class MatcherHolder implements Comparable<MatcherHolder> {
Matcher matcher;
String wildCardId;
MatcherHolder(String orig, Matcher matcher) {
wildCardId = orig;
this.matcher = matcher;
}

@Override
public int compareTo(MatcherHolder mh) {
int literalCharsLen1 = this.wildCardId.replace("*", "").length();
int literalCharsLen2 = mh.wildCardId.replace("*", "").length();
// The expression with more literal characters should end up on the top of the list
return Integer.compare(literalCharsLen1, literalCharsLen2) * -1;
static class PatternHolder {
final Pattern pattern;
final String wildCardId;
PatternHolder(String orig, Pattern pattern) {
this.wildCardId = orig;
this.pattern = pattern;
}
}

Expand Down Expand Up @@ -106,16 +96,12 @@ private void initWildcardDefinitionMap() {
final String name = n.charAt(0) != '*' ? n
: "." + n.replaceAll("\\.", "\\."); //old wildcard
try {
Matcher matcher = Pattern.compile(name).matcher("");
List<MatcherHolder> m = wildCardBeanDefinitions.get(className);
if (m == null) {
m = new ArrayList<>();
wildCardBeanDefinitions.put(className, m);
}
MatcherHolder holder = new MatcherHolder(n, matcher);
m.add(holder);
Pattern pattern = Pattern.compile(name);
wildCardBeanDefinitions
.computeIfAbsent(className, k -> new ArrayList<>())
.add(new PatternHolder(n, pattern));
} catch (PatternSyntaxException npe) {
//not a valid patter, we'll ignore
//not a valid pattern, we'll ignore
}
} else {
LogUtils.log(LOG, Level.WARNING, "WILDCARD_BEAN_ID_WITH_NO_CLASS_MSG", n);
Expand Down Expand Up @@ -192,15 +178,12 @@ private void configureWithWildCard(String bn, Object beanInstance) {
Class<?> clazz = beanInstance.getClass();
while (!Object.class.equals(clazz)) {
String className = clazz.getName();
List<MatcherHolder> matchers = wildCardBeanDefinitions.get(className);
if (matchers != null) {
for (MatcherHolder m : matchers) {
synchronized (m.matcher) {
m.matcher.reset(bn);
if (m.matcher.matches()) {
configureBean(m.wildCardId, beanInstance, false);
return;
}
List<PatternHolder> patterns = wildCardBeanDefinitions.get(className);
if (patterns != null) {
for (PatternHolder p : patterns) {
if (p.pattern.matcher(bn).matches()) {
configureBean(p.wildCardId, beanInstance, false);
return;
}
}
}
Expand All @@ -209,7 +192,7 @@ private void configureWithWildCard(String bn, Object beanInstance) {
}
}

private boolean isWildcardBeanName(String bn) {
private static boolean isWildcardBeanName(String bn) {
return bn.indexOf('*') != -1 || bn.indexOf('?') != -1
|| (bn.indexOf('(') != -1 && bn.indexOf(')') != -1);
}
Expand Down