Simplify API

commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItem.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.CopyOption;
@@ -36,7 +35,6 @@
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.build.AbstractOrigin;
 import org.apache.commons.io.file.PathUtils;
-import org.apache.commons.io.function.Uncheck;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 
 /**
@@ -291,19 +289,19 @@ public DiskFileItem delete() throws IOException {
      * and cached.
      *
      * @return The contents of the file as an array of bytes or {@code null} if the data cannot be read.
-     * @throws UncheckedIOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      * @throws OutOfMemoryError     See {@link Files#readAllBytes(Path)}: If an array of the required size cannot be allocated, for example the file is larger
      *                              that {@code 2GB}
      */
     @Override
-    public byte[] get() throws UncheckedIOException {
+    public byte[] get() throws IOException {
         if (isInMemory()) {
             if (cachedContent == null && dfos != null) {
                 cachedContent = dfos.getData();
             }
             return cachedContent != null ? cachedContent.clone() : new byte[0];
         }
-        return Uncheck.get(() -> Files.readAllBytes(dfos.getFile().toPath()));
+        return Files.readAllBytes(dfos.getFile().toPath());
     }
 
     /**
@@ -442,9 +440,10 @@ public long getSize() {
      * </p>
      *
      * @return The contents of the file, as a string.
+     * @throws IOException if an I/O error occurs
      */
     @Override
-    public String getString() {
+    public String getString() throws IOException {
         return new String(get(), getCharset());
     }
 
@@ -453,6 +452,7 @@ public String getString() {
      *
      * @param charset The charset to use.
      * @return The contents of the file, as a string.
+     * @throws IOException if an I/O error occurs
      */
     @Override
     public String getString(final Charset charset) throws IOException {

commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/FileItem.java

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -57,9 +56,9 @@ public interface FileItem<F extends FileItem<F>> extends FileItemHeadersProvider
      * Gets the contents of the file item as a byte array.
      *
      * @return The contents of the file item as a byte array.
-     * @throws UncheckedIOException if an I/O error occurs
+     * @throws IOException if an I/O error occurs
      */
-    byte[] get() throws UncheckedIOException;
+    byte[] get() throws IOException;
 
     /**
      * Gets the content type passed by the browser or {@code null} if not defined.
@@ -113,8 +112,10 @@ public interface FileItem<F extends FileItem<F>> extends FileItemHeadersProvider
      * item.
      *
      * @return The contents of the item, as a string.
+     *
+     * @throws IOException if an I/O error occurs
      */
-    String getString();
+    String getString() throws IOException;
 
     /**
      * Gets the contents of the file item as a String, using the specified encoding. This method uses {@link #get()} to retrieve the contents of the item.

commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/AbstractFileUploadTest.java

@@ -99,7 +99,7 @@ public void testContentTypeAttachment() throws IOException {
      * @throws FileUploadException Test failure.
      */
     @Test
-    public void testEmptyFile() throws FileUploadException {
+    public void testEmptyFile() throws IOException {
         // @formatter:off
         final var fileItems = parseUpload (upload,
                                                 "-----1234\r\n" +
@@ -349,7 +349,7 @@ public void testFoldedHeaders() throws IOException {
      * @throws FileUploadException Test failure.
      */
     @Test
-    public void testIE5MacBug() throws FileUploadException {
+    public void testIE5MacBug() throws IOException {
         final var fileItems = parseUpload(upload,
         // @formatter:off
                 "-----1234\r\n" +