You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/07/09 15:24:50 UTC

[commons-csv] branch master updated (e06b845 -> d1602ac)

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

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-csv.git.


    from e06b845  Better resource management.
     new b3daff2  Better resource management.
     new d1602ac  Better resource management.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/commons/csv/issues/JiraCsv213Test.java     |  8 ++++----
 .../java/org/apache/commons/csv/issues/JiraCsv247Test.java     | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

[commons-csv] 02/02: Better resource management.

Posted by gg...@apache.org.
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-csv.git

commit d1602acd6c9db5ff63f1e9d618c04ca4513c220c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 9 11:24:46 2021 -0400

    Better resource management.
---
 src/test/java/org/apache/commons/csv/issues/JiraCsv213Test.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/commons/csv/issues/JiraCsv213Test.java b/src/test/java/org/apache/commons/csv/issues/JiraCsv213Test.java
index 6320ea8..074883f 100644
--- a/src/test/java/org/apache/commons/csv/issues/JiraCsv213Test.java
+++ b/src/test/java/org/apache/commons/csv/issues/JiraCsv213Test.java
@@ -17,10 +17,10 @@
 package org.apache.commons.csv.issues;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
@@ -49,8 +49,8 @@ public class JiraCsv213Test {
                     .setQuoteMode(QuoteMode.ALL)
                     .build();
         // @formatter:on
-        try (CSVParser parser = csvFormat
-            .parse(new InputStreamReader(new FileInputStream(csvFile), StandardCharsets.UTF_8))) {
+        try (Reader reader = Files.newBufferedReader(csvFile.toPath(), StandardCharsets.UTF_8);
+            CSVParser parser = csvFormat.parse(reader)) {
             if (parser.iterator().hasNext()) {
                 // System.out.println(parser.getCurrentLineNumber());
                 // System.out.println(parser.getRecordNumber());

[commons-csv] 01/02: Better resource management.

Posted by gg...@apache.org.
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-csv.git

commit b3daff2323172cac47f91683c04b0edf8f14a048
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 9 11:22:15 2021 -0400

    Better resource management.
---
 .../java/org/apache/commons/csv/issues/JiraCsv247Test.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/commons/csv/issues/JiraCsv247Test.java b/src/test/java/org/apache/commons/csv/issues/JiraCsv247Test.java
index a3a7f8f..4dc18a0 100644
--- a/src/test/java/org/apache/commons/csv/issues/JiraCsv247Test.java
+++ b/src/test/java/org/apache/commons/csv/issues/JiraCsv247Test.java
@@ -67,14 +67,16 @@ public class JiraCsv247Test {
         assertFalse(format.getAllowMissingColumnNames(), "By default we should not allow missing column names");
 
         assertThrows(IllegalArgumentException.class, () -> {
-            try (final Reader in = new StringReader("a,,c,d,e\n1,2,3,4,5\nv,w,x,y,z")) {
-                format.parse(in);
+            try (final Reader reader = new StringReader("a,,c,d,e\n1,2,3,4,5\nv,w,x,y,z");
+                CSVParser parser = format.parse(reader);) {
+                // should fail
             }
         }, "1 missing column header is not allowed");
 
         assertThrows(IllegalArgumentException.class, () -> {
-            try (final Reader in = new StringReader("a,,c,d,\n1,2,3,4,5\nv,w,x,y,z")) {
-                format.parse(in);
+            try (final Reader reader = new StringReader("a,,c,d,\n1,2,3,4,5\nv,w,x,y,z");
+                CSVParser parser = format.parse(reader);) {
+                // should fail
             }
         }, "2+ missing column headers is not allowed!");
     }