WW-5352 Refactor ParametersInterceptor #831
Conversation
kusalk
force-pushed
the
WW-5352-parameter-annotation-2
branch
from
9afea18 to
5c7a6bc
Compare
kusalk
force-pushed
the
WW-5352-parameter-annotation-2
branch
from
5c7a6bc to
8a245e8
Compare
| @@ -32,37 +32,37 @@ public interface AcceptedPatternsChecker { | |||
| * @param value to check | |||
| * @return object containing result of matched pattern and pattern itself | |||
| */ | |||
| public IsAccepted isAccepted(String value); | |||
| @@ -58,7 +58,7 @@ public String getName() { | |||
| @Override | |||
| public String getValue() { | |||
| String[] values = toStringArray(); | |||
| return (values != null && values.length > 0) ? values[0] : null; | |||
There was a problem hiding this comment.
#toStringArray never returns a null value
| @@ -132,138 +133,149 @@ static private int countOGNLCharacters(String s) { | |||
| @Override | |||
| public String doIntercept(ActionInvocation invocation) throws Exception { | |||
There was a problem hiding this comment.
Used early returns to reduce nesting and improve readability
| * <p> | ||
| * In this class this is a no-op, since the parameters were fetched from the same location. | ||
| * In subclasses both retrieveParameters() and addParametersToContext() should be overridden. | ||
| * </p> | ||
| */ | ||
| protected void addParametersToContext(ActionContext ac, Map<String, ?> newParams) { | ||
| } | ||
|
|
||
| protected void setParameters(final Object action, ValueStack stack, HttpParameters parameters) { |
There was a problem hiding this comment.
Extracted a bunch of helper methods to make this method much more readable
| boolean acceptableParamValue = (parameterValueAware == null || parameterValueAware.acceptableParameterValue(param.getValue())); | ||
| if (hasParamValuesToExclude() || hasParamValuesToAccept()) { | ||
| // Additional validations to process | ||
| acceptableParamValue &= acceptableValue(param.getName(), param.getValue()); |
| @@ -338,18 +344,17 @@ protected boolean acceptableName(String name) { | |||
| return false; | |||
| } | |||
| boolean accepted = isWithinLengthLimit(name) && !isExcluded(name) && isAccepted(name); | |||
| if (devMode && accepted) { // notify only when in devMode | |||
There was a problem hiding this comment.
Cleaned out comments for behaviours which are fairly obvious from code
core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java
Outdated
Show resolved
Hide resolved
|
|
@lukaszlenart Any idea how to configure a second base branch for SonarCloud dedicated to 7.x so we don't get wonky results? |
WW-5352
General clean up in preparation for #832