Use try-with-resources.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1748094 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/csv/CSVFormat.java

@@ -609,8 +609,8 @@ public boolean equals(final Object obj) {
      */
     public String format(final Object... values) {
         final StringWriter out = new StringWriter();
-        try {
-            new CSVPrinter(out, this).printRecord(values);
+        try (final CSVPrinter csvPrinter = new CSVPrinter(out, this)) {
+            csvPrinter.printRecord(values);
             return out.toString().trim();
         } catch (final IOException e) {
             // should not happen because a StringWriter does not do IO.

src/test/java/org/apache/commons/csv/CSVFileParserTest.java

@@ -116,19 +116,19 @@ public void testCSVFile() throws Exception {
 
         // Now parse the file and compare against the expected results
         // We use a buffered reader internally so no need to create one here.
-        final CSVParser parser = CSVParser.parse(new File(BASE, split[0]), Charset.defaultCharset(), format);
-        for (final CSVRecord record : parser) {
-            String parsed = Arrays.toString(record.values());
-            if (checkComments) {
-                final String comment = record.getComment().replace("\n", "\\n");
-                if (comment != null) {
-                    parsed += "#" + comment;
+        try (final CSVParser parser = CSVParser.parse(new File(BASE, split[0]), Charset.defaultCharset(), format)) {
+            for (final CSVRecord record : parser) {
+                String parsed = Arrays.toString(record.values());
+                if (checkComments) {
+                    final String comment = record.getComment().replace("\n", "\\n");
+                    if (comment != null) {
+                        parsed += "#" + comment;
+                    }
                 }
+                final int count = record.size();
+                assertEquals(testName, readTestData(), count + ":" + parsed);
             }
-            final int count = record.size();
-            assertEquals(testName, readTestData(), count + ":" + parsed);
         }
-        parser.close();
     }
 
     @Test
@@ -160,18 +160,18 @@ public void testCSVUrl() throws Exception {
 
         // Now parse the file and compare against the expected results
         final URL resource = ClassLoader.getSystemResource("CSVFileParser/" + split[0]);
-        final CSVParser parser = CSVParser.parse(resource, Charset.forName("UTF-8"), format);
-        for (final CSVRecord record : parser) {
-            String parsed = Arrays.toString(record.values());
-            if (checkComments) {
-                final String comment = record.getComment().replace("\n", "\\n");
-                if (comment != null) {
-                    parsed += "#" + comment;
+        try (final CSVParser parser = CSVParser.parse(resource, Charset.forName("UTF-8"), format)) {
+            for (final CSVRecord record : parser) {
+                String parsed = Arrays.toString(record.values());
+                if (checkComments) {
+                    final String comment = record.getComment().replace("\n", "\\n");
+                    if (comment != null) {
+                        parsed += "#" + comment;
+                    }
                 }
+                final int count = record.size();
+                assertEquals(testName, readTestData(), count + ":" + parsed);
             }
-            final int count = record.size();
-            assertEquals(testName, readTestData(), count + ":" + parsed);
         }
-        parser.close();
     }
 }

src/test/java/org/apache/commons/csv/CSVFormatTest.java

@@ -327,10 +327,10 @@ public void testRFC4180() {
     public void testSerialization() throws Exception {
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-        final ObjectOutputStream oos = new ObjectOutputStream(out);
-        oos.writeObject(CSVFormat.DEFAULT);
-        oos.flush();
-        oos.close();
+        try (final ObjectOutputStream oos = new ObjectOutputStream(out)) {
+            oos.writeObject(CSVFormat.DEFAULT);
+            oos.flush();
+        }
 
         final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(out.toByteArray()));
         final CSVFormat format = (CSVFormat) in.readObject();