WW-5388 Drops unused defaultLocale

core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.struts2.dispatcher.multipart;
 
-import com.opensymphony.xwork2.LocaleProviderFactory;
 import com.opensymphony.xwork2.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
@@ -40,7 +39,6 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -88,12 +86,10 @@ public abstract class AbstractMultiPartRequest<T> implements MultiPartRequest {
      */
     protected int bufferSize = BUFFER_SIZE;
 
-    protected String defaultEncoding;
-
     /**
-     * Localization to be used regarding errors.
+     * Defines default encoding to encode data from request used if not provided with request
      */
-    protected Locale defaultLocale = Locale.ENGLISH;
+    protected String defaultEncoding;
 
     /**
      * Map between file fields and file data.
@@ -126,36 +122,30 @@ public abstract class AbstractMultiPartRequest<T> implements MultiPartRequest {
         this.maxSize = Long.parseLong(maxSize);
     }
 
+    /**
+     * @param maxFiles Injects the Struts maximum size of an individual file uploaded.
+     */
     @Inject(StrutsConstants.STRUTS_MULTIPART_MAXFILES)
     public void setMaxFiles(String maxFiles) {
         this.maxFiles = Long.parseLong(maxFiles);
     }
 
+    /**
+     * @param maxFileSize Injects the Struts maximum number of files, which can be uploaded.
+     */
     @Inject(value = StrutsConstants.STRUTS_MULTIPART_MAXFILESIZE, required = false)
     public void setMaxFileSize(String maxFileSize) {
         this.maxFileSize = Long.parseLong(maxFileSize);
     }
 
+    /**
+     * @param maxStringLength Injects the Struts maximum size of single form field.
+     */
     @Inject(StrutsConstants.STRUTS_MULTIPART_MAX_STRING_LENGTH)
     public void setMaxStringLength(String maxStringLength) {
         this.maxStringLength = Long.parseLong(maxStringLength);
     }
 
-    @Inject
-    public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
-        defaultLocale = localeProviderFactory.createLocaleProvider().getLocale();
-    }
-
-    /**
-     * @param request Inspect the servlet request and set the locale if one wasn't provided by
-     *                the Struts2 framework.
-     */
-    protected void setLocale(HttpServletRequest request) {
-        if (defaultLocale == null) {
-            defaultLocale = request.getLocale();
-        }
-    }
-
     /**
      * Process the request extract file upload data
      *
@@ -215,7 +205,6 @@ public abstract class AbstractMultiPartRequest<T> implements MultiPartRequest {
      */
     public void parse(HttpServletRequest request, String saveDir) throws IOException {
         try {
-            setLocale(request);
             processUpload(request, saveDir);
         } catch (FileUploadException e) {
             LOG.debug("Request exceeded size limit!", e);
@@ -368,18 +357,23 @@ public abstract class AbstractMultiPartRequest<T> implements MultiPartRequest {
      * @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#cleanUp()
      */
     public void cleanUp() {
-        LOG.debug("Performing File Upload temporary storage cleanup.");
-        for (List<UploadedFile<T>> uploadedFileList : uploadedFiles.values()) {
-            for (UploadedFile<T> uploadedFile : uploadedFileList) {
-                if (uploadedFile.isFile()) {
-                    LOG.debug("Deleting file: {}", uploadedFile.getName());
-                    if (!uploadedFile.delete()) {
-                        LOG.warn("There was a problem attempting to delete file: {}", uploadedFile.getName());
+        try {
+            LOG.debug("Performing File Upload temporary storage cleanup.");
+            for (List<UploadedFile<T>> uploadedFileList : uploadedFiles.values()) {
+                for (UploadedFile<T> uploadedFile : uploadedFileList) {
+                    if (uploadedFile.isFile()) {
+                        LOG.debug("Deleting file: {}", uploadedFile.getName());
+                        if (!uploadedFile.delete()) {
+                            LOG.warn("There was a problem attempting to delete file: {}", uploadedFile.getName());
+                        }
+                    } else {
+                        LOG.debug("File: {} already deleted", uploadedFile.getName());
                     }
-                } else {
-                    LOG.debug("File: {} already deleted", uploadedFile.getName());
                 }
             }
+        } finally {
+            uploadedFiles = new HashMap<>();
+            parameters = new HashMap<>();
         }
     }
 

core/src/main/java/org/apache/struts2/dispatcher/multipart/UploadedFile.java

@@ -21,24 +21,48 @@ package org.apache.struts2.dispatcher.multipart;
 import java.io.Serializable;
 
 /**
- * Virtual representation of a uploaded file used by {@link MultiPartRequest}
+ * Virtual representation of an uploaded file used by {@link MultiPartRequest}
  */
 public interface UploadedFile<T> extends Serializable {
 
+    /**
+     * @return size of the content of file/stream/array
+     */
     Long length();
 
+    /**
+     * @return a local name of the file
+     */
     String getName();
 
+    /**
+     * @return original file name from upload source
+     */
     String getOriginalName();
 
+    /**
+     * @return indicates if this is a real file or maybe just in-memory stream
+     */
     boolean isFile();
 
+    /**
+     * @return removes a local copy of the uploaded file/stream
+     */
     boolean delete();
 
+    /**
+     * @return an absolute path of the file if possible
+     */
     String getAbsolutePath();
 
+    /**
+     * @return content of the upload file
+     */
     T getContent();
 
+    /**
+     * @return content type of the uploaded file
+     */
     String getContentType();
 
 }

core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java

@@ -30,7 +30,10 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -208,34 +211,23 @@ abstract class AbstractMultiPartRequestTest<T> {
             ;
         });
 
+        List<UploadedFile<T>> uploadedFiles = new ArrayList<>();
+        for (Map.Entry<String, List<UploadedFile<T>>> entry : multiPart.uploadedFiles.entrySet()) {
+            uploadedFiles.addAll(entry.getValue());
+        }
+
         // when
         multiPart.cleanUp();
 
         // then
-        assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
-                .asList()
-                .containsOnly("file1", "file2");
-        assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
-            assertThat(file.isFile())
-                    .isFalse();
-            assertThat(file.getOriginalName())
-                    .isEqualTo("test1.csv");
-            assertThat(file.getContentType())
-                    .isEqualTo("text/csv");
+        assertThat(multiPart.uploadedFiles)
+                .isEmpty();
+        assertThat(multiPart.parameters)
+                .isEmpty();
+        assertThat(uploadedFiles).allSatisfy(file -> {
             assertThat(file.getContent()).asInstanceOf(InstanceOfAssertFactories.FILE)
                     .doesNotExist();
         });
-        assertThat(multiPart.getFile("file2")).allSatisfy(file -> {
-            assertThat(file.isFile())
-                    .isFalse();
-            assertThat(file.getOriginalName())
-                    .isEqualTo("test2.csv");
-            assertThat(file.getContentType())
-                    .isEqualTo("text/csv");
-            assertThat(file.getContent())
-                    .asInstanceOf(InstanceOfAssertFactories.FILE)
-                    .doesNotExist();
-        });
     }
 
     @Test