This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch commons-fileupload2-back in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 0fd8c716199d06bff3a2342d7e0b9d0982850425 Author: Maxim Solodovnik <[email protected]> AuthorDate: Fri Jun 16 14:28:52 2023 +0700 Build is green --- .../org/apache/wicket/markup/html/form/Form.java | 8 ++++---- .../wicket/markup/html/form/upload/FileUpload.java | 2 +- .../markup/html/form/upload/FileUploadField.java | 2 +- .../html/form/upload/MultiFileUploadField.java | 2 +- .../resource/AbstractFileUploadResource.java | 10 ++++----- .../wicket/protocol/http/IMultipartWebRequest.java | 2 +- .../protocol/http/mock/MockHttpServletRequest.java | 2 +- .../http/servlet/MultipartServletWebRequest.java | 4 ++-- .../servlet/MultipartServletWebRequestImpl.java | 14 ++++++------- .../protocol/http/servlet/ServletPartFileItem.java | 19 +++++++++-------- .../protocol/http/servlet/ServletWebRequest.java | 4 ++-- .../markup/html/form/upload/FileUploadTest.java | 24 ++++++++++------------ .../examples/ajax/builtin/FileUploadPage.java | 2 +- wicket-extensions/src/main/java/module-info.java | 1 - .../extensions/ajax/AjaxFileDropBehavior.java | 4 ++-- 15 files changed, 49 insertions(+), 51 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index beb4d7d2ea..fc96861270 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -25,10 +25,10 @@ import java.util.Locale; import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.fileupload2.FileUploadException; -import org.apache.commons.fileupload2.FileUploadByteCountLimitException; -import org.apache.commons.fileupload2.FileUploadSizeException; -import org.apache.commons.fileupload2.FileUploadFileCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadSizeException; +import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException; import org.apache.wicket.Component; import org.apache.wicket.IGenericComponent; import org.apache.wicket.IRequestListener; diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java index 1d14e53998..29b97e4dfb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java @@ -24,7 +24,7 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.fileupload2.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.apache.wicket.Session; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.request.cycle.RequestCycle; diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java index c209e77720..3fc87d9b8c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java @@ -20,7 +20,7 @@ package org.apache.wicket.markup.html.form.upload; import java.util.ArrayList; import java.util.List; -import org.apache.commons.fileupload2.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.model.IModel; diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java index af34fe1af9..a8c278bcfc 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.fileupload2.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java index a986ce978f..eaf4af213c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.FileUploadException; -import org.apache.commons.fileupload2.FileUploadByteCountLimitException; -import org.apache.commons.fileupload2.FileUploadFileCountLimitException; -import org.apache.commons.fileupload2.FileUploadSizeException; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadSizeException; import org.apache.wicket.Application; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.upload.FileUpload; diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java index 0cfee612d6..4bc73d8609 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IMultipartWebRequest.java @@ -19,7 +19,7 @@ package org.apache.wicket.protocol.http; import java.util.List; import java.util.Map; -import org.apache.commons.fileupload2.FileItem; +import org.apache.commons.fileupload2.core.FileItem; /** diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java index bbc1941bff..362fb1dd8d 100755 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java @@ -58,7 +58,7 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpUpgradeHandler; import jakarta.servlet.http.Part; -import org.apache.commons.fileupload2.AbstractFileUpload; +import org.apache.commons.fileupload2.core.AbstractFileUpload; import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.mock.MockRequestParameters; diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java index 8d5b042269..754913e20d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java @@ -21,8 +21,8 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.FileUploadException; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; import org.apache.wicket.protocol.http.IMultipartWebRequest; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.Url; diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java index a9de225384..b286b3d514 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java @@ -28,14 +28,14 @@ import java.util.Map; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.Part; -import org.apache.commons.fileupload2.AbstractFileUpload; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.FileItemFactory; -import org.apache.commons.fileupload2.FileUploadException; -import org.apache.commons.fileupload2.disk.DiskFileItemFactory; +import org.apache.commons.fileupload2.core.AbstractFileUpload; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileItemFactory; +import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.core.disk.DiskFileItemFactory; import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; import org.apache.commons.fileupload2.jakarta.JakartaServletRequestContext; -import org.apache.commons.fileupload2.FileUploadByteCountLimitException; import org.apache.commons.io.FileCleaningTracker; import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; @@ -209,7 +209,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest { try { - value = item.getString(encoding); + value = item.getString(Charset.forName(encoding)); } catch (IOException e) { diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java index 49debb9b5c..b861fea8fa 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java @@ -20,15 +20,16 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Collection; import jakarta.servlet.http.Part; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.FileItemHeaders; -import org.apache.commons.fileupload2.FileItemHeadersImpl; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder; +import org.apache.commons.fileupload2.core.FileItemHeaders; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.request.resource.AbstractResource; import org.apache.wicket.util.io.IOUtils; @@ -116,10 +117,10 @@ class ServletPartFileItem implements FileItem } @Override - public String getString(String encoding) throws UnsupportedEncodingException + public String getString(Charset toCharset) throws IOException { byte[] bytes = get(); - return new String(bytes, encoding); + return new String(bytes, toCharset); } @Override @@ -127,9 +128,9 @@ class ServletPartFileItem implements FileItem { try { - return getString("UTF-8"); + return getString(StandardCharsets.UTF_8); } - catch (UnsupportedEncodingException uex) + catch (IOException uex) { throw new WicketRuntimeException("UTF-8 must be supported", uex); } @@ -187,7 +188,7 @@ class ServletPartFileItem implements FileItem @Override public FileItemHeaders getHeaders() { - FileItemHeadersImpl fileItemHeaders = new FileItemHeadersImpl(); + FileItemHeaders fileItemHeaders = FileItemBuilder.newFileItemHeaders(); for (String headerName : part.getHeaderNames()) { Collection<String> headerValues = part.getHeaders(headerName); diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java index e5fbd4e713..e597a46cf6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java @@ -30,8 +30,8 @@ import java.util.Set; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.fileupload2.FileItemFactory; -import org.apache.commons.fileupload2.FileUploadException; +import org.apache.commons.fileupload2.core.FileItemFactory; +import org.apache.commons.fileupload2.core.FileUploadException; import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.IWritableRequestParameters; diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java index a5c20545ad..032feedcc2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java @@ -27,9 +27,8 @@ import java.io.InputStream; import java.lang.reflect.Field; import java.util.List; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.disk.DiskFileItemFactory; -import org.apache.commons.io.FileCleaningTracker; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.disk.DiskFileItemFactory; import org.apache.wicket.util.file.File; import org.apache.wicket.util.file.FileCleaner; import org.apache.wicket.util.file.FileCleanerTrackerAdapter; @@ -58,16 +57,15 @@ class FileUploadTest extends WicketTestCase { final IFileCleaner fileUploadCleaner = new FileCleaner(); - DiskFileItemFactory itemFactory = new DiskFileItemFactory() - { - @Override - public FileCleaningTracker getFileCleaningTracker() - { - return new FileCleanerTrackerAdapter(fileUploadCleaner); - } - }; - FileItem fileItem = itemFactory.createItem("dummyFieldName", - "text/java", false, "FileUploadTest.java"); + DiskFileItemFactory itemFactory = DiskFileItemFactory.builder() + .setFileCleaningTracker(new FileCleanerTrackerAdapter(fileUploadCleaner)) + .get(); + FileItem fileItem = itemFactory.fileItemBuilder() + .setContentType("text/java") + .setFieldName("dummyFieldName") + .setFormField(false) + .setFileName("FileUploadTest.java") + .get(); // Initialize the upload fileItem.getOutputStream(); diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java index daa59f8a60..035cc7db3e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.collections4.iterators.EmptyIterator; -import org.apache.commons.fileupload2.FileUploadException; +import org.apache.commons.fileupload2.core.FileUploadException; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; diff --git a/wicket-extensions/src/main/java/module-info.java b/wicket-extensions/src/main/java/module-info.java index c765b03b27..c864b8e4dd 100644 --- a/wicket-extensions/src/main/java/module-info.java +++ b/wicket-extensions/src/main/java/module-info.java @@ -21,7 +21,6 @@ module org.apache.wicket.extensions { requires org.slf4j; requires com.fasterxml.jackson.databind; requires com.github.openjson; - requires org.apache.wicket.commons.fileupload; requires org.apache.wicket.util; requires org.apache.wicket.request; requires org.apache.wicket.core; diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java index b748bd841f..b8a76b0020 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/AjaxFileDropBehavior.java @@ -19,8 +19,8 @@ package org.apache.wicket.extensions.ajax; import java.util.ArrayList; import java.util.List; -import org.apache.commons.fileupload2.FileItem; -import org.apache.commons.fileupload2.FileUploadException; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; import org.apache.wicket.Component; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.AjaxEventBehavior;
