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 0fe6b0aa6e15e2b84eeb85d91a2b60c05a80de70 Author: Maxim Solodovnik <[email protected]> AuthorDate: Mon Jul 17 11:59:09 2023 +0700 The code is updated to comply with fileupload-M1 --- pom.xml | 2 +- .../wicket/markup/html/form/upload/FileUpload.java | 2 +- .../http/servlet/MultipartServletWebRequestImpl.java | 4 +--- .../protocol/http/servlet/ServletPartFileItem.java | 16 +++++++++------- .../wicket/markup/html/form/upload/FileUploadTest.java | 2 +- wicket-extensions/src/main/java/module-info.java | 1 + 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index d191e82334..d3e8ab2307 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ <byte-buddy.version>1.14.2</byte-buddy.version> <cdi-unit.version>4.1.0</cdi-unit.version> <commons-collections4.version>4.4</commons-collections4.version> - <commons-fileupload.version>2.0.0-SNAPSHOT</commons-fileupload.version> + <commons-fileupload.version>2.0.0-M1</commons-fileupload.version> <commons-io.version>2.13.0</commons-io.version> <commons-lang3.version>3.12.0</commons-lang3.version> <guice.version>7.0.0</guice.version> 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 29b97e4dfb..c555f08f5c 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 @@ -85,7 +85,7 @@ public class FileUpload /** * Deletes temp file from disk */ - public void delete() + public void delete() throws IOException { item.delete(); } 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 b286b3d514..11ab2ba4d3 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 @@ -33,14 +33,12 @@ 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.core.DiskFileItemFactory; import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; import org.apache.commons.fileupload2.jakarta.JakartaServletRequestContext; -import org.apache.commons.io.FileCleaningTracker; import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.file.FileCleanerTrackerAdapter; -import org.apache.wicket.util.file.IFileCleaner; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.string.StringValue; 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 b861fea8fa..e09f7dd07f 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 @@ -28,7 +28,7 @@ import java.util.Collection; import jakarta.servlet.http.Part; import org.apache.commons.fileupload2.core.FileItem; -import org.apache.commons.fileupload2.core.FileItemFactory.FileItemBuilder; +import org.apache.commons.fileupload2.core.FileItemFactory.AbstractFileItemBuilder; import org.apache.commons.fileupload2.core.FileItemHeaders; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.request.resource.AbstractResource; @@ -137,13 +137,14 @@ class ServletPartFileItem implements FileItem } @Override - public void write(Path path) throws IOException + public ServletPartFileItem write(Path path) throws IOException { part.write(path.toFile().getName()); + return this; } @Override - public void delete() + public ServletPartFileItem delete() { try { @@ -153,6 +154,7 @@ class ServletPartFileItem implements FileItem { throw new WicketRuntimeException("A problem occurred while deleting an upload part", iox); } + return this; } @Override @@ -162,7 +164,7 @@ class ServletPartFileItem implements FileItem } @Override - public void setFieldName(String name) + public ServletPartFileItem setFieldName(String name) { throw new UnsupportedOperationException("setFieldName"); } @@ -174,7 +176,7 @@ class ServletPartFileItem implements FileItem } @Override - public void setFormField(boolean state) + public ServletPartFileItem setFormField(boolean state) { throw new UnsupportedOperationException("setFormField"); } @@ -188,7 +190,7 @@ class ServletPartFileItem implements FileItem @Override public FileItemHeaders getHeaders() { - FileItemHeaders fileItemHeaders = FileItemBuilder.newFileItemHeaders(); + FileItemHeaders fileItemHeaders = AbstractFileItemBuilder.newFileItemHeaders(); for (String headerName : part.getHeaderNames()) { Collection<String> headerValues = part.getHeaders(headerName); @@ -201,7 +203,7 @@ class ServletPartFileItem implements FileItem } @Override - public void setHeaders(FileItemHeaders headers) + public ServletPartFileItem setHeaders(FileItemHeaders headers) { throw new UnsupportedOperationException("setHeaders"); } 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 032feedcc2..bf8729808e 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 @@ -28,7 +28,7 @@ import java.lang.reflect.Field; import java.util.List; import org.apache.commons.fileupload2.core.FileItem; -import org.apache.commons.fileupload2.core.disk.DiskFileItemFactory; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; import org.apache.wicket.util.file.File; import org.apache.wicket.util.file.FileCleaner; import org.apache.wicket.util.file.FileCleanerTrackerAdapter; diff --git a/wicket-extensions/src/main/java/module-info.java b/wicket-extensions/src/main/java/module-info.java index c864b8e4dd..cea2ff83f5 100644 --- a/wicket-extensions/src/main/java/module-info.java +++ b/wicket-extensions/src/main/java/module-info.java @@ -21,6 +21,7 @@ module org.apache.wicket.extensions { requires org.slf4j; requires com.fasterxml.jackson.databind; requires com.github.openjson; + requires org.apache.commons.fileupload2.core; requires org.apache.wicket.util; requires org.apache.wicket.request; requires org.apache.wicket.core;
