This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit f4501846c6e0edb1318823e0368d048c1f41608a Merge: f684effd9 64c13cc74 Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Fri Dec 15 10:06:35 2023 +0100 Merge pull request #808 from apache/feature/WW-5371-modern-upload [WW-5371] Modern upload .../showcase/fileupload/FileUploadAction.java | 122 ++++--- .../webapp/WEB-INF/fileupload/upload-success.jsp | 9 +- .../UploadedFilesAware.java} | 32 +- .../multipart/JakartaMultiPartRequest.java | 6 +- .../multipart/JakartaStreamMultiPartRequest.java | 42 +-- .../dispatcher/multipart/StrutsUploadedFile.java | 64 +++- .../struts2/dispatcher/multipart/UploadedFile.java | 8 +- .../interceptor/AbstractFileUploadInterceptor.java | 263 +++++++++++++++ .../interceptor/ActionFileUploadInterceptor.java | 191 +++++++++++ .../struts2/interceptor/FileUploadInterceptor.java | 265 ++------------- .../apache/struts2/struts-messages_en.properties | 27 +- core/src/main/resources/struts-default.xml | 9 + .../conversion/UploadedFileConverterTest.java | 19 +- ...t.java => ActionFileUploadInterceptorTest.java} | 369 ++++++++++----------- .../interceptor/FileUploadInterceptorTest.java | 182 +++++----- .../dispatcher/multipart/PellMultiPartRequest.java | 13 +- 16 files changed, 982 insertions(+), 639 deletions(-)