Better resource management.

Author: garydgregory

src/test/java/org/apache/commons/csv/perf/PerformanceTest.java

@@ -30,6 +30,7 @@
 import java.util.zip.GZIPInputStream;
 
 import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.BeforeAll;
@@ -54,9 +55,10 @@ public static void setUpClass() throws FileNotFoundException, IOException {
             return;
         }
         System.out.println("Decompressing test fixture " + BIG_FILE + "...");
-        try (final InputStream input = new GZIPInputStream(
+        try (
+            final InputStream input = new GZIPInputStream(
                 new FileInputStream("src/test/resources/perf/worldcitiespop.txt.gz"));
-                final OutputStream output = new FileOutputStream(BIG_FILE)) {
+            final OutputStream output = new FileOutputStream(BIG_FILE)) {
             IOUtils.copy(input, output);
             System.out.println(String.format("Decompressed test fixture %s: %,d bytes.", BIG_FILE, BIG_FILE.length()));
         }
@@ -66,14 +68,17 @@ private BufferedReader createBufferedReader() throws IOException {
         return new BufferedReader(new FileReader(BIG_FILE));
     }
 
-    private long parse(final Reader in, final boolean traverseColumns) throws IOException {
-        final CSVFormat format = CSVFormat.DEFAULT.withIgnoreSurroundingSpaces(false);
+    private long parse(final Reader reader, final boolean traverseColumns) throws IOException {
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setIgnoreSurroundingSpaces(false).build();
         long recordCount = 0;
-        for (final CSVRecord record : format.parse(in)) {
-            recordCount++;
-            if (traverseColumns) {
-                for (@SuppressWarnings("unused") final String value : record) {
-                    // do nothing for now
+        try (final CSVParser parser = format.parse(reader)) {
+            for (final CSVRecord record : parser) {
+                recordCount++;
+                if (traverseColumns) {
+                    for (@SuppressWarnings("unused")
+                    final String value : record) {
+                        // do nothing for now
+                    }
                 }
             }
         }
@@ -97,7 +102,8 @@ public long testParseBigFile(final boolean traverseColumns) throws Exception {
         try (final BufferedReader reader = this.createBufferedReader()) {
             final long count = this.parse(reader, traverseColumns);
             final long totalMillis = System.currentTimeMillis() - startMillis;
-            this.println(String.format("File parsed in %,d milliseconds with Commons CSV: %,d lines.", totalMillis, count));
+            this.println(
+                String.format("File parsed in %,d milliseconds with Commons CSV: %,d lines.", totalMillis, count));
             return totalMillis;
         }
     }