[commons-io] branch master updated: Try with resources

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


The following commit(s) were added to refs/heads/master by this push:
     new fc3e627  Try with resources
fc3e627 is described below

commit fc3e6279986564ebb3f7c3ebb35be05f0dace7d1
Author: Sebb <s...@apache.org>
AuthorDate: Fri Aug 7 22:50:55 2020 +0100

    Try with resources
---
 .../io/output/FileWriterWithEncodingTest.java      | 37 +++++++---------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java 
b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java
index d5fa329..7a283af 100644
--- a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java
+++ b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java
@@ -100,17 +100,12 @@ public class FileWriterWithEncodingTest {
     }
 
     private void successfulRun(final FileWriterWithEncoding fw21) throws 
Exception {
-        FileWriter fw1 = null;
-        FileWriterWithEncoding fw2 = null;
-        try {
-            fw1 = new FileWriter(file1);  // default encoding
-            fw2 = fw21;
+        try (
+            FileWriter fw1 = new FileWriter(file1);  // default encoding
+            FileWriterWithEncoding fw2 = fw21;
+        ){
             writeTestPayload(fw1, fw2);
             checkFile(file1, file2);
-
-        } finally {
-            IOUtils.closeQuietly(fw1);
-            IOUtils.closeQuietly(fw2);
         }
         assertTrue(file1.exists());
         assertTrue(file2.exists());
@@ -119,11 +114,10 @@ public class FileWriterWithEncodingTest {
     @Test
     public void testDifferentEncoding() throws Exception {
         if (Charset.isSupported("UTF-16BE")) {
-            FileWriter fw1 = null;
-            FileWriterWithEncoding fw2 = null;
-            try {
-                fw1 = new FileWriter(file1);  // default encoding
-                fw2 = new FileWriterWithEncoding(file2, defaultEncoding);
+            try (
+                FileWriter fw1 = new FileWriter(file1);  // default encoding
+                FileWriterWithEncoding fw2 = new FileWriterWithEncoding(file2, 
defaultEncoding);
+            ){
                 writeTestPayload(fw1, fw2);
                 try {
                     checkFile(file1, file2);
@@ -132,19 +126,15 @@ public class FileWriterWithEncodingTest {
                     // success
                 }
 
-            } finally {
-                IOUtils.closeQuietly(fw1);
-                IOUtils.closeQuietly(fw2);
             }
             assertTrue(file1.exists());
             assertTrue(file2.exists());
         }
         if (Charset.isSupported("UTF-16LE")) {
-            FileWriter fw1 = null;
-            FileWriterWithEncoding fw2 = null;
-            try {
-                fw1 = new FileWriter(file1);  // default encoding
-                fw2 = new FileWriterWithEncoding(file2, defaultEncoding);
+            try (
+                FileWriter fw1 = new FileWriter(file1);  // default encoding
+                FileWriterWithEncoding fw2 = new FileWriterWithEncoding(file2, 
defaultEncoding);
+            ){
                 writeTestPayload(fw1, fw2);
                 try {
                     checkFile(file1, file2);
@@ -153,9 +143,6 @@ public class FileWriterWithEncodingTest {
                     // success
                 }
 
-            } finally {
-                IOUtils.closeQuietly(fw1);
-                IOUtils.closeQuietly(fw2);
             }
             assertTrue(file1.exists());
             assertTrue(file2.exists());