(commons-codec) branch master updated: Use try-with-resources

[ggregory]

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-codec.git


The following commit(s) were added to refs/heads/master by this push:
     new ce6872d8 Use try-with-resources
ce6872d8 is described below

commit ce6872d83a8d8f9e90f099062060cd45f01217be
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Apr 4 08:45:26 2024 -0400

    Use try-with-resources
---
 .../codec/binary/Base32InputStreamTest.java        | 33 +++++++++-------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java 
b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
index 81e17d24..2c6c4c44 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -248,33 +248,28 @@ public class Base32InputStreamTest {
      *             Usually signifies a bug in the Base32 commons-codec 
implementation.
      */
     private void testByChunk(final byte[] encoded, final byte[] decoded, final 
int chunkSize, final byte[] separator) throws Exception {
-
         // Start with encode.
-        InputStream in;
-
-        in = new Base32InputStream(new ByteArrayInputStream(decoded), true, 
chunkSize, separator);
-        byte[] output = BaseNTestData.streamToBytes(in);
-
-        assertEquals(-1, in.read(), "EOF");
-        assertEquals(-1, in.read(), "Still EOF");
-        assertArrayEquals(encoded, output, "Streaming base32 encode");
-
+        try (InputStream in = new Base32InputStream(new 
ByteArrayInputStream(decoded), true, chunkSize, separator)) {
+            final byte[] output = BaseNTestData.streamToBytes(in);
+            assertEquals(-1, in.read(), "EOF");
+            assertEquals(-1, in.read(), "Still EOF");
+            assertArrayEquals(encoded, output, "Streaming base32 encode");
+        }
         // Now let's try to decode.
-        in = new Base32InputStream(new ByteArrayInputStream(encoded));
-        output = BaseNTestData.streamToBytes(in);
-
-        assertEquals(-1, in.read(), "EOF");
-        assertEquals(-1, in.read(), "Still EOF");
-        assertArrayEquals(decoded, output, "Streaming base32 decode");
+        try (InputStream in = new Base32InputStream(new 
ByteArrayInputStream(encoded))) {
+            final byte[] output = BaseNTestData.streamToBytes(in);
 
+            assertEquals(-1, in.read(), "EOF");
+            assertEquals(-1, in.read(), "Still EOF");
+            assertArrayEquals(decoded, output, "Streaming base32 decode");
+        }
         // I always wanted to do this! (wrap encoder with decoder etc.).
-        in = new ByteArrayInputStream(decoded);
+        InputStream in = new ByteArrayInputStream(decoded);
         for (int i = 0; i < 10; i++) {
             in = new Base32InputStream(in, true, chunkSize, separator);
             in = new Base32InputStream(in, false);
         }
-        output = BaseNTestData.streamToBytes(in);
-
+        final byte[] output = BaseNTestData.streamToBytes(in);
         assertEquals(-1, in.read(), "EOF");
         assertEquals(-1, in.read(), "Still EOF");
         assertArrayEquals(decoded, output, "Streaming base32 wrap-wrap-wrap!");