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

- Remove unused import. 

- Remove trailing white spaces on all lines.
- Use final.
- Use for-each (in test).
- Use try-with-resources (in test).
- Document empty blocks.
This commit is contained in:
Gary Gregory 2019-05-24 08:21:21 -04:00
parent 030fb8e37c
commit 8eb36bd8a7
6 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/apache/commons/csv/CSVFormat.java
View File

@ -723,7 +723,7 @@ public final class CSVFormat implements Serializable {
private final boolean trim;
private final boolean autoFlush;
private final boolean allowDuplicateHeaderNames;
/**
@ -1691,7 +1691,7 @@ public final class CSVFormat implements Serializable {
public CSVFormat withAllowMissingColumnNames(final boolean allowMissingColumnNames) {
return new CSVFormat(delimiter, quoteCharacter, quoteMode, commentMarker, escapeCharacter,
ignoreSurroundingSpaces, ignoreEmptyLines, recordSeparator, nullString, headerComments, header,
skipHeaderRecord, allowMissingColumnNames, ignoreHeaderCase, trim, trailingDelimiter, autoFlush,
skipHeaderRecord, allowMissingColumnNames, ignoreHeaderCase, trim, trailingDelimiter, autoFlush,
allowDuplicateHeaderNames);
}
@ -2257,8 +2257,8 @@ public final class CSVFormat implements Serializable {
skipHeaderRecord, allowMissingColumnNames, ignoreHeaderCase, trim, trailingDelimiter, autoFlush,
allowDuplicateHeaderNames);
}
public CSVFormat withAllowDuplicateHeaderNames(boolean allowDuplicateHeaderNames) {
public CSVFormat withAllowDuplicateHeaderNames(final boolean allowDuplicateHeaderNames) {
return new CSVFormat(delimiter, quoteCharacter, quoteMode, commentMarker, escapeCharacter,
ignoreSurroundingSpaces, ignoreEmptyLines, recordSeparator, nullString, headerComments, header,
skipHeaderRecord, allowMissingColumnNames, ignoreHeaderCase, trim, trailingDelimiter, autoFlush,
@ -2268,7 +2268,7 @@ public final class CSVFormat implements Serializable {
public CSVFormat withAllowDuplicateHeaderNames() {
return withAllowDuplicateHeaderNames(true);
}
public boolean getAllowDuplicateHeaderNames() {
return allowDuplicateHeaderNames;
}

13
src/main/java/org/apache/commons/csv/CSVParser.java
View File

@ -40,7 +40,6 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.TreeMap;
import java.util.stream.Collectors;
/**
* Parses CSV files according to the specified format.
@ -410,7 +409,7 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
this.format = format;
this.lexer = new Lexer(format, new ExtendedBufferedReader(reader));
this.csvRecordIterator = new CSVRecordIterator();
Headers headers = createHeaders();
final Headers headers = createHeaders();
this.headerMap = headers.headerMap;
this.headerNames = headers.headerNames;
this.characterOffset = characterOffset;
@ -454,18 +453,18 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
* Header column positions (0-based)
*/
final Map<String, Integer> headerMap;
/**
* Header names in column order
*/
final List<String> headerNames;
Headers(Map<String, Integer> headerMap, List<String> headerNames) {
Headers(final Map<String, Integer> headerMap, final List<String> headerNames) {
this.headerMap = headerMap;
this.headerNames = headerNames;
}
}
/**
* Creates the name to index mapping if the format defines a header.
*
@ -502,7 +501,7 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
if (!emptyHeader && !this.format.getAllowDuplicateHeaderNames()) {
throw new IllegalArgumentException(
String.format("The header contains a duplicate name: \"%s\" in %s."
+ " If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
+ " If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
header, Arrays.toString(headerRecord)));
}
if (emptyHeader && !this.format.getAllowMissingColumnNames()) {
@ -519,7 +518,7 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
}
}
}
}
}
if (headerNames == null) {
headerNames = Collections.emptyList(); //immutable
} else {

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

@ -45,6 +45,7 @@ import org.junit.Test;
public class CSVFormatTest {
public enum EmptyEnum {
// empty enum.
}
public enum Header {

92
src/test/java/org/apache/commons/csv/CSVParserTest.java
View File

@ -84,8 +84,8 @@ public class CSVParserTest {
}
private void parseFully(final CSVParser parser) {
for (final Iterator<CSVRecord> records = parser.iterator(); records.hasNext(); ) {
records.next();
for (final CSVRecord csvRecord : parser) {
Assert.assertNotNull(csvRecord);
}
}
@ -310,7 +310,7 @@ public class CSVParserTest {
assertTrue(parser.getHeaderNames().isEmpty());
}
}
@Test
public void testEmptyFile() throws Exception {
try (final CSVParser parser = CSVParser.parse("", CSVFormat.DEFAULT)) {
@ -423,6 +423,7 @@ public class CSVParserTest {
/**
* Tests an exported Excel worksheet with a header row and rows that have more columns than the headers
* @throws Exception
*/
@Test
public void testExcelHeaderCountLessThanData() throws Exception {
@ -529,7 +530,7 @@ public class CSVParserTest {
try {
headerNames.add("This is a read-only list.");
fail();
} catch (UnsupportedOperationException e) {
} catch (final UnsupportedOperationException e) {
// Yes.
}
}
@ -785,54 +786,57 @@ public class CSVParserTest {
final String fiveRows = "1\n2\n3\n4\n5\n";
// Iterator hasNext() shouldn't break sequence
CSVParser parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows));
int recordNumber = 0;
final Iterator<CSVRecord> iter = parser.iterator();
recordNumber = 0;
while (iter.hasNext()) {
final CSVRecord record = iter.next();
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
try (CSVParser parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows))) {
int recordNumber = 0;
final Iterator<CSVRecord> iter = parser.iterator();
recordNumber = 0;
while (iter.hasNext()) {
final CSVRecord record = iter.next();
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
}
}
iter.hasNext();
while (iter.hasNext()) {
final CSVRecord record = iter.next();
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
}
iter.hasNext();
while (iter.hasNext()) {
final CSVRecord record = iter.next();
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
// Consecutive enhanced for loops shouldn't break sequence
parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows));
recordNumber = 0;
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
try (CSVParser parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows))) {
int recordNumber = 0;
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
}
}
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
}
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
// Consecutive enhanced for loops with hasNext() peeking shouldn't break sequence
parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows));
recordNumber = 0;
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
try (CSVParser parser = CSVFormat.DEFAULT.parse(new StringReader(fiveRows))) {
int recordNumber = 0;
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
if (recordNumber >= 2) {
break;
}
}
parser.iterator().hasNext();
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
}
parser.iterator().hasNext();
for (final CSVRecord record : parser) {
recordNumber++;
assertEquals(String.valueOf(recordNumber), record.get(0));
}
}
@ -1166,7 +1170,7 @@ public class CSVParserTest {
assertEquals("3", record.get("Z"));
Assert.assertEquals(3, record.size());
}
@Test
public void testRepeatedHeadersAreReturnedInCSVRecordHeaderNames() throws IOException {
final Reader in = new StringReader("header1,header2,header1\n1,2,3\n4,5,6");

3
src/test/java/org/apache/commons/csv/CSVPrinterTest.java
View File

@ -232,6 +232,7 @@ public class CSVPrinterTest {
try (final Writer writer = mock(Writer.class)) {
final CSVFormat csvFormat = CSVFormat.DEFAULT;
try (CSVPrinter csvPrinter = new CSVPrinter(writer, csvFormat)) {
// empty
}
verify(writer, never()).flush();
verify(writer, times(1)).close();
@ -242,6 +243,7 @@ public class CSVPrinterTest {
try (final Writer writer = mock(Writer.class)) {
final CSVFormat csvFormat = CSVFormat.DEFAULT.withAutoFlush(false);
try (CSVPrinter csvPrinter = new CSVPrinter(writer, csvFormat)) {
// empty
}
verify(writer, never()).flush();
verify(writer, times(1)).close();
@ -254,6 +256,7 @@ public class CSVPrinterTest {
try (final Writer writer = mock(Writer.class)) {
final CSVFormat csvFormat = CSVFormat.DEFAULT.withAutoFlush(true);
try (CSVPrinter csvPrinter = new CSVPrinter(writer, csvFormat)) {
// empty
}
verify(writer, times(1)).flush();
verify(writer, times(1)).close();

1
src/test/java/org/apache/commons/csv/LexerTest.java
View File

@ -50,6 +50,7 @@ public class LexerTest {
formatWithEscaping = CSVFormat.DEFAULT.withEscape('\\');
}
@SuppressWarnings("resource")
private Lexer createLexer(final String input, final CSVFormat format) {
return new Lexer(format, new ExtendedBufferedReader(new StringReader(input)));
}