Use IOUtils.close[Quietly]()

Author: garydgregory

pom.xml

@@ -207,7 +207,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.21.1-SNAPSHOT</version>
+      <version>2.22.0-SNAPSHOT</version>
     </dependency>    
     <dependency>
       <groupId>org.apache.commons</groupId>

src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java

@@ -629,9 +629,7 @@ private SevenZFile(final Builder builder) throws IOException {
             archive = readHeaders(password);
             this.password = password != null ? Arrays.copyOf(password, password.length) : null;
         } catch (final ArithmeticException | IllegalArgumentException e) {
-            final ArchiveException archiveException = new ArchiveException(e);
-            IOUtils.close(channel, archiveException::addSuppressed);
-            throw archiveException;
+            throw IOUtils.closeQuietly(channel, new ArchiveException(e));
         }
     }
 

src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java

@@ -192,9 +192,8 @@ private TarFile(final Builder builder) throws IOException {
             while ((entry = getNextTarEntry()) != null) {
                 entries.add(entry);
             }
-        } catch (final IOException ex) {
-            IOUtils.close(archive, ex::addSuppressed);
-            throw ex;
+        } catch (final IOException e) {
+            throw IOUtils.closeQuietly(archive, e);
         }
     }
 

src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java

@@ -756,12 +756,8 @@ private ZipFile(final Builder builder) throws IOException {
             }
             fillNameMap();
         } catch (final IOException e) {
-            final ArchiveException archiveException = e instanceof ArchiveException
-                    ? (ArchiveException) e
-                    : new ArchiveException("Error reading Zip content from " + builder.getName(), (Throwable) e);
             this.closed = true;
-            IOUtils.close(archive, archiveException::addSuppressed);
-            throw archiveException;
+            throw IOUtils.closeQuietly(archive, e);
         }
     }
 

src/test/java/org/apache/commons/compress/archivers/tar/TarCompress714Test.java

@@ -21,9 +21,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.io.EOFException;
 import java.io.IOException;
 
-import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.junit.jupiter.api.Test;
 
@@ -48,7 +48,7 @@ public void testIllegalPosition() throws IOException {
                 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -65,
                 -1, -126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -128, -1, -1, -1, -1, 0, -122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -128, 0, 0, 0, 0, 35, 0, 53, 0, 0, 0,
                 0, 0, 0, 32, 56, 0, 0, 0, 0, 0, 0, 0 };
-        assertThrows(ArchiveException.class, () -> TarFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
-        assertThrows(ArchiveException.class, () -> TarFile.builder().setByteArray(data).get());
+        assertThrows(EOFException.class, () -> TarFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
+        assertThrows(EOFException.class, () -> TarFile.builder().setByteArray(data).get());
     }
 }

src/test/java/org/apache/commons/compress/archivers/zip/ZipCompress714Test.java

@@ -21,9 +21,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.io.EOFException;
 import java.io.IOException;
 
-import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.junit.jupiter.api.Test;
 
@@ -35,7 +35,7 @@ public class ZipCompress714Test {
     @Test
     public void testIllegalPosition() throws IOException {
         final byte[] data = { 80, 75, 5, 6, -127, 80, 75, 5, 6, 7, -127, -127, -127, 80, 74, 7, 8, -127, -127, -127, -127, -127 };
-        assertThrows(ArchiveException.class, () -> ZipFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
-        assertThrows(ArchiveException.class, () -> ZipFile.builder().setByteArray(data).get());
+        assertThrows(EOFException.class, () -> ZipFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
+        assertThrows(EOFException.class, () -> ZipFile.builder().setByteArray(data).get());
     }
 }