[wicket] branch master updated: WICKET-6915 Upgrade to commons-fileupload2

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 8f8951b64d WICKET-6915 Upgrade to commons-fileupload2
8f8951b64d is described below

commit 8f8951b64db7006b131f7acfc8ad8f32bc6dca8a
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Tue Apr 4 09:29:54 2023 +0300

    WICKET-6915 Upgrade to commons-fileupload2
    
    Fix broken build after refactoring in commons-fileupload2
    
    Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
---
 .../main/java/org/apache/wicket/markup/html/form/Form.java   | 12 ++++++------
 .../http/servlet/MultipartServletWebRequestImpl.java         |  6 +++---
 2 files changed, 9 insertions(+), 9 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 bf5dbbed67..a9e03c1f9c 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
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.fileupload2.FileUploadException;
-import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
-import org.apache.commons.fileupload2.pub.SizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
+import org.apache.commons.fileupload2.pub.FileUploadSizeException;
 import org.apache.wicket.Component;
 import org.apache.wicket.IGenericComponent;
 import org.apache.wicket.IRequestListener;
@@ -1496,14 +1496,14 @@ public class Form<T> extends WebMarkupContainer
        protected void onFileUploadException(final FileUploadException e,
                final Map<String, Object> model)
        {
-               if (e instanceof SizeLimitExceededException)
+               if (e instanceof FileUploadByteCountLimitException)
                {
-                       String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, 
Model.ofMap(model));
+                       String msg = 
getString(UPLOAD_SINGLE_FILE_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
                        error(msg);
                }
-               else if (e instanceof FileSizeLimitExceededException)
+               else if (e instanceof FileUploadSizeException)
                {
-                       String msg = 
getString(UPLOAD_SINGLE_FILE_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
+                       String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, 
Model.ofMap(model));
                        error(msg);
                }
                else
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 294faf114e..0a7574d303 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
@@ -34,7 +34,7 @@ import org.apache.commons.fileupload2.FileUploadException;
 import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload2.jaksrvlt.JakSrvltFileUpload;
 import org.apache.commons.fileupload2.jaksrvlt.JakSrvltRequestContext;
-import org.apache.commons.fileupload2.pub.FileSizeLimitExceededException;
+import org.apache.commons.fileupload2.pub.FileUploadByteCountLimitException;
 import org.apache.commons.io.FileCleaningTracker;
 import org.apache.wicket.Application;
 import org.apache.wicket.WicketRuntimeException;
@@ -491,9 +491,9 @@ public class MultipartServletWebRequestImpl extends 
MultipartServletWebRequest
                                if (fileMaxSize != null && fileItem.getSize() > 
fileMaxSize.bytes())
                                {
                                        String fieldName = entry.getKey();
-                                       FileUploadException fslex = new 
FileSizeLimitExceededException("The field '" +
+                                       FileUploadException fslex = new 
FileUploadByteCountLimitException("The field '" +
                                                        fieldName + "' exceeds 
its maximum permitted size of '" +
-                                                       maxSize + "' 
characters.", fileItem.getSize(), fileMaxSize.bytes());
+                                                       maxSize + "' 
characters.", fileItem.getSize(), fileMaxSize.bytes(), fileItem.getName(), 
fieldName);
                                        throw fslex;
                                }
                        }