You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/11/10 19:14:13 UTC
struts git commit: WW-4710 Restrict access to HttpParameters.toMap
Repository: struts
Updated Branches:
refs/heads/master 70400f4a0 -> ab6750211
WW-4710 Restrict access to HttpParameters.toMap
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ab675021
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ab675021
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ab675021
Branch: refs/heads/master
Commit: ab6750211ba8fc99bffdc156d3bb8f61031ed13d
Parents: 70400f4
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Nov 10 20:13:09 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Nov 10 20:13:09 2016 +0100
----------------------------------------------------------------------
.../org/apache/struts2/dispatcher/HttpParameters.java | 12 ++++++++++++
.../struts2/interceptor/ServletConfigInterceptor.java | 2 +-
.../interceptor/ServletConfigInterceptorTest.java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ab675021/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
index f22be0d..360bb8f 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -1,5 +1,7 @@
package org.apache.struts2.dispatcher;
+import org.apache.struts2.interceptor.ParameterAware;
+
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -53,6 +55,12 @@ public class HttpParameters implements Cloneable {
return parameters.containsKey(name);
}
+ /**
+ * Access to this method will be restricted with the next versiob
+ * @deprecated since 2.5.6, do not use it
+ * TODO: reduce access level to `private`
+ */
+ @Deprecated
public Map<String, String[]> toMap() {
Map<String, String[]> result = new HashMap<>(parameters.size());
for (Map.Entry<String, Parameter> entry : parameters.entrySet()) {
@@ -66,6 +74,10 @@ public class HttpParameters implements Cloneable {
return this;
}
+ public void applyParameters(ParameterAware parameterAware) {
+ parameterAware.setParameters(toMap());
+ }
+
public static class Builder {
private Map<String, Object> requestParameterMap;
private HttpParameters parent;
http://git-wip-us.apache.org/repos/asf/struts/blob/ab675021/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
index 5f1abf8..bd93823 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
@@ -138,7 +138,7 @@ public class ServletConfigInterceptor extends AbstractInterceptor implements Str
}
if (action instanceof ParameterAware) {
- ((ParameterAware) action).setParameters(context.getParameters().toMap());
+ context.getParameters().applyParameters((ParameterAware) action);
}
if (action instanceof HttpParametersAware) {
http://git-wip-us.apache.org/repos/asf/struts/blob/ab675021/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
index fca80f7..c92877c 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
@@ -91,7 +91,7 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase {
HttpParameters param = HttpParameters.create().build();
mai.getInvocationContext().setParameters(param);
- mock.setParameters(param.toMap());
+ param.applyParameters(mock);
expectLastCall().times(1);
replay(mock);