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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new d959766 Use try-with-resource.
d959766 is described below
commit d959766c1419a677f1583b31f654387a735e5589
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 21 10:26:10 2020 -0500
Use try-with-resource.
---
.../bzip2/BZip2CompressorOutputStream.java | 5 +----
.../commons/compress/archivers/SevenZTestCase.java | 8 +------
.../compress/archivers/tar/SparseFilesTest.java | 16 ++-----------
.../archivers/tar/TarArchiveInputStreamTest.java | 16 ++-----------
.../archivers/zip/EncryptedArchiveTest.java | 8 +------
.../commons/compress/archivers/zip/Lister.java | 8 +------
.../compress/archivers/zip/UTF8ZipFilesTest.java | 16 ++-----------
.../compress/archivers/zip/Zip64SupportIT.java | 22 ++++--------------
.../archivers/zip/ZipArchiveInputStreamTest.java | 26 ++++------------------
.../compress/compressors/DeflateTestCase.java | 25 +++++----------------
.../compress/compressors/FramedSnappyTestCase.java | 11 ++-------
.../commons/compress/compressors/GZipTestCase.java | 11 ++-------
.../commons/compress/compressors/LZMATestCase.java | 7 +-----
.../commons/compress/compressors/XZTestCase.java | 11 ++-------
.../commons/compress/compressors/ZTestCase.java | 11 ++-------
.../brotli/BrotliCompressorInputStreamTest.java | 11 ++-------
.../FramedSnappyCompressorInputStreamTest.java | 11 ++-------
.../zstandard/ZstdCompressorInputStreamTest.java | 11 ++-------
18 files changed, 39 insertions(+), 195 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index f92bb5f..a104b35 100644
---
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -501,11 +501,8 @@ public class BZip2CompressorOutputStream extends
CompressorOutputStream
@Override
public void close() throws IOException {
if (!closed) {
- final OutputStream outShadow = this.out;
- try {
+ try (OutputStream outShadow = this.out) {
finish();
- } finally {
- outShadow.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
index dd74e92..fc2a7b5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
@@ -206,18 +206,12 @@ public class SevenZTestCase extends AbstractTestCase {
}
private void copy(final File src, final SevenZOutputFile dst) throws
IOException {
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(src);
+ try (FileInputStream fis = new FileInputStream(src)) {
final byte[] buffer = new byte[8*1024];
int bytesRead;
while ((bytesRead = fis.read(buffer)) >= 0) {
dst.write(buffer, 0, bytesRead);
}
- } finally {
- if (fis != null) {
- fis.close();
- }
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
index 336df29..d528b65 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
@@ -39,9 +39,7 @@ public class SparseFilesTest extends AbstractTestCase {
@Test
public void testOldGNU() throws Throwable {
final File file = getFile("oldgnu_sparse.tar");
- TarArchiveInputStream tin = null;
- try {
- tin = new TarArchiveInputStream(new FileInputStream(file));
+ try (TarArchiveInputStream tin = new TarArchiveInputStream(new
FileInputStream(file))) {
final TarArchiveEntry ae = tin.getNextTarEntry();
assertEquals("sparsefile", ae.getName());
assertTrue(ae.isOldGNUSparse());
@@ -60,26 +58,16 @@ public class SparseFilesTest extends AbstractTestCase {
assertEquals(3101184L, sparseHeaders.get(2).getOffset());
assertEquals(0, sparseHeaders.get(2).getNumbytes());
- } finally {
- if (tin != null) {
- tin.close();
- }
}
}
@Test
public void testPaxGNU() throws Throwable {
final File file = getFile("pax_gnu_sparse.tar");
- TarArchiveInputStream tin = null;
- try {
- tin = new TarArchiveInputStream(new FileInputStream(file));
+ try (TarArchiveInputStream tin = new TarArchiveInputStream(new
FileInputStream(file))) {
assertPaxGNUEntry(tin, "0.0");
assertPaxGNUEntry(tin, "0.1");
assertPaxGNUEntry(tin, "1.0");
- } finally {
- if (tin != null) {
- tin.close();
- }
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
index d629975..3acf8fb 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
@@ -113,19 +113,13 @@ public class TarArchiveInputStreamTest extends
AbstractTestCase {
@Test
public void workaroundForBrokenTimeHeader() throws Exception {
- TarArchiveInputStream in = null;
- try {
- in = new TarArchiveInputStream(new
FileInputStream(getFile("simple-aix-native-tar.tar")));
+ try (TarArchiveInputStream in = new TarArchiveInputStream(new
FileInputStream(getFile("simple-aix-native-tar.tar")))) {
TarArchiveEntry tae = in.getNextTarEntry();
tae = in.getNextTarEntry();
assertEquals("sample/link-to-txt-file.lnk", tae.getName());
assertEquals(new Date(0), tae.getLastModifiedDate());
assertTrue(tae.isSymbolicLink());
assertTrue(tae.isCheckSumOK());
- } finally {
- if (in != null) {
- in.close();
- }
}
}
@@ -141,9 +135,7 @@ public class TarArchiveInputStreamTest extends
AbstractTestCase {
}
private void datePriorToEpoch(final String archive) throws Exception {
- TarArchiveInputStream in = null;
- try {
- in = new TarArchiveInputStream(new
FileInputStream(getFile(archive)));
+ try (TarArchiveInputStream in = new TarArchiveInputStream(new
FileInputStream(getFile(archive)))) {
final TarArchiveEntry tae = in.getNextTarEntry();
assertEquals("foo", tae.getName());
final Calendar cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
@@ -151,10 +143,6 @@ public class TarArchiveInputStreamTest extends
AbstractTestCase {
cal.set(Calendar.MILLISECOND, 0);
assertEquals(cal.getTime(), tae.getLastModifiedDate());
assertTrue(tae.isCheckSumOK());
- } finally {
- if (in != null) {
- in.close();
- }
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
index 8c04c52..d2e749a 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
@@ -56,9 +56,7 @@ public class EncryptedArchiveTest {
public void testReadPasswordEncryptedEntryViaStream()
throws IOException {
final File file = getFile("password-encrypted.zip");
- ZipArchiveInputStream zin = null;
- try {
- zin = new ZipArchiveInputStream(new FileInputStream(file));
+ try (ZipArchiveInputStream zin = new ZipArchiveInputStream(new
FileInputStream(file))) {
final ZipArchiveEntry zae = zin.getNextZipEntry();
assertEquals("LICENSE.txt", zae.getName());
assertTrue(zae.getGeneralPurposeBit().usesEncryption());
@@ -72,10 +70,6 @@ public class EncryptedArchiveTest {
assertSame(UnsupportedZipFeatureException.Feature.ENCRYPTION,
ex.getFeature());
}
- } finally {
- if (zin != null) {
- zin.close();
- }
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
index a633715..19f8e5d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
@@ -94,14 +94,8 @@ public final class Lister {
if (!f.getParentFile().exists()) {
f.getParentFile().mkdirs();
}
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(f);
+ try (FileOutputStream fos = new FileOutputStream(f)) {
IOUtils.copy(is, fos);
- } finally {
- if (fos != null) {
- fos.close();
- }
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
index 7c0b88b..7731a1e 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
@@ -114,16 +114,10 @@ public class UTF8ZipFilesTest extends AbstractTestCase {
public void testRead7ZipArchiveForStream() throws IOException {
final FileInputStream archive =
new FileInputStream(getFile("utf8-7zip-test.zip"));
- ZipArchiveInputStream zi = null;
- try {
- zi = new ZipArchiveInputStream(archive, CP437, false);
+ try (ZipArchiveInputStream zi = new ZipArchiveInputStream(archive,
CP437, false)) {
assertEquals(ASCII_TXT, zi.getNextEntry().getName());
assertEquals(OIL_BARREL_TXT, zi.getNextEntry().getName());
assertEquals(EURO_FOR_DOLLAR_TXT, zi.getNextEntry().getName());
- } finally {
- if (zi != null) {
- zi.close();
- }
}
}
@@ -242,14 +236,8 @@ public class UTF8ZipFilesTest extends AbstractTestCase {
throws IOException {
final FileInputStream archive =
new FileInputStream(getFile("utf8-7zip-test.zip"));
- ZipArchiveInputStream zi = null;
- try {
- zi = new ZipArchiveInputStream(archive, CP437, false);
+ try (ZipArchiveInputStream zi = new ZipArchiveInputStream(archive,
CP437, false)) {
assertRawNameOfAcsiiTxt((ZipArchiveEntry) zi.getNextEntry());
- } finally {
- if (zi != null) {
- zi.close();
- }
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
index 729eeda..a758fd2 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
@@ -2448,10 +2448,8 @@ public class Zip64SupportIT {
private static void read5GBOfZerosImpl(final File f, final String
expectedName)
throws IOException {
- final FileInputStream fin = new FileInputStream(f);
- ZipArchiveInputStream zin = null;
- try {
- zin = new ZipArchiveInputStream(fin);
+ try (FileInputStream fin = new FileInputStream(f);
+ ZipArchiveInputStream zin = new ZipArchiveInputStream(fin)) {
ZipArchiveEntry zae = zin.getNextZipEntry();
while (zae.isDirectory()) {
zae = zin.getNextZipEntry();
@@ -2473,11 +2471,6 @@ public class Zip64SupportIT {
assertEquals(FIVE_BILLION, read);
assertNull(zin.getNextZipEntry());
assertEquals(FIVE_BILLION, zae.getSize());
- } finally {
- if (zin != null) {
- zin.close();
- }
- fin.close(); // fin cannot be null here
}
}
@@ -2518,10 +2511,8 @@ public class Zip64SupportIT {
}
private static void read100KFilesImpl(final File f) throws IOException {
- final FileInputStream fin = new FileInputStream(f);
- ZipArchiveInputStream zin = null;
- try {
- zin = new ZipArchiveInputStream(fin);
+ try (FileInputStream fin = new FileInputStream(f);
+ ZipArchiveInputStream zin = new ZipArchiveInputStream(fin)) {
int files = 0;
ZipArchiveEntry zae = null;
while ((zae = zin.getNextZipEntry()) != null) {
@@ -2531,11 +2522,6 @@ public class Zip64SupportIT {
}
}
assertEquals(ONE_HUNDRED_THOUSAND, files);
- } finally {
- if (zin != null) {
- zin.close();
- }
- fin.close();
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
index c1112bc..ed7b7a7 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
@@ -60,17 +60,11 @@ public class ZipArchiveInputStreamTest {
*/
@Test
public void winzipBackSlashWorkaround() throws Exception {
- ZipArchiveInputStream in = null;
- try {
- in = new ZipArchiveInputStream(new
FileInputStream(getFile("test-winzip.zip")));
+ try (ZipArchiveInputStream in = new ZipArchiveInputStream(new
FileInputStream(getFile("test-winzip.zip")))) {
ZipArchiveEntry zae = in.getNextZipEntry();
zae = in.getNextZipEntry();
zae = in.getNextZipEntry();
assertEquals("\u00e4/", zae.getName());
- } finally {
- if (in != null) {
- in.close();
- }
}
}
@@ -123,14 +117,8 @@ public class ZipArchiveInputStreamTest {
*/
@Test
public void shouldReadNestedZip() throws IOException {
- ZipArchiveInputStream in = null;
- try {
- in = new ZipArchiveInputStream(new
FileInputStream(getFile("COMPRESS-219.zip")));
+ try (ZipArchiveInputStream in = new ZipArchiveInputStream(new
FileInputStream(getFile("COMPRESS-219.zip")))) {
extractZipInputStream(in);
- } finally {
- if (in != null) {
- in.close();
- }
}
}
@@ -265,9 +253,8 @@ public class ZipArchiveInputStreamTest {
final int expectedNumEntries = 2;
final InputStream is = ZipArchiveInputStreamTest.class
.getResourceAsStream("/archive_with_bytes_after_data.zip");
- final ZipArchiveInputStream zip = new ZipArchiveInputStream(is);
- try {
+ try (final ZipArchiveInputStream zip = new ZipArchiveInputStream(is)) {
int actualNumEntries = 0;
ZipArchiveEntry zae = zip.getNextZipEntry();
while (zae != null) {
@@ -276,8 +263,6 @@ public class ZipArchiveInputStreamTest {
zae = zip.getNextZipEntry();
}
assertEquals(expectedNumEntries, actualNumEntries);
- } finally {
- zip.close();
}
}
@@ -289,15 +274,12 @@ public class ZipArchiveInputStreamTest {
public void testThrowOnInvalidEntry() throws Exception {
final InputStream is = ZipArchiveInputStreamTest.class
.getResourceAsStream("/invalid-zip.zip");
- final ZipArchiveInputStream zip = new ZipArchiveInputStream(is);
- try {
+ try (final ZipArchiveInputStream zip = new ZipArchiveInputStream(is)) {
zip.getNextZipEntry();
fail("IOException expected");
} catch (final ZipException expected) {
assertTrue(expected.getMessage().contains("Unexpected record
signature"));
- } finally {
- zip.close();
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java
b/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java
index 468cb57..c4e4a09 100644
--- a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java
@@ -78,17 +78,11 @@ public final class DeflateTestCase extends AbstractTestCase
{
final File input = getFile("bla.tar.deflatez");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final CompressorInputStream in = new CompressorStreamFactory()
- .createCompressorInputStream("deflate", is); // zlib
header is expected by default
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ // zlib header is expected by default
+ try (CompressorInputStream in = new CompressorStreamFactory()
+ .createCompressorInputStream("deflate", is);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
@@ -105,16 +99,9 @@ public final class DeflateTestCase extends AbstractTestCase
{
try (InputStream is = new FileInputStream(input)) {
final DeflateParameters params = new DeflateParameters();
params.setWithZlibHeader(false);
- final CompressorInputStream in = new
DeflateCompressorInputStream(is, params);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ try (CompressorInputStream in = new
DeflateCompressorInputStream(is, params);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
index ec0f38e..1313e9b 100644
---
a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
+++
b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java
@@ -57,17 +57,10 @@ public final class FramedSnappyTestCase
try (FileInputStream is = new FileInputStream(input)) {
// the intermediate BufferedInputStream is there for mark
// support in the autodetection test
- final CompressorInputStream in = wrapper.wrap(new
BufferedInputStream(is));
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ try (CompressorInputStream in = wrapper.wrap(new
BufferedInputStream(is));
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
assertEquals(995, in.getBytesRead());
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
final File original = getFile("bla.tar");
diff --git
a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
index cf72611..d22822d 100644
--- a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
@@ -58,17 +58,10 @@ public final class GZipTestCase extends AbstractTestCase {
final File input = getFile("bla.tgz");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final CompressorInputStream in = new CompressorStreamFactory()
+ try (CompressorInputStream in = new CompressorStreamFactory()
.createCompressorInputStream("gz", is);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java
b/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java
index d5c717c..ad8c247 100644
--- a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java
@@ -105,14 +105,9 @@ public final class LZMATestCase extends AbstractTestCase {
}
private void copy(final InputStream in, final File output) throws
IOException {
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ try (FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
} finally {
- if (out != null) {
- out.close();
- }
in.close();
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
b/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
index cd605a9..f6cc028 100644
--- a/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
@@ -53,17 +53,10 @@ public final class XZTestCase extends AbstractTestCase {
final File input = getFile("bla.tar.xz");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final CompressorInputStream in = new CompressorStreamFactory()
+ try (CompressorInputStream in = new CompressorStreamFactory()
.createCompressorInputStream("xz", is);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
index 5e576df..10774aa 100644
--- a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java
@@ -66,16 +66,9 @@ public final class ZTestCase extends AbstractTestCase {
final File input = getFile("bla.tar.Z");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final InputStream in = wrapper.wrap(is);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ try (InputStream in = wrapper.wrap(is);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
index 579f451..51e7cea 100644
---
a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
@@ -153,17 +153,10 @@ public class BrotliCompressorInputStreamTest extends
AbstractTestCase {
final File input = getFile("bla.tar.br");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final CompressorInputStream in = new CompressorStreamFactory()
+ try (CompressorInputStream in = new CompressorStreamFactory()
.createCompressorInputStream("br", is);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java
index db985ba..d129990 100644
---
a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java
@@ -150,17 +150,10 @@ public final class FramedSnappyCompressorInputStreamTest
public void readIWAFile() throws Exception {
try (ZipFile zip = new ZipFile(getFile("testNumbersNew.numbers"))) {
try (InputStream is =
zip.getInputStream(zip.getEntry("Index/Document.iwa"))) {
- final FramedSnappyCompressorInputStream in =
+ try (FramedSnappyCompressorInputStream in =
new FramedSnappyCompressorInputStream(is,
FramedSnappyDialect.IWORK_ARCHIVE);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(new File(dir,
"snappyIWATest.raw"));
+ FileOutputStream out = new FileOutputStream(new
File(dir, "snappyIWATest.raw"))) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
index ccc9c18..4bedd3b 100644
---
a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
@@ -153,17 +153,10 @@ public class ZstdCompressorInputStreamTest extends
AbstractTestCase {
final File input = getFile("bla.tar.zst");
final File output = new File(dir, "bla.tar");
try (InputStream is = new FileInputStream(input)) {
- final CompressorInputStream in = new CompressorStreamFactory()
+ try (CompressorInputStream in = new CompressorStreamFactory()
.createCompressorInputStream("zstd", is);
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(output);
+ FileOutputStream out = new FileOutputStream(output)) {
IOUtils.copy(in, out);
- } finally {
- if (out != null) {
- out.close();
- }
- in.close();
}
}
}
