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/10/07 08:14:04 UTC
[1/3] struts git commit: WW-4572 Fixes issue with file upload
Repository: struts
Updated Branches:
refs/heads/master 7cd3d30fd -> 1bd9bde61
WW-4572 Fixes issue with file upload
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/69da41eb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/69da41eb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/69da41eb
Branch: refs/heads/master
Commit: 69da41eb793ad31a6c076e109dbfa6dd1b5a1cd5
Parents: 7cd3d30
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Oct 7 10:05:38 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Oct 7 10:05:38 2016 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptor.java | 4 +++-
.../org/apache/struts2/dispatcher/HttpParameters.java | 9 +++++----
.../java/org/apache/struts2/dispatcher/Parameter.java | 8 ++++++++
.../apache/struts2/interceptor/CheckboxInterceptor.java | 6 +++---
.../struts2/interceptor/DateTextFieldInterceptor.java | 6 +++---
.../struts2/interceptor/FileUploadInterceptor.java | 11 ++++++-----
.../struts2/interceptor/MultiselectInterceptor.java | 7 ++++---
.../src/main/java/org/apache/struts2/JSPRuntime.java | 10 +++++++---
8 files changed, 39 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 07bb9df..4c94b6b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -203,7 +203,9 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
String name = entry.getKey();
Parameter value = entry.getValue();
try {
- if (value.isMultiple()) {
+ if (value instanceof Parameter.File) {
+ newStack.setParameter(name, value.getObject());
+ } else if (value.isMultiple()) {
newStack.setParameter(name, value.getMultipleValues());
} else {
newStack.setParameter(name, value.getValue());
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/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 a85c9c7..5c6360e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -53,10 +53,6 @@ public class HttpParameters implements Cloneable {
return parameters.containsKey(name);
}
- public HttpParameters clone(Map<String, ?> newParams) {
- return HttpParameters.createEmpty().withParent(this).withExtraParams(newParams).build();
- }
-
public Map<String, String[]> toMap() {
Map<String, String[]> result = new HashMap<>(parameters.size());
for (Map.Entry<String, Parameter> entry : parameters.entrySet()) {
@@ -65,6 +61,11 @@ public class HttpParameters implements Cloneable {
return result;
}
+ public HttpParameters appendAll(Map<String, Parameter> newParams) {
+ parameters.putAll(newParams);
+ return this;
+ }
+
public static class Builder {
private Map<String, Object> requestParameterMap;
private HttpParameters parent;
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
index 7a08895..97f7946 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
@@ -3,6 +3,8 @@ package org.apache.struts2.dispatcher;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.io.File;
+
public interface Parameter {
String getName();
@@ -82,6 +84,12 @@ public interface Parameter {
}
}
+ class File extends Request {
+ public File(String name, Object value) {
+ super(name, value);
+ }
+ }
+
class EmptyHttpParameter implements Parameter {
private String name;
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
index 2bb49aa..369f81e 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
@@ -61,7 +61,7 @@ public class CheckboxInterceptor extends AbstractInterceptor {
public String intercept(ActionInvocation ai) throws Exception {
HttpParameters parameters = ai.getInvocationContext().getParameters();
- Map<String, String[]> extraParams = new HashMap<>();
+ Map<String, Parameter> extraParams = new HashMap<>();
for (String name : parameters.getNames()) {
if (name.startsWith("__checkbox_")) {
@@ -77,13 +77,13 @@ public class CheckboxInterceptor extends AbstractInterceptor {
// is this checkbox checked/submitted?
if (!parameters.contains(checkboxName)) {
// if not, let's be sure to default the value to false
- extraParams.put(checkboxName, new String[]{ uncheckedValue });
+ extraParams.put(checkboxName, new Parameter.Request(checkboxName, uncheckedValue));
}
}
}
- ai.getInvocationContext().setParameters(parameters.clone(extraParams));
+ ai.getInvocationContext().getParameters().appendAll(extraParams);
return ai.invoke();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java
index c71cf4d..acadde2 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java
@@ -96,7 +96,7 @@ public class DateTextFieldInterceptor implements Interceptor {
}
// Create all the date objects
- Map<String, Object> newParams = new HashMap<>();
+ Map<String, Parameter> newParams = new HashMap<>();
Set<Entry<String, Map<String, String>>> dateEntries = dates.entrySet();
for (Entry<String, Map<String, String>> dateEntry : dateEntries) {
Set<Entry<String, String>> dateFormatEntries = dateEntry.getValue().entrySet();
@@ -110,13 +110,13 @@ public class DateTextFieldInterceptor implements Interceptor {
SimpleDateFormat formatter = new SimpleDateFormat(dateFormat);
formatter.setLenient(false);
Date value = formatter.parse(dateValue);
- newParams.put(dateEntry.getKey(), value);
+ newParams.put(dateEntry.getKey(), new Parameter.Request(dateEntry.getKey(), value));
} catch (ParseException e) {
LOG.warn("Cannot parse the parameter '{}' with format '{}' and with value '{}'", dateEntry.getKey(), dateFormat, dateValue);
}
}
- ai.getInvocationContext().setParameters(parameters.clone(newParams));
+ ai.getInvocationContext().getParameters().appendAll(newParams);
return ai.invoke();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index 0ceacc4..680f827 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -30,6 +30,7 @@ import com.opensymphony.xwork2.util.TextParseUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.Parameter;
import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
import org.apache.struts2.util.ContentTypeMatcher;
@@ -294,11 +295,11 @@ public class FileUploadInterceptor extends AbstractInterceptor {
}
if (!acceptedFiles.isEmpty()) {
- Map<String, Object> newParams = new HashMap<>();
- newParams.put(inputName, acceptedFiles.toArray(new File[acceptedFiles.size()]));
- newParams.put(contentTypeName, acceptedContentTypes.toArray(new String[acceptedContentTypes.size()]));
- newParams.put(fileNameName, acceptedFileNames.toArray(new String[acceptedFileNames.size()]));
- ac.setParameters(ac.getParameters().clone(newParams));
+ Map<String, Parameter> newParams = new HashMap<>();
+ newParams.put(inputName, new Parameter.File(inputName, acceptedFiles.toArray(new File[acceptedFiles.size()])));
+ newParams.put(contentTypeName, new Parameter.File(contentTypeName, acceptedContentTypes.toArray(new String[acceptedContentTypes.size()])));
+ newParams.put(fileNameName, new Parameter.File(fileNameName, acceptedFileNames.toArray(new String[acceptedFileNames.size()])));
+ ac.getParameters().appendAll(newParams);
}
}
} else {
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
index 337fd0c..a62de22 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
@@ -23,6 +23,7 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.dispatcher.Parameter;
import java.util.HashMap;
import java.util.Map;
@@ -47,7 +48,7 @@ public class MultiselectInterceptor extends AbstractInterceptor {
*/
public String intercept(ActionInvocation ai) throws Exception {
HttpParameters parameters = ai.getInvocationContext().getParameters();
- Map<String, Object> newParams = new HashMap<>();
+ Map<String, Parameter> newParams = new HashMap<>();
for (String name : parameters.getNames()) {
if (name.startsWith("__multiselect_")) {
@@ -56,14 +57,14 @@ public class MultiselectInterceptor extends AbstractInterceptor {
// is this multi-select box submitted?
if (!parameters.contains(key)) {
// if not, let's be sure to default the value to an empty string array
- newParams.put(key, new String[0]);
+ newParams.put(key, new Parameter.Request(key, new String[0]));
}
parameters = parameters.remove(name);
}
}
- ai.getInvocationContext().setParameters(parameters.clone(newParams));
+ ai.getInvocationContext().getParameters().appendAll(newParams);
return ai.invoke();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
index bd9b4a8..1aa719a 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
@@ -22,12 +22,14 @@ package org.apache.struts2;
import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.dispatcher.Parameter;
import org.apache.struts2.views.util.UrlHelper;
import javax.servlet.Servlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.HttpJspPage;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -54,12 +56,14 @@ public abstract class JSPRuntime {
int i = location.indexOf("?");
if (i > 0) {
//extract params from the url and add them to the request
- HttpParameters parameters = ActionContext.getContext().getParameters();
String query = location.substring(i + 1);
Map<String, Object> queryParams = urlHelper.parseQueryString(query, true);
if (queryParams != null && !queryParams.isEmpty()) {
- parameters = parameters.clone(queryParams);
- ActionContext.getContext().setParameters(parameters);
+ Map<String, Parameter> newParams = new HashMap<>();
+ for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
+ newParams.put(entry.getKey(), new Parameter.Request(entry.getKey(), entry.getValue()));
+ }
+ ActionContext.getContext().getParameters().appendAll(newParams);
}
location = location.substring(0, i);
}
[2/3] struts git commit: WW-4572 Simplifies method name
Posted by lu...@apache.org.
WW-4572 Simplifies method name
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6ab6ec87
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6ab6ec87
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6ab6ec87
Branch: refs/heads/master
Commit: 6ab6ec879cc9eb1997b88856173d2123b32509ee
Parents: 69da41e
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Oct 7 10:06:10 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Oct 7 10:06:10 2016 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptor.java | 4 ++--
.../xwork2/interceptor/StaticParametersInterceptor.java | 2 +-
.../org/apache/struts2/components/ActionComponent.java | 2 +-
.../org/apache/struts2/dispatcher/HttpParameters.java | 2 +-
.../interceptor/ActionMappingParametersInteceptor.java | 4 ++--
.../java/com/opensymphony/xwork2/ActionContextTest.java | 2 +-
.../interceptor/StaticParametersInterceptorTest.java | 2 +-
.../xwork2/validator/DoubleRangeValidatorTest.java | 2 +-
.../xwork2/validator/ValidatorAnnotationTest.java | 4 ++--
.../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +-
.../struts2/interceptor/FileUploadInterceptorTest.java | 4 ++--
.../apache/struts2/interceptor/I18nInterceptorTest.java | 2 +-
.../struts2/interceptor/MessageStoreInterceptorTest.java | 11 ++++-------
.../interceptor/MessageStorePreResultListenerTest.java | 4 ++--
.../interceptor/ServletConfigInterceptorTest.java | 4 ++--
.../apache/struts2/interceptor/TokenInterceptorTest.java | 2 +-
.../java/org/apache/struts2/util/TokenHelperTest.java | 2 +-
.../apache/struts2/portlet/result/PortletResultTest.java | 3 +--
18 files changed, 27 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 4c94b6b..c1439c5 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -161,10 +161,10 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
HttpParameters params;
Map<String, Parameter> acceptableParameters;
if (ordered) {
- params = HttpParameters.createEmpty().withComparator(getOrderedComparator()).withParent(parameters).build();
+ params = HttpParameters.create().withComparator(getOrderedComparator()).withParent(parameters).build();
acceptableParameters = new TreeMap<>(getOrderedComparator());
} else {
- params = HttpParameters.createEmpty().withParent(parameters).build();
+ params = HttpParameters.create().withParent(parameters).build();
acceptableParameters = new TreeMap<>();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
index 658883f..8aab382 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
@@ -218,7 +218,7 @@ public class StaticParametersInterceptor extends AbstractInterceptor {
protected void addParametersToContext(ActionContext ac, Map<String, ?> newParams) {
HttpParameters previousParams = ac.getParameters();
- HttpParameters.Builder combinedParams = HttpParameters.createEmpty();
+ HttpParameters.Builder combinedParams = HttpParameters.create();
if (overwrite) {
if (previousParams != null) {
combinedParams = combinedParams.withParent(previousParams);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/components/ActionComponent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
index 762aafd..d6fb690 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
@@ -216,7 +216,7 @@ public class ActionComponent extends ContextBean {
parentParams = new ActionContext(getStack().getContext()).getParameters();
}
- HttpParameters.Builder builder = HttpParameters.createEmpty();
+ HttpParameters.Builder builder = HttpParameters.create();
if (parentParams != null) {
builder = builder.withParent(parentParams);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/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 5c6360e..ad94ff2 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -20,7 +20,7 @@ public class HttpParameters implements Cloneable {
return new Builder(requestParameterMap);
}
- public static Builder createEmpty() {
+ public static Builder create() {
return new Builder(new HashMap<String, Object>());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
index 01dec16..5d25c30 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
@@ -86,7 +86,7 @@ public class ActionMappingParametersInteceptor extends ParametersInterceptor {
if (mapping != null) {
return HttpParameters.create(mapping.getParams()).build();
} else {
- return HttpParameters.createEmpty().build();
+ return HttpParameters.create().build();
}
}
@@ -103,7 +103,7 @@ public class ActionMappingParametersInteceptor extends ParametersInterceptor {
@Override
protected void addParametersToContext(ActionContext ac, Map<String, ?> newParams) {
HttpParameters previousParams = ac.getParameters();
- HttpParameters.Builder combinedParams = HttpParameters.createEmpty().withParent(previousParams).withExtraParams(newParams);
+ HttpParameters.Builder combinedParams = HttpParameters.create().withParent(previousParams).withExtraParams(newParams);
ac.setParameters(combinedParams.build());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
index 2608353..c8b8d5d 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
@@ -89,7 +89,7 @@ public class ActionContextTest extends XWorkTestCase {
}
public void testParameters() {
- context.setParameters(HttpParameters.createEmpty().build());
+ context.setParameters(HttpParameters.create().build());
assertEquals(0, context.getParameters().getNames().size());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
index 6c0ecb6..fad3655 100644
--- a/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
@@ -126,7 +126,7 @@ public class StaticParametersInterceptorTest extends XWorkTestCase {
User user = new User();
ActionContext.getContext().getValueStack().push(user);
- ActionContext.getContext().setParameters(HttpParameters.createEmpty().build());
+ ActionContext.getContext().setParameters(HttpParameters.create().build());
int before = ActionContext.getContext().getValueStack().size();
interceptor.setMerge("false");
interceptor.intercept(mai);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
index a335de9..64e4c2c 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
@@ -235,7 +235,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase {
loadConfigurationProviders(provider, new MockConfigurationProvider());
val = new DoubleRangeFieldValidator();
val.setValueStack(ActionContext.getContext().getValueStack());
- ActionContext.getContext().setParameters(HttpParameters.createEmpty().build());
+ ActionContext.getContext().setParameters(HttpParameters.create().build());
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
index cfaa765..4867af5 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
@@ -37,7 +37,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase {
public void testNotAnnotatedMethodSuccess2() throws Exception {
HashMap<String, Object> extraContext = new HashMap<>();
- extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build());
ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext);
proxy.execute();
@@ -50,7 +50,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase {
public void testAnnotatedMethodFailure() throws Exception {
HashMap<String, Object> extraContext = new HashMap<>();
- extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build());
ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext);
proxy.execute();
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
index 0c2854c..7ed4ecb 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
@@ -173,7 +173,7 @@ public class ExecuteAndWaitInterceptorTest extends StrutsInternalTestCase {
params = new HashMap();
context = new HashMap();
context.put(ActionContext.SESSION, session);
- context.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ context.put(ActionContext.PARAMETERS, HttpParameters.create().build());
request = new StrutsMockHttpServletRequest();
httpSession = new StrutsMockHttpSession();
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index ecc624a..c7cb236 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@ -201,7 +201,7 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase {
mai.setResultCode("success");
mai.setInvocationContext(ActionContext.getContext());
- ActionContext.getContext().setParameters(HttpParameters.createEmpty().build());
+ ActionContext.getContext().setParameters(HttpParameters.create().build());
ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest(req, 2000));
interceptor.intercept(mai);
@@ -222,7 +222,7 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase {
mai.setResultCode("success");
mai.setInvocationContext(ActionContext.getContext());
- ActionContext.getContext().setParameters(HttpParameters.createEmpty().build());
+ ActionContext.getContext().setParameters(HttpParameters.create().build());
ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest(req, 2000));
interceptor.intercept(mai);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
index 2744eb1..de056b9 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
@@ -201,7 +201,7 @@ public class I18nInterceptorTest extends TestCase {
session = new HashMap();
Map<String, Object> ctx = new HashMap<String, Object>();
- ctx.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ ctx.put(ActionContext.PARAMETERS, HttpParameters.create().build());
ctx.put(ActionContext.SESSION, session);
ac = new ActionContext(ctx);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
index 1e73955..380873b 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
@@ -27,12 +27,10 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.dispatcher.HttpParameters;
-import org.apache.struts2.result.ServletActionRedirectResult;
import org.easymock.EasyMock;
import com.opensymphony.xwork2.Action;
@@ -40,7 +38,6 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -76,7 +73,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class);
HttpServletRequest mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class);
@@ -151,7 +148,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
EasyMock.replay(mockedRequest);
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
actionContext.put(ActionContext.SESSION, sessionMap);
mockActionInvocation.getInvocationContext();
@@ -203,7 +200,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
actionContext.put(ActionContext.SESSION, sessionMap);
HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class);
@@ -289,7 +286,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
public void testRequestOperationMode3() throws Exception {
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class);
mockActionInvocation.getInvocationContext();
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
index 482a9b2..e888a55 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
@@ -111,7 +111,7 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
actionContext.put(ActionContext.SESSION, sessionMap);
HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class);
@@ -191,7 +191,7 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.setParameters(HttpParameters.createEmpty().build());
+ actionContext.setParameters(HttpParameters.create().build());
actionContext.setSession(sessionMap);
HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/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 1320b60..fca80f7 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
@@ -88,7 +88,7 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
- HttpParameters param = HttpParameters.createEmpty().build();
+ HttpParameters param = HttpParameters.create().build();
mai.getInvocationContext().setParameters(param);
mock.setParameters(param.toMap());
@@ -104,7 +104,7 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase {
MockActionInvocation mai = createActionInvocation(mock);
- HttpParameters param = HttpParameters.createEmpty().build();
+ HttpParameters param = HttpParameters.create().build();
mai.getInvocationContext().setParameters(param);
mock.setParameters(param);
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
index 5f29e1b..26d52d4 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
@@ -113,7 +113,7 @@ public class TokenInterceptorTest extends StrutsInternalTestCase {
params = new TreeMap<>();
extraContext = new TreeMap<>();
extraContext.put(ActionContext.SESSION, session);
- extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build());
request = new StrutsMockHttpServletRequest();
httpSession = new StrutsMockHttpSession();
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
index a4d86eb..da44e9f 100644
--- a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
+++ b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
@@ -93,7 +93,7 @@ public class TokenHelperTest extends TestCase {
session = new HashMap();
Map ctxMap = new TreeMap();
ctxMap.put(ActionContext.SESSION, session);
- ctxMap.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
+ ctxMap.put(ActionContext.PARAMETERS, HttpParameters.create().build());
ActionContext ctx = new ActionContext(ctxMap);
ActionContext.setContext(ctx);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
----------------------------------------------------------------------
diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
index b1297e3..b36cf74 100644
--- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
+++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
@@ -23,7 +23,6 @@ package org.apache.struts2.portlet.result;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.sun.net.httpserver.HttpsParameters;
import junit.textui.TestRunner;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.HttpParameters;
@@ -74,7 +73,7 @@ public class PortletResultTest extends MockObjectTestCase implements StrutsStati
Map<String, Object> context = new HashMap<String, Object>();
context.put(SESSION, sessionMap);
- context.put(PARAMETERS, HttpParameters.createEmpty().build());
+ context.put(PARAMETERS, HttpParameters.create().build());
context.put(STRUTS_PORTLET_CONTEXT, mockCtx.proxy());
ActionContext.setContext(new ActionContext(context));
[3/3] struts git commit: WW-4696 Upgrades to Log4j 2.7
Posted by lu...@apache.org.
WW-4696 Upgrades to Log4j 2.7
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1bd9bde6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1bd9bde6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1bd9bde6
Branch: refs/heads/master
Commit: 1bd9bde6105f16de9068936eb704368e57e21fa5
Parents: 6ab6ec8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Oct 7 10:13:50 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Oct 7 10:13:50 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1bd9bde6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 12e14f8..fcdd409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<asm5.version>5.1</asm5.version>
<tiles.version>3.0.7</tiles.version>
<tiles-request.version>1.0.6</tiles-request.version>
- <log4j2.version>2.6.2</log4j2.version>
+ <log4j2.version>2.7</log4j2.version>
<!-- SCM Site Configuration -->
<site.mainDirectory>${project.build.directory}/site</site.mainDirectory>