[commons-fileupload] 01/03: Remove FileItemInputIterator.getFileItems():

[gg...@apache.org]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git

commit 1afd75887889db97d0c342c0ae1c481a37faf75e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 13 08:19:42 2023 -0400

    Remove FileItemInputIterator.getFileItems():
    
    - Redundant with AbstractFileUpload.parseRequest(RequestContext)
    - It is broken (does not read contents)
    - Never tested (trying to add new tests revealed the above)
---
 .../commons/fileupload2/FileItemInputIterator.java   |  3 ---
 .../fileupload2/FileItemInputIteratorImpl.java       | 20 --------------------
 2 files changed, 23 deletions(-)

diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIterator.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIterator.java
index 34d4e73..76497d1 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIterator.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIterator.java
@@ -17,7 +17,6 @@
 package org.apache.commons.fileupload2;
 
 import java.io.IOException;
-import java.util.List;
 
 import javax.naming.SizeLimitExceededException;
 
@@ -28,8 +27,6 @@ import org.apache.commons.io.function.IOIterator;
  */
 public interface FileItemInputIterator extends IOIterator<FileItemInput> {
 
-    List<FileItem> getFileItems() throws FileUploadException, IOException;
-
     /**
      * Gets the maximum size of a single file. An {@link FileUploadByteCountLimitException} will be thrown, if there is an uploaded file, which is exceeding
      * this value. By default, this value will be copied from the {@link AbstractFileUpload#getFileSizeMax() FileUploadBase} object, however, the user may
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIteratorImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIteratorImpl.java
index e58671b..213067c 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIteratorImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemInputIteratorImpl.java
@@ -19,9 +19,7 @@ package org.apache.commons.fileupload2;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -194,24 +192,6 @@ class FileItemInputIteratorImpl implements FileItemInputIterator {
         }
     }
 
-    @Override
-    public List<FileItem> getFileItems() throws FileUploadException, IOException {
-        final List<FileItem> items = new ArrayList<>();
-        while (hasNext()) {
-            final FileItemInput fis = next();
-            // @formatter:off
-            final FileItem fileItem = fileUpload.getFileItemFactory().fileItemBuilder()
-                    .setFieldName(fis.getFieldName())
-                    .setContentType(fis.getContentType())
-                    .setFormField(fis.isFormField())
-                    .setFileName(fis.getName())
-                    .get();
-            // @formatter:on
-            items.add(fileItem);
-        }
-        return items;
-    }
-
     @Override
     public long getFileSizeMax() {
         return fileSizeMax;