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/25 18:18:07 UTC
[12/14] struts git commit: Merge branch 'master' into WW-4717
Merge branch 'master' into WW-4717
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ae5605ff
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ae5605ff
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ae5605ff
Branch: refs/heads/master
Commit: ae5605ff8872daa08f12c84fb7a2b30f5f57e8ea
Parents: 4de8309 6d623eb
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Nov 23 15:15:15 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Nov 23 15:15:15 2016 +0100
----------------------------------------------------------------------
assembly/src/main/assembly/all.xml | 1 +
assembly/src/main/assembly/lib.xml | 1 +
assembly/src/main/assembly/min-lib.xml | 5 +-
core/pom.xml | 8 -
.../interceptor/ParameterFilterInterceptor.java | 2 +-
.../interceptor/ParametersInterceptor.java | 4 +-
.../AnnotationParameterFilterInterceptor.java | 4 +-
.../xwork2/util/finder/DefaultClassFinder.java | 580 ------------------
.../struts2/dispatcher/HttpParameters.java | 100 +++-
.../interceptor/CheckboxInterceptor.java | 2 +-
.../interceptor/DateTextFieldInterceptor.java | 2 +-
.../interceptor/MultiselectInterceptor.java | 2 +-
.../opensymphony/xwork2/ActionContextTest.java | 2 +-
.../ParameterFilterInterceptorTest.java | 2 +-
.../ParameterRemoverInterceptorTest.java | 6 +-
.../StaticParametersInterceptorTest.java | 2 +-
...nnotationParameterFilterInterceptorTest.java | 8 +-
.../struts2/components/ActionComponentTest.java | 2 +-
.../interceptor/CheckboxInterceptorTest.java | 16 +-
.../DateTextFieldInterceptorTest.java | 4 +-
.../interceptor/FileUploadInterceptorTest.java | 4 +-
.../interceptor/MultiselectInterceptorTest.java | 6 +-
.../apache/struts2/views/jsp/ActionTagTest.java | 4 +-
plugins/convention/pom.xml | 10 +
.../struts2/convention/DefaultClassFinder.java | 583 +++++++++++++++++++
pom.xml | 7 +-
26 files changed, 722 insertions(+), 645 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ae5605ff/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
----------------------------------------------------------------------
diff --cc core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index 1cea2d7,a7df38f..5ac4bc2
--- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@@ -296,8 -262,8 +296,8 @@@ public class FileUploadInterceptorTest
assertTrue(!action.hasErrors());
HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertTrue(parameters.getNames().size() == 3);
+ assertTrue(parameters.keySet().size() == 3);
- File[] files = (File[]) parameters.get("file").getObject();
+ UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
@@@ -356,8 -322,8 +356,8 @@@
interceptor.intercept(mai);
HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.getNames().size());
+ assertEquals(3, parameters.keySet().size());
- File[] files = (File[]) parameters.get("file").getObject();
+ UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();