This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5065-append-or-not-cherry-pick
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 40c60da5a055f1d000d991abac64b3eb25a44c54
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Apr 24 09:32:50 2020 +0200
WW-5065 Cleans up code and marks old constructor as deprecated
---
.../xwork2/config/impl/AbstractMatcher.java | 36 +++++++++++++---------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
b/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
index d170c03..7fe4254 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
@@ -40,11 +40,6 @@ public abstract class AbstractMatcher<E> implements
Serializable {
private static final Logger LOG =
LogManager.getLogger(AbstractMatcher.class);
/**
- * <p> The logging instance </p>
- */
- private static final Logger log =
LogManager.getLogger(AbstractMatcher.class);
-
- /**
* <p> Handles all wildcard pattern matching. </p>
*/
PatternMatcher<Object> wildcard;
@@ -73,6 +68,17 @@ public abstract class AbstractMatcher<E> implements
Serializable {
}
/**
+ * Creates a matcher with {@link #appendNamedParameters} set to true to
keep backward compatibility
+ *
+ * @param helper an instance of {@link PatternMatcher}
+ * @deprecated use @{link {@link AbstractMatcher(PatternMatcher, boolean)}
instead
+ */
+ @Deprecated
+ public AbstractMatcher(PatternMatcher<?> helper) {
+ this(helper, true);
+ }
+
+ /**
* <p>
* Finds and precompiles the wildcard patterns. Patterns will be evaluated
* in the order they were added. Only patterns that actually contain a
@@ -100,17 +106,17 @@ public abstract class AbstractMatcher<E> implements
Serializable {
name = name.substring(1);
}
- log.debug("Compiling pattern '{}'", name);
+ LOG.debug("Compiling pattern '{}'", name);
pattern = wildcard.compilePattern(name);
- compiledPatterns.add(new Mapping<E>(name, pattern, target));
+ compiledPatterns.add(new Mapping<>(name, pattern, target));
if (looseMatch) {
int lastStar = name.lastIndexOf('*');
if (lastStar > 1 && lastStar == name.length() - 1) {
if (name.charAt(lastStar - 1) != '*') {
pattern = wildcard.compilePattern(name.substring(0,
lastStar - 1));
- compiledPatterns.add(new Mapping<E>(name, pattern,
target));
+ compiledPatterns.add(new Mapping<>(name, pattern,
target));
}
}
}
@@ -131,12 +137,12 @@ public abstract class AbstractMatcher<E> implements
Serializable {
E config = null;
if (compiledPatterns.size() > 0) {
- log.debug("Attempting to match '{}' to a wildcard pattern, {}
available", potentialMatch, compiledPatterns.size());
+ LOG.debug("Attempting to match '{}' to a wildcard pattern, {}
available", potentialMatch, compiledPatterns.size());
- Map<String,String> vars = new LinkedHashMap<String,String>();
+ Map<String,String> vars = new LinkedHashMap<>();
for (Mapping<E> m : compiledPatterns) {
if (wildcard.match(vars, potentialMatch, m.getPattern())) {
- log.debug("Value matches pattern '{}'",
m.getOriginalPattern());
+ LOG.debug("Value matches pattern '{}'",
m.getOriginalPattern());
config = convert(potentialMatch, m.getTarget(), vars);
break;
}
@@ -211,7 +217,7 @@ public abstract class AbstractMatcher<E> implements
Serializable {
c = val.charAt(x);
if (x < len - 2 &&
c == '{' && '}' == val.charAt(x+2)) {
- varVal = (String)vars.get(String.valueOf(val.charAt(x + 1)));
+ varVal = vars.get(String.valueOf(val.charAt(x + 1)));
if (varVal != null) {
ret.append(varVal);
}
@@ -232,18 +238,18 @@ public abstract class AbstractMatcher<E> implements
Serializable {
/**
* <p> The original pattern. </p>
*/
- private String original;
+ private final String original;
/**
* <p> The compiled pattern. </p>
*/
- private Object pattern;
+ private final Object pattern;
/**
* <p> The original object. </p>
*/
- private E config;
+ private final E config;
/**
* <p> Contructs a read-only Mapping instance. </p>
