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 2017/03/27 19:13:11 UTC
commons-csv git commit: Fluent formatting.
Repository: commons-csv
Updated Branches:
refs/heads/master 977824491 -> 09cf3739d
Fluent formatting.
Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/09cf3739
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/09cf3739
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/09cf3739
Branch: refs/heads/master
Commit: 09cf3739df3b82b23bf508b4f98e999ee5b8d3c7
Parents: 9778244
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Mar 27 12:13:09 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Mar 27 12:13:09 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/commons/csv/CSVFormat.java | 38 ++++++++++++++++----
1 file changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-csv/blob/09cf3739/src/main/java/org/apache/commons/csv/CSVFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/csv/CSVFormat.java b/src/main/java/org/apache/commons/csv/CSVFormat.java
index 3d3e7e5..a0382a3 100644
--- a/src/main/java/org/apache/commons/csv/CSVFormat.java
+++ b/src/main/java/org/apache/commons/csv/CSVFormat.java
@@ -263,7 +263,11 @@ public final class CSVFormat implements Serializable {
*
* @see Predefined#Excel
*/
- public static final CSVFormat EXCEL = DEFAULT.withIgnoreEmptyLines(false).withAllowMissingColumnNames();
+ // @formatter:off
+ public static final CSVFormat EXCEL = DEFAULT
+ .withIgnoreEmptyLines(false)
+ .withAllowMissingColumnNames();
+ // @formatter:on
/**
* Default Informix CSV UNLOAD format used by the {@code UNLOAD TO file_name} operation.
@@ -289,8 +293,13 @@ public final class CSVFormat implements Serializable {
* http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm</a>
* @since 1.3
*/
- public static final CSVFormat INFORMIX_UNLOAD = DEFAULT.withDelimiter(PIPE).withEscape(BACKSLASH)
- .withQuote(DOUBLE_QUOTE_CHAR).withRecordSeparator(LF);
+ // @formatter:off
+ public static final CSVFormat INFORMIX_UNLOAD = DEFAULT
+ .withDelimiter(PIPE)
+ .withEscape(BACKSLASH)
+ .withQuote(DOUBLE_QUOTE_CHAR)
+ .withRecordSeparator(LF);
+ // @formatter:on
/**
* Default Informix CSV UNLOAD format used by the {@code UNLOAD TO file_name} operation (escaping is disabled.)
@@ -315,8 +324,12 @@ public final class CSVFormat implements Serializable {
* http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm</a>
* @since 1.3
*/
- public static final CSVFormat INFORMIX_UNLOAD_CSV = DEFAULT.withDelimiter(COMMA).withQuote(DOUBLE_QUOTE_CHAR)
+ // @formatter:off
+ public static final CSVFormat INFORMIX_UNLOAD_CSV = DEFAULT
+ .withDelimiter(COMMA)
+ .withQuote(DOUBLE_QUOTE_CHAR)
.withRecordSeparator(LF);
+ // @formatter:on
/**
* Default MySQL format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA INFILE} operations.
@@ -342,8 +355,15 @@ public final class CSVFormat implements Serializable {
* @see <a href="http://dev.mysql.com/doc/refman/5.1/en/load-data.html"> http://dev.mysql.com/doc/refman/5.1/en/load
* -data.html</a>
*/
- public static final CSVFormat MYSQL = DEFAULT.withDelimiter(TAB).withEscape(BACKSLASH).withIgnoreEmptyLines(false)
- .withQuote(null).withRecordSeparator(LF).withNullString("\\N");
+ // @formatter:off
+ public static final CSVFormat MYSQL = DEFAULT
+ .withDelimiter(TAB)
+ .withEscape(BACKSLASH)
+ .withIgnoreEmptyLines(false)
+ .withQuote(null)
+ .withRecordSeparator(LF)
+ .withNullString("\\N");
+ // @formatter:off
/**
* Comma separated format as defined by <a href="http://tools.ietf.org/html/rfc4180">RFC 4180</a>.
@@ -379,7 +399,11 @@ public final class CSVFormat implements Serializable {
*
* @see Predefined#TDF
*/
- public static final CSVFormat TDF = DEFAULT.withDelimiter(TAB).withIgnoreSurroundingSpaces();
+ // @formatter:off
+ public static final CSVFormat TDF = DEFAULT
+ .withDelimiter(TAB)
+ .withIgnoreSurroundingSpaces();
+ // @formatter:on
/**
* Returns true if the given character is a line break character.