Apache
/
commons-csv
mirror of https://github.com/apache/commons-csv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use final. Use shorthand syntax for array creation.

This commit is contained in:
Gary Gregory 2022-02-19 12:46:38 -05:00
parent 489aaf2b84
commit ee6f52c460
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/apache/commons/csv/CSVFormatTest.java
View File

@ -261,8 +261,8 @@ public class CSVFormatTest {
final Object b = method.invoke(CSVFormat.DEFAULT, QuoteMode.ALL); final Object b = method.invoke(CSVFormat.DEFAULT, QuoteMode.ALL);
assertNotEquals(name, type, a, b); assertNotEquals(name, type, a, b);
} else if ("org.apache.commons.csv.DuplicateHeaderMode".equals(type)) { } else if ("org.apache.commons.csv.DuplicateHeaderMode".equals(type)) {
final Object a = method.invoke(CSVFormat.DEFAULT, new Object[] {DuplicateHeaderMode.ALLOW_ALL}); final Object a = method.invoke(CSVFormat.DEFAULT, DuplicateHeaderMode.ALLOW_ALL);
final Object b = method.invoke(CSVFormat.DEFAULT, new Object[] {DuplicateHeaderMode.DISALLOW}); final Object b = method.invoke(CSVFormat.DEFAULT, DuplicateHeaderMode.DISALLOW);
assertNotEquals(name, type, a, b); assertNotEquals(name, type, a, b);
} else if ("java.lang.Object[]".equals(type)){ } else if ("java.lang.Object[]".equals(type)){
final Object a = method.invoke(CSVFormat.DEFAULT, new Object[] {new Object[] {null, null}}); final Object a = method.invoke(CSVFormat.DEFAULT, new Object[] {new Object[] {null, null}});

48
src/test/java/org/apache/commons/csv/issues/JiraCsv288Test.java
View File

@ -34,10 +34,10 @@ public class JiraCsv288Test {
// expected: <a,b,c,d,,f> but was: <a,b|c,d,|f> // expected: <a,b,c,d,,f> but was: <a,b|c,d,|f>
public void testParseWithDoublePipeDelimiter() throws Exception { public void testParseWithDoublePipeDelimiter() throws Exception {
final Reader in = new StringReader("a||b||c||d||||f"); final Reader in = new StringReader("a||b||c||d||||f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -51,10 +51,10 @@ public class JiraCsv288Test {
// expected: <a,b,c,d,,f> but was: <a,b|c,d,|f> // expected: <a,b,c,d,,f> but was: <a,b|c,d,|f>
public void testParseWithTriplePipeDelimiter() throws Exception { public void testParseWithTriplePipeDelimiter() throws Exception {
final Reader in = new StringReader("a|||b|||c|||d||||||f"); final Reader in = new StringReader("a|||b|||c|||d||||||f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|||").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|||").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -68,10 +68,10 @@ public class JiraCsv288Test {
// expected: <a,b,c,d,,f> but was: <a,b,c,d,|f> // expected: <a,b,c,d,,f> but was: <a,b,c,d,|f>
public void testParseWithABADelimiter() throws Exception { public void testParseWithABADelimiter() throws Exception {
final Reader in = new StringReader("a|~|b|~|c|~|d|~||~|f"); final Reader in = new StringReader("a|~|b|~|c|~|d|~||~|f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -85,10 +85,10 @@ public class JiraCsv288Test {
// expected: <a,b||c,d,,f> but was: <a,b||c,d,|f> // expected: <a,b||c,d,,f> but was: <a,b||c,d,|f>
public void testParseWithDoublePipeDelimiterQuoted() throws Exception { public void testParseWithDoublePipeDelimiterQuoted() throws Exception {
final Reader in = new StringReader("a||\"b||c\"||d||||f"); final Reader in = new StringReader("a||\"b||c\"||d||||f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -102,10 +102,10 @@ public class JiraCsv288Test {
// expected: <a,b,c,d,,f,> but was: <a,b|c,d,|f> // expected: <a,b,c,d,,f,> but was: <a,b|c,d,|f>
public void testParseWithDoublePipeDelimiterEndsWithDelimiter() throws Exception { public void testParseWithDoublePipeDelimiterEndsWithDelimiter() throws Exception {
final Reader in = new StringReader("a||b||c||d||||f||"); final Reader in = new StringReader("a||b||c||d||||f||");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -119,10 +119,10 @@ public class JiraCsv288Test {
// expected: <a,b,c,d,,f,> but was: <a,b,c,d,,f> // expected: <a,b,c,d,,f,> but was: <a,b,c,d,,f>
public void testParseWithTwoCharDelimiterEndsWithDelimiter() throws Exception { public void testParseWithTwoCharDelimiterEndsWithDelimiter() throws Exception {
final Reader in = new StringReader("a~|b~|c~|d~|~|f~|"); final Reader in = new StringReader("a~|b~|c~|d~|~|f~|");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -136,10 +136,10 @@ public class JiraCsv288Test {
public void testParseWithDoublePipeDelimiterDoubleCharValue() throws Exception { public void testParseWithDoublePipeDelimiterDoubleCharValue() throws Exception {
final Reader in = new StringReader("a||bb||cc||dd||f"); final Reader in = new StringReader("a||bb||cc||dd||f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("||").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -152,10 +152,10 @@ public class JiraCsv288Test {
// Regression, already passed before fix // Regression, already passed before fix
public void testParseWithTwoCharDelimiter1() throws Exception { public void testParseWithTwoCharDelimiter1() throws Exception {
final Reader in = new StringReader("a~|b~|c~|d~|~|f"); final Reader in = new StringReader("a~|b~|c~|d~|~|f");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -168,10 +168,10 @@ public class JiraCsv288Test {
// Regression, already passed before fix // Regression, already passed before fix
public void testParseWithTwoCharDelimiter2() throws Exception { public void testParseWithTwoCharDelimiter2() throws Exception {
final Reader in = new StringReader("a~|b~|c~|d~|~|f~"); final Reader in = new StringReader("a~|b~|c~|d~|~|f~");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -184,10 +184,10 @@ public class JiraCsv288Test {
// Regression, already passed before fix // Regression, already passed before fix
public void testParseWithTwoCharDelimiter3() throws Exception { public void testParseWithTwoCharDelimiter3() throws Exception {
final Reader in = new StringReader("a~|b~|c~|d~|~|f|"); final Reader in = new StringReader("a~|b~|c~|d~|~|f|");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -200,10 +200,10 @@ public class JiraCsv288Test {
// Regression, already passed before fix // Regression, already passed before fix
public void testParseWithTwoCharDelimiter4() throws Exception { public void testParseWithTwoCharDelimiter4() throws Exception {
final Reader in = new StringReader("a~|b~|c~|d~|~|f~~||g"); final Reader in = new StringReader("a~|b~|c~|d~|~|f~~||g");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("~|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }
@ -216,10 +216,10 @@ public class JiraCsv288Test {
// Regression, already passed before fix // Regression, already passed before fix
public void testParseWithSinglePipeDelimiterEndsWithDelimiter() throws Exception { public void testParseWithSinglePipeDelimiterEndsWithDelimiter() throws Exception {
final Reader in = new StringReader("a|b|c|d||f|"); final Reader in = new StringReader("a|b|c|d||f|");
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL); try (CSVPrinter csvPrinter = new CSVPrinter(stringBuilder, CSVFormat.EXCEL);
CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|").build())) { CSVParser csvParser = CSVParser.parse(in, CSVFormat.Builder.create().setDelimiter("|").build())) {
for (CSVRecord csvRecord : csvParser) { for (final CSVRecord csvRecord : csvParser) {
for (int i = 0; i < csvRecord.size(); i++) { for (int i = 0; i < csvRecord.size(); i++) {
csvPrinter.print(csvRecord.get(i)); csvPrinter.print(csvRecord.get(i));
} }