This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-csv.git
commit bd17fc385057980ca90c28473f4c2e888de66d9d Author: aherbert <aherb...@apache.org> AuthorDate: Tue Jan 21 12:43:30 2020 +0000 Remove trailing whitespace. --- src/main/java/org/apache/commons/csv/CSVRecord.java | 2 +- src/site/xdoc/user-guide.xml | 2 +- src/test/java/org/apache/commons/csv/CSVBenchmark.java | 18 +++++++++--------- .../java/org/apache/commons/csv/CSVRecordTest.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java b/src/main/java/org/apache/commons/csv/CSVRecord.java index e32cd5a..a8cad90 100644 --- a/src/main/java/org/apache/commons/csv/CSVRecord.java +++ b/src/main/java/org/apache/commons/csv/CSVRecord.java @@ -151,7 +151,7 @@ public final class CSVRecord implements Serializable, Iterable<String> { * Returns the parser. * * <p>Note: The parser is not part of the serialized state of the record. A null check - * should be used when the record may have originated from a serialized form. + * should be used when the record may have originated from a serialized form. * * @return the parser. * @since 1.7 diff --git a/src/site/xdoc/user-guide.xml b/src/site/xdoc/user-guide.xml index 9ccbf64..254b461 100644 --- a/src/site/xdoc/user-guide.xml +++ b/src/site/xdoc/user-guide.xml @@ -32,7 +32,7 @@ limitations under the License. Parsing files with Apache Commons CSV is relatively straight forward. The CSVFormat class provides some commonly used CSV variants: - + <dl> <dt><a href="https://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#DEFAULT">DEFAULT</a></dt><dd>Standard Comma Separated Value format, as for RFC4180 but allowing empty lines.</dd> <dt><a href="https://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#EXCEL">EXCEL</a></dt><dd>The Microsoft Excel CSV format.</dd> diff --git a/src/test/java/org/apache/commons/csv/CSVBenchmark.java b/src/test/java/org/apache/commons/csv/CSVBenchmark.java index d055e69..6d951ba 100644 --- a/src/test/java/org/apache/commons/csv/CSVBenchmark.java +++ b/src/test/java/org/apache/commons/csv/CSVBenchmark.java @@ -79,7 +79,7 @@ public class CSVBenchmark { while ((line = in.readLine()) != null) { count++; } - + bh.consume(count); in.close(); return count; @@ -94,7 +94,7 @@ public class CSVBenchmark { final String[] values = StringUtils.split(line, ','); count += values.length; } - + bh.consume(count); in.close(); return count; @@ -103,7 +103,7 @@ public class CSVBenchmark { @Benchmark public int parseCommonsCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final CSVFormat format = CSVFormat.DEFAULT.withHeader(); int count = 0; @@ -119,7 +119,7 @@ public class CSVBenchmark { @Benchmark public int parseGenJavaCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final CsvReader reader = new CsvReader(in); reader.setFieldDelimiter(','); @@ -137,7 +137,7 @@ public class CSVBenchmark { @Benchmark public int parseJavaCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final com.csvreader.CsvReader reader = new com.csvreader.CsvReader(in, ','); reader.setRecordDelimiter('\n'); @@ -154,7 +154,7 @@ public class CSVBenchmark { @Benchmark public int parseOpenCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final com.opencsv.CSVReader reader = new com.opencsv.CSVReader(in, ','); int count = 0; @@ -170,10 +170,10 @@ public class CSVBenchmark { @Benchmark public int parseSkifeCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final org.skife.csv.CSVReader reader = new org.skife.csv.SimpleReader(); reader.setSeperator(','); - + final CountingReaderCallback callback = new CountingReaderCallback(); reader.parse(in, callback); @@ -194,7 +194,7 @@ public class CSVBenchmark { @Benchmark public int parseSuperCSV(final Blackhole bh) throws Exception { final BufferedReader in = getReader(); - + final CsvListReader reader = new CsvListReader(in, CsvPreference.STANDARD_PREFERENCE); int count = 0; diff --git a/src/test/java/org/apache/commons/csv/CSVRecordTest.java b/src/test/java/org/apache/commons/csv/CSVRecordTest.java index d6fedb0..8ed51c3 100644 --- a/src/test/java/org/apache/commons/csv/CSVRecordTest.java +++ b/src/test/java/org/apache/commons/csv/CSVRecordTest.java @@ -63,7 +63,7 @@ public class CSVRecordTest { headerMap = parser.getHeaderMap(); } } - + @Test public void testGetInt() { assertEquals(values[0], record.get(0));