Apache/commons-csv
1
0
Fork 0
mirror of https://github.com/apache/commons-csv.git synced 2025-02-07 02:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format nits.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1739673 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2016-04-18 01:03:09 +00:00
parent a4c1a85d9d
commit 0685c8427b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,6 +241,7 @@ public final class CSVFormat implements Serializable {
* @see Predefined#Excel * @see Predefined#Excel
*/ */
public static final CSVFormat EXCEL = DEFAULT.withIgnoreEmptyLines(false).withAllowMissingColumnNames(); public static final CSVFormat EXCEL = DEFAULT.withIgnoreEmptyLines(false).withAllowMissingColumnNames();
/** /**
* Default MySQL format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA INFILE} operations. * Default MySQL format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA INFILE} operations.
* *
@ -267,6 +268,7 @@ public final class CSVFormat implements Serializable {
*/ */
public static final CSVFormat MYSQL = DEFAULT.withDelimiter(TAB).withEscape(BACKSLASH).withIgnoreEmptyLines(false) public static final CSVFormat MYSQL = DEFAULT.withDelimiter(TAB).withEscape(BACKSLASH).withIgnoreEmptyLines(false)
.withQuote(null).withRecordSeparator(LF).withNullString("\\N"); .withQuote(null).withRecordSeparator(LF).withNullString("\\N");
/** /**
* Comma separated format as defined by <a href="http://tools.ietf.org/html/rfc4180">RFC 4180</a>. * Comma separated format as defined by <a href="http://tools.ietf.org/html/rfc4180">RFC 4180</a>.
* *
@ -282,7 +284,9 @@ public final class CSVFormat implements Serializable {
* @see Predefined#RFC4180 * @see Predefined#RFC4180
*/ */
public static final CSVFormat RFC4180 = DEFAULT.withIgnoreEmptyLines(false); public static final CSVFormat RFC4180 = DEFAULT.withIgnoreEmptyLines(false);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* Tab-delimited format. * Tab-delimited format.
* *
@ -298,6 +302,7 @@ public final class CSVFormat implements Serializable {
* @see Predefined#TDF * @see Predefined#TDF
*/ */
public static final CSVFormat TDF = DEFAULT.withDelimiter(TAB).withIgnoreSurroundingSpaces(); public static final CSVFormat TDF = DEFAULT.withDelimiter(TAB).withIgnoreSurroundingSpaces();
/** /**
* Returns true if the given character is a line break character. * Returns true if the given character is a line break character.
* *
@ -309,6 +314,7 @@ public final class CSVFormat implements Serializable {
private static boolean isLineBreak(final char c) { private static boolean isLineBreak(final char c) {
return c == LF || c == CR; return c == LF || c == CR;
} }
/** /**
* Returns true if the given character is a line break character. * Returns true if the given character is a line break character.
* *
@ -320,6 +326,7 @@ public final class CSVFormat implements Serializable {
private static boolean isLineBreak(final Character c) { private static boolean isLineBreak(final Character c) {
return c != null && isLineBreak(c.charValue()); return c != null && isLineBreak(c.charValue());
} }
/** /**
* Creates a new CSV format with the specified delimiter. * Creates a new CSV format with the specified delimiter.
* *
@ -343,6 +350,7 @@ public final class CSVFormat implements Serializable {
public static CSVFormat newFormat(final char delimiter) { public static CSVFormat newFormat(final char delimiter) {
return new CSVFormat(delimiter, null, null, null, null, false, false, null, null, null, null, false, false, false); return new CSVFormat(delimiter, null, null, null, null, false, false, null, null, null, null, false, false, false);
} }
/** /**
* Gets one of the predefined formats from {@link CSVFormat.Predefined}. * Gets one of the predefined formats from {@link CSVFormat.Predefined}.
* *
@ -354,10 +362,15 @@ public final class CSVFormat implements Serializable {
public static CSVFormat valueOf(final String format) { public static CSVFormat valueOf(final String format) {
return CSVFormat.Predefined.valueOf(format).getFormat(); return CSVFormat.Predefined.valueOf(format).getFormat();
} }
private final boolean allowMissingColumnNames; private final boolean allowMissingColumnNames;
private final Character commentMarker; // null if commenting is disabled private final Character commentMarker; // null if commenting is disabled
private final char delimiter; private final char delimiter;
private final Character escapeCharacter; // null if escaping is disabled private final Character escapeCharacter; // null if escaping is disabled
private final String[] header; // array of header column names private final String[] header; // array of header column names
private final String[] headerComments; // array of header comment lines private final String[] headerComments; // array of header comment lines