Upgrade to FileUpload 2 (#335)

jenkinsci · May 22, 2024 · 74afc4f · 74afc4f
1 parent 00ead2c
commit 74afc4f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,5 +5,5 @@ buildPlugin(useContainerAgent: true, configurations: [
   [ platform: 'windows', jdk: '17', jenkins: null ],
 
   // Test latest Jenkins Version.
-  [ platform: 'linux', jdk: '21', jenkins: '2.458' ]
+  [ platform: 'linux', jdk: '21', jenkins: '2.459' ]
 ])
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 
   <properties>
     <gitHubRepo>jenkinsci/custom-folder-icon-plugin</gitHubRepo>
-    <jenkins.version>2.454</jenkins.version>
+    <jenkins.version>2.459</jenkins.version>
     <revision>2.13</revision>
     <changelist>-SNAPSHOT</changelist>
     <spotless.check.skip>false</spotless.check.skip>

diff --git a/src/test/java/jenkins/plugins/foldericon/utils/MockMultiPartRequest.java b/src/test/java/jenkins/plugins/foldericon/utils/MockMultiPartRequest.java
@@ -26,14 +26,17 @@
 
 import java.io.*;
 import java.lang.reflect.Type;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.security.Principal;
 import java.util.*;
 import javax.annotation.Nonnull;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemHeaders;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileItemHeaders;
+import org.apache.commons.fileupload2.core.FileItemHeadersProvider;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.*;
 import org.kohsuke.stapler.bind.BoundObjectTable;
@@ -627,7 +630,7 @@ public JSONObject getSubmittedForm() {
     }
 
     @Override
-    public FileItem getFileItem(String name) throws ServletException, IOException {
+    public FileItem getFileItem2(String name) throws ServletException, IOException {
         if (buffer != null && StringUtils.equals(name, "file")) {
             return new FileItem() {
                 @Override
@@ -661,7 +664,7 @@ public byte[] get() {
                 }
 
                 @Override
-                public String getString(String encoding) {
+                public String getString(Charset encoding) {
                     return null;
                 }
 
@@ -671,26 +674,34 @@ public String getString() {
                 }
 
                 @Override
-                public void write(File file) {}
+                public FileItem write(Path file) {
+                    return this;
+                }
 
                 @Override
-                public void delete() {}
+                public FileItem delete() {
+                    return this;
+                }
 
                 @Override
                 public String getFieldName() {
                     return null;
                 }
 
                 @Override
-                public void setFieldName(String name) {}
+                public FileItem setFieldName(String name) {
+                    return this;
+                }
 
                 @Override
                 public boolean isFormField() {
                     return true;
                 }
 
                 @Override
-                public void setFormField(boolean state) {}
+                public FileItem setFormField(boolean state) {
+                    return this;
+                }
 
                 @Override
                 public OutputStream getOutputStream() {
@@ -703,13 +714,21 @@ public FileItemHeaders getHeaders() {
                 }
 
                 @Override
-                public void setHeaders(FileItemHeaders headers) {}
+                public FileItemHeadersProvider setHeaders(FileItemHeaders headers) {
+                    return null;
+                }
             };
         } else {
             return null;
         }
     }
 
+    @Override
+    public org.apache.commons.fileupload.FileItem getFileItem(String name) throws ServletException, IOException {
+        FileItem fileItem = getFileItem2(name);
+        return fileItem != null ? org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(fileItem) : null;
+    }
+
     @Override
     public boolean isJavaScriptProxyCall() {
         return false;