Repository: commons-compress Updated Branches: refs/heads/master 77388c82c -> 32c30f6f0
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java ---------------------------------------------------------------------- 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 b713ed3..81f0d77 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java @@ -42,17 +42,11 @@ public final class DeflateTestCase extends AbstractTestCase { public void testDeflateCreation() throws Exception { final File input = getFile("test1.xml"); final File output = new File(dir, "test1.xml.deflatez"); - final OutputStream out = new FileOutputStream(output); - try { - final CompressorOutputStream cos = new CompressorStreamFactory() - .createCompressorOutputStream("deflate", out); // zlib header is used by default - try { + try (OutputStream out = new FileOutputStream(output)) { + try (CompressorOutputStream cos = new CompressorStreamFactory() + .createCompressorOutputStream("deflate", out)) { IOUtils.copy(new FileInputStream(input), cos); - } finally { - cos.close(); } - } finally { - out.close(); } } @@ -65,18 +59,12 @@ public final class DeflateTestCase extends AbstractTestCase { public void testRawDeflateCreation() throws Exception { final File input = getFile("test1.xml"); final File output = new File(dir, "test1.xml.deflate"); - final OutputStream out = new FileOutputStream(output); - try { + try (OutputStream out = new FileOutputStream(output)) { final DeflateParameters params = new DeflateParameters(); params.setWithZlibHeader(false); - final CompressorOutputStream cos = new DeflateCompressorOutputStream(out, params); - try { + try (CompressorOutputStream cos = new DeflateCompressorOutputStream(out, params)) { IOUtils.copy(new FileInputStream(input), cos); - } finally { - cos.close(); } - } finally { - out.close(); } } @@ -89,10 +77,9 @@ public final class DeflateTestCase extends AbstractTestCase { public void testDeflateUnarchive() throws Exception { final File input = getFile("bla.tar.deflatez"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream("deflate", is); // zlib header is expected by default + .createCompressorInputStream("deflate", is); // zlib header is expected by default FileOutputStream out = null; try { out = new FileOutputStream(output); @@ -103,8 +90,6 @@ public final class DeflateTestCase extends AbstractTestCase { } in.close(); } - } finally { - is.close(); } } @@ -117,8 +102,7 @@ public final class DeflateTestCase extends AbstractTestCase { public void testRawDeflateUnarchive() throws Exception { final File input = getFile("bla.tar.deflate"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final DeflateParameters params = new DeflateParameters(); params.setWithZlibHeader(false); final CompressorInputStream in = new DeflateCompressorInputStream(is, params); @@ -132,8 +116,6 @@ public final class DeflateTestCase extends AbstractTestCase { } in.close(); } - } finally { - is.close(); } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java ---------------------------------------------------------------------- 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 f8f04c4..9af2518 100644 --- a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java @@ -70,8 +70,7 @@ public final class FramedSnappyTestCase private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.sz"); final File output = new File(dir, "bla.tar"); - final FileInputStream is = new FileInputStream(input); - try { + 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)); @@ -86,21 +85,13 @@ public final class FramedSnappyTestCase } in.close(); } - } finally { - is.close(); } final File original = getFile("bla.tar"); - final FileInputStream written = new FileInputStream(output); - try { - final FileInputStream orig = new FileInputStream(original); - try { + try (FileInputStream written = new FileInputStream(output)) { + try (FileInputStream orig = new FileInputStream(original)) { assertArrayEquals(IOUtils.toByteArray(written), - IOUtils.toByteArray(orig)); - } finally { - orig.close(); + IOUtils.toByteArray(orig)); } - } finally { - written.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java ---------------------------------------------------------------------- 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 624abeb..62c7b15 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java @@ -45,17 +45,11 @@ public final class GZipTestCase extends AbstractTestCase { public void testGzipCreation() throws Exception { final File input = getFile("test1.xml"); final File output = new File(dir, "test1.xml.gz"); - final OutputStream out = new FileOutputStream(output); - try { - final CompressorOutputStream cos = new CompressorStreamFactory() - .createCompressorOutputStream("gz", out); - try { + try (OutputStream out = new FileOutputStream(output)) { + try (CompressorOutputStream cos = new CompressorStreamFactory() + .createCompressorOutputStream("gz", out)) { IOUtils.copy(new FileInputStream(input), cos); - } finally { - cos.close(); } - } finally { - out.close(); } } @@ -63,10 +57,9 @@ public final class GZipTestCase extends AbstractTestCase { public void testGzipUnarchive() throws Exception { final File input = getFile("bla.tgz"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream("gz", is); + .createCompressorInputStream("gz", is); FileOutputStream out = null; try { out = new FileOutputStream(output); @@ -77,46 +70,31 @@ public final class GZipTestCase extends AbstractTestCase { } in.close(); } - } finally { - is.close(); } } @Test public void testConcatenatedStreamsReadFirstOnly() throws Exception { final File input = getFile("multiple.gz"); - final InputStream is = new FileInputStream(input); - try { - final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream("gz", is); - try { + try (InputStream is = new FileInputStream(input)) { + try (CompressorInputStream in = new CompressorStreamFactory() + .createCompressorInputStream("gz", is)) { assertEquals('a', in.read()); assertEquals(-1, in.read()); - } finally { - in.close(); } - } finally { - is.close(); } } @Test public void testConcatenatedStreamsReadFully() throws Exception { final File input = getFile("multiple.gz"); - final InputStream is = new FileInputStream(input); - try { - final CompressorInputStream in = - new GzipCompressorInputStream(is, true); - try { + try (InputStream is = new FileInputStream(input)) { + try (CompressorInputStream in = new GzipCompressorInputStream(is, true)) { assertEquals('a', in.read()); assertEquals('b', in.read()); assertEquals(0, in.available()); assertEquals(-1, in.read()); - } finally { - in.close(); } - } finally { - is.close(); } } @@ -163,12 +141,9 @@ public final class GZipTestCase extends AbstractTestCase { @Test public void testInteroperabilityWithGzipCompressorInputStream() throws Exception { - final FileInputStream fis = new FileInputStream(getFile("test3.xml")); byte[] content; - try { + try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); - } finally { - fis.close(); } final ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -192,12 +167,9 @@ public final class GZipTestCase extends AbstractTestCase { @Test public void testInteroperabilityWithGZIPInputStream() throws Exception { - final FileInputStream fis = new FileInputStream(getFile("test3.xml")); byte[] content; - try { + try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); - } finally { - fis.close(); } final ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -238,12 +210,9 @@ public final class GZipTestCase extends AbstractTestCase { } private void testExtraFlags(final int compressionLevel, final int flag) throws Exception { - final FileInputStream fis = new FileInputStream(getFile("test3.xml")); byte[] content; - try { + try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); - } finally { - fis.close(); } final ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -295,13 +264,9 @@ public final class GZipTestCase extends AbstractTestCase { parameters.setOperatingSystem(13); parameters.setFilename("test3.xml"); parameters.setComment("Umlaute möglich?"); - final GzipCompressorOutputStream out = new GzipCompressorOutputStream(bout, parameters); - final FileInputStream fis = new FileInputStream(getFile("test3.xml")); - try { + try (GzipCompressorOutputStream out = new GzipCompressorOutputStream(bout, parameters); FileInputStream fis = new FileInputStream(getFile("test3" + + ".xml"))) { IOUtils.copy(fis, out); - } finally { - fis.close(); - out.close(); } final GzipCompressorInputStream input = http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java ---------------------------------------------------------------------- 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 12381bd..a880cf3 100644 --- a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java @@ -36,12 +36,9 @@ public final class LZMATestCase extends AbstractTestCase { public void testLZMAUnarchive() throws Exception { final File input = getFile("bla.tar.lzma"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final CompressorInputStream in = new LZMACompressorInputStream(is); copy(in, output); - } finally { - is.close(); } } @@ -49,13 +46,10 @@ public final class LZMATestCase extends AbstractTestCase { public void testLZMAUnarchiveWithAutodetection() throws Exception { final File input = getFile("bla.tar.lzma"); final File output = new File(dir, "bla.tar"); - final InputStream is = new BufferedInputStream(new FileInputStream(input)); - try { + try (InputStream is = new BufferedInputStream(new FileInputStream(input))) { final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream(is); + .createCompressorInputStream(is); copy(in, output); - } finally { - is.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java index 6c11dd0..1896d10 100644 --- a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java @@ -67,13 +67,12 @@ public final class Pack200TestCase extends AbstractTestCase { private void jarUnarchiveAll(final boolean useFile, final Pack200Strategy mode) throws Exception { final File input = getFile("bla.pack"); - final InputStream is = useFile - ? new Pack200CompressorInputStream(input, mode) - : new Pack200CompressorInputStream(new FileInputStream(input), - mode); - try { + try (InputStream is = useFile + ? new Pack200CompressorInputStream(input, mode) + : new Pack200CompressorInputStream(new FileInputStream(input), + mode)) { final ArchiveInputStream in = new ArchiveStreamFactory() - .createArchiveInputStream("jar", is); + .createArchiveInputStream("jar", is); ArchiveEntry entry = in.getNextEntry(); while (entry != null) { @@ -91,8 +90,6 @@ public final class Pack200TestCase extends AbstractTestCase { } in.close(); - } finally { - is.close(); } } @@ -112,12 +109,10 @@ public final class Pack200TestCase extends AbstractTestCase { final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); - final OutputStream out = - new Pack200CompressorOutputStream(new FileOutputStream(output), - mode); - try { + try (OutputStream out = new Pack200CompressorOutputStream(new FileOutputStream(output), + mode)) { final ArchiveOutputStream os = new ArchiveStreamFactory() - .createArchiveOutputStream("jar", out); + .createArchiveOutputStream("jar", out); os.putArchiveEntry(new ZipArchiveEntry("testdata/test1.xml")); IOUtils.copy(new FileInputStream(file1), os); @@ -128,57 +123,43 @@ public final class Pack200TestCase extends AbstractTestCase { os.closeArchiveEntry(); os.close(); - } finally { - out.close(); } - final InputStream is = new Pack200CompressorInputStream(output); - try { + try (InputStream is = new Pack200CompressorInputStream(output)) { final ArchiveInputStream in = new ArchiveStreamFactory() - .createArchiveInputStream("jar", is); + .createArchiveInputStream("jar", is); final List<String> files = new ArrayList<>(); files.add("testdata/test1.xml"); files.add("testdata/test2.xml"); checkArchiveContent(in, files); in.close(); - } finally { - is.close(); } } @Test public void testGoodSignature() throws Exception { - final InputStream is = new FileInputStream(getFile("bla.pack")); - try { + try (InputStream is = new FileInputStream(getFile("bla.pack"))) { final byte[] sig = new byte[4]; is.read(sig); assertTrue(Pack200CompressorInputStream.matches(sig, 4)); - } finally { - is.close(); } } @Test public void testBadSignature() throws Exception { - final InputStream is = new FileInputStream(getFile("bla.jar")); - try { + try (InputStream is = new FileInputStream(getFile("bla.jar"))) { final byte[] sig = new byte[4]; is.read(sig); assertFalse(Pack200CompressorInputStream.matches(sig, 4)); - } finally { - is.close(); } } @Test public void testShortSignature() throws Exception { - final InputStream is = new FileInputStream(getFile("bla.pack")); - try { + try (InputStream is = new FileInputStream(getFile("bla.pack"))) { final byte[] sig = new byte[2]; is.read(sig); assertFalse(Pack200CompressorInputStream.matches(sig, 2)); - } finally { - is.close(); } } @@ -186,10 +167,8 @@ public final class Pack200TestCase extends AbstractTestCase { public void testInputStreamMethods() throws Exception { final Map<String, String> m = new HashMap<>(); m.put("foo", "bar"); - final InputStream is = - new Pack200CompressorInputStream(new FileInputStream(getFile("bla.jar")), - m); - try { + try (InputStream is = new Pack200CompressorInputStream(new FileInputStream(getFile("bla.jar")), + m)) { // packed file is a jar, which is a zip so it starts with // a local file header assertTrue(is.markSupported()); @@ -204,8 +183,6 @@ public final class Pack200TestCase extends AbstractTestCase { is.reset(); assertEquals(0x50, is.read()); assertTrue(is.available() > 0); - } finally { - is.close(); } } @@ -214,14 +191,11 @@ public final class Pack200TestCase extends AbstractTestCase { final File output = new File(dir, "bla.pack"); final Map<String, String> m = new HashMap<>(); m.put("foo", "bar"); - final OutputStream out = new FileOutputStream(output); - try { + try (OutputStream out = new FileOutputStream(output)) { final OutputStream os = new Pack200CompressorOutputStream(out, m); os.write(1); os.write(new byte[] { 2, 3 }); os.close(); - } finally { - out.close(); } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java ---------------------------------------------------------------------- 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 6718340..cd605a9 100644 --- a/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java @@ -40,17 +40,11 @@ public final class XZTestCase extends AbstractTestCase { System.out.println("XZTestCase: HeapMax="+max+" bytes "+(double)max/(1024*1024)+" MB"); final File input = getFile("test1.xml"); final File output = new File(dir, "test1.xml.xz"); - final OutputStream out = new FileOutputStream(output); - try { - final CompressorOutputStream cos = new CompressorStreamFactory() - .createCompressorOutputStream("xz", out); - try { + try (OutputStream out = new FileOutputStream(output)) { + try (CompressorOutputStream cos = new CompressorStreamFactory() + .createCompressorOutputStream("xz", out)) { IOUtils.copy(new FileInputStream(input), cos); - } finally { - cos.close(); } - } finally { - out.close(); } } @@ -58,10 +52,9 @@ public final class XZTestCase extends AbstractTestCase { public void testXZUnarchive() throws Exception { final File input = getFile("bla.tar.xz"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream("xz", is); + .createCompressorInputStream("xz", is); FileOutputStream out = null; try { out = new FileOutputStream(output); @@ -72,46 +65,31 @@ public final class XZTestCase extends AbstractTestCase { } in.close(); } - } finally { - is.close(); } } @Test public void testConcatenatedStreamsReadFirstOnly() throws Exception { final File input = getFile("multiple.xz"); - final InputStream is = new FileInputStream(input); - try { - final CompressorInputStream in = new CompressorStreamFactory() - .createCompressorInputStream("xz", is); - try { + try (InputStream is = new FileInputStream(input)) { + try (CompressorInputStream in = new CompressorStreamFactory() + .createCompressorInputStream("xz", is)) { assertEquals('a', in.read()); assertEquals(-1, in.read()); - } finally { - in.close(); } - } finally { - is.close(); } } @Test public void testConcatenatedStreamsReadFully() throws Exception { final File input = getFile("multiple.xz"); - final InputStream is = new FileInputStream(input); - try { - final CompressorInputStream in = - new XZCompressorInputStream(is, true); - try { + try (InputStream is = new FileInputStream(input)) { + try (CompressorInputStream in = new XZCompressorInputStream(is, true)) { assertEquals('a', in.read()); assertEquals('b', in.read()); assertEquals(0, in.available()); assertEquals(-1, in.read()); - } finally { - in.close(); } - } finally { - is.close(); } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java ---------------------------------------------------------------------- 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 f2804a9..b80a4a0 100644 --- a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java @@ -81,8 +81,7 @@ public final class ZTestCase extends AbstractTestCase { private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.Z"); final File output = new File(dir, "bla.tar"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final InputStream in = wrapper.wrap(is); FileOutputStream out = null; try { @@ -94,8 +93,6 @@ public final class ZTestCase extends AbstractTestCase { } in.close(); } - } finally { - is.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java index 0a2a3b5..c045a7d 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java @@ -31,11 +31,8 @@ public class BZip2CompressorInputStreamTest { @Test(expected = IOException.class) public void shouldThrowAnIOExceptionWhenAppliedToAZipFile() throws Exception { - final FileInputStream in = new FileInputStream(getFile("bla.zip")); - try { + try (FileInputStream in = new FileInputStream(getFile("bla.zip"))) { new BZip2CompressorInputStream(in); - } finally { - in.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java index e17b6a0..1d8261e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java @@ -33,58 +33,46 @@ public class DeflateCompressorInputStreamTest { @Test public void availableShouldReturnNonZero() throws IOException { final File input = AbstractTestCase.getFile("bla.tar.deflatez"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final DeflateCompressorInputStream in = - new DeflateCompressorInputStream(is); + new DeflateCompressorInputStream(is); Assert.assertTrue(in.available() > 0); in.close(); - } finally { - is.close(); } } @Test public void shouldBeAbleToSkipAByte() throws IOException { final File input = AbstractTestCase.getFile("bla.tar.deflatez"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final DeflateCompressorInputStream in = - new DeflateCompressorInputStream(is); + new DeflateCompressorInputStream(is); Assert.assertEquals(1, in.skip(1)); in.close(); - } finally { - is.close(); } } @Test public void singleByteReadWorksAsExpected() throws IOException { final File input = AbstractTestCase.getFile("bla.tar.deflatez"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final DeflateCompressorInputStream in = - new DeflateCompressorInputStream(is); + new DeflateCompressorInputStream(is); // tar header starts with filename "test1.xml" Assert.assertEquals('t', in.read()); in.close(); - } finally { - is.close(); } } @Test public void singleByteReadReturnsMinusOneAtEof() throws IOException { final File input = AbstractTestCase.getFile("bla.tar.deflatez"); - final InputStream is = new FileInputStream(input); - try { + try (InputStream is = new FileInputStream(input)) { final DeflateCompressorInputStream in = - new DeflateCompressorInputStream(is); + new DeflateCompressorInputStream(is); IOUtils.toByteArray(in); Assert.assertEquals(-1, in.read()); in.close(); - } finally { - is.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java index 83f8d32..3874f75 100644 --- a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java @@ -40,10 +40,9 @@ public final class Pack200UtilsTest extends AbstractTestCase { try { Pack200Utils.normalize(input, output[1], new HashMap<String, String>()); - final FileInputStream is = new FileInputStream(output[1]); - try { + try (FileInputStream is = new FileInputStream(output[1])) { final ArchiveInputStream in = new ArchiveStreamFactory() - .createArchiveInputStream("jar", is); + .createArchiveInputStream("jar", is); ArchiveEntry entry = in.getNextEntry(); while (entry != null) { @@ -61,8 +60,6 @@ public final class Pack200UtilsTest extends AbstractTestCase { } in.close(); - } finally { - is.close(); } } finally { output[1].delete(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/32c30f6f/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java ---------------------------------------------------------------------- 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 a1992a0..cca9495 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 @@ -41,11 +41,8 @@ public final class FramedSnappyCompressorInputStreamTest assertFalse(FramedSnappyCompressorInputStream.matches(new byte[10], 10)); final byte[] b = new byte[12]; final File input = getFile("bla.tar.sz"); - final FileInputStream in = new FileInputStream(input); - try { + try (FileInputStream in = new FileInputStream(input)) { IOUtils.readFully(in, b); - } finally { - in.close(); } assertFalse(FramedSnappyCompressorInputStream.matches(b, 9)); assertTrue(FramedSnappyCompressorInputStream.matches(b, 10)); @@ -57,10 +54,9 @@ public final class FramedSnappyCompressorInputStreamTest */ @Test public void testLoremIpsum() throws Exception { - final FileInputStream isSz = new FileInputStream(getFile("lorem-ipsum.txt.sz")); final File outputSz = new File(dir, "lorem-ipsum.1"); final File outputGz = new File(dir, "lorem-ipsum.2"); - try { + try (FileInputStream isSz = new FileInputStream(getFile("lorem-ipsum.txt.sz"))) { InputStream in = new FramedSnappyCompressorInputStream(isSz); FileOutputStream out = null; try { @@ -72,8 +68,7 @@ public final class FramedSnappyCompressorInputStreamTest } in.close(); } - final FileInputStream isGz = new FileInputStream(getFile("lorem-ipsum.txt.gz")); - try { + try (FileInputStream isGz = new FileInputStream(getFile("lorem-ipsum.txt.gz"))) { in = new GzipCompressorInputStream(isGz); try { out = new FileOutputStream(outputGz); @@ -84,37 +79,24 @@ public final class FramedSnappyCompressorInputStreamTest } in.close(); } - } finally { - isGz.close(); } - } finally { - isSz.close(); } - final FileInputStream sz = new FileInputStream(outputSz); - try { - final FileInputStream gz = new FileInputStream(outputGz); - try { + try (FileInputStream sz = new FileInputStream(outputSz)) { + try (FileInputStream gz = new FileInputStream(outputGz)) { assertArrayEquals(IOUtils.toByteArray(sz), - IOUtils.toByteArray(gz)); - } finally { - gz.close(); + IOUtils.toByteArray(gz)); } - } finally { - sz.close(); } } @Test public void testRemainingChunkTypes() throws Exception { - final FileInputStream isSz = new FileInputStream(getFile("mixed.txt.sz")); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - try { + try (FileInputStream isSz = new FileInputStream(getFile("mixed.txt.sz"))) { final FramedSnappyCompressorInputStream in = new FramedSnappyCompressorInputStream(isSz); IOUtils.copy(in, out); out.close(); - } finally { - isSz.close(); } assertArrayEquals(new byte[] { '1', '2', '3', '4', @@ -130,8 +112,7 @@ public final class FramedSnappyCompressorInputStreamTest @Test public void testAvailable() throws Exception { - final FileInputStream isSz = new FileInputStream(getFile("mixed.txt.sz")); - try { + try (FileInputStream isSz = new FileInputStream(getFile("mixed.txt.sz"))) { final FramedSnappyCompressorInputStream in = new FramedSnappyCompressorInputStream(isSz); assertEquals(0, in.available()); // no chunk read so far assertEquals('1', in.read()); @@ -143,8 +124,6 @@ public final class FramedSnappyCompressorInputStreamTest assertEquals('5', in.read()); assertEquals(19, in.available()); // remainder of copy in.close(); - } finally { - isSz.close(); } } @@ -173,12 +152,10 @@ public final class FramedSnappyCompressorInputStreamTest @Test public void readIWAFile() throws Exception { - final ZipFile zip = new ZipFile(getFile("testNumbersNew.numbers")); - try { - final InputStream is = zip.getInputStream(zip.getEntry("Index/Document.iwa")); - try { + try (ZipFile zip = new ZipFile(getFile("testNumbersNew.numbers"))) { + try (InputStream is = zip.getInputStream(zip.getEntry("Index/Document.iwa"))) { final FramedSnappyCompressorInputStream in = - new FramedSnappyCompressorInputStream(is, FramedSnappyDialect.IWORK_ARCHIVE); + new FramedSnappyCompressorInputStream(is, FramedSnappyDialect.IWORK_ARCHIVE); FileOutputStream out = null; try { out = new FileOutputStream(new File(dir, "snappyIWATest.raw")); @@ -189,11 +166,7 @@ public final class FramedSnappyCompressorInputStreamTest } in.close(); } - } finally { - is.close(); } - } finally { - zip.close(); } }
