Merge remote-tracking branch 'qiangli/csv-63' into trunk

Author: Sylvain Deschenes

src/main/java/org/apache/commons/csv/CSVPrinter.java

@@ -39,8 +39,10 @@ public final class CSVPrinter implements Flushable, Closeable {
     private final Appendable out;
     private final CSVFormat format;
 
-    /** True if we just began a new record. */
-    private boolean newRecord = true;
+    /** 0 if we just began a new record. */
+    private int newRecord = 0;
+    /** true if first value is empty */
+    private boolean firstEmpty;
 
     /**
      * Creates a printer that will print values to the given stream following the CSVFormat.
@@ -133,7 +135,7 @@ public void print(final Object value) throws IOException {
 
     private void print(final Object object, final CharSequence value, final int offset, final int len)
             throws IOException {
-        if (!newRecord) {
+        if (newRecord > 0) {
             out.append(format.getDelimiter());
         }
         if (object == null) {
@@ -146,7 +148,7 @@ private void print(final Object object, final CharSequence value, final int offs
         } else {
             out.append(value, offset, offset + len);
         }
-        newRecord = false;
+        newRecord++;
     }
 
     /*
@@ -219,18 +221,16 @@ private void printAndQuote(final Object object, final CharSequence value, final
             return;
         case MINIMAL:
             if (len <= 0) {
-                // always quote an empty token that is the first
-                // on the line, as it may be the only thing on the
-                // line. If it were not quoted in that case,
-                // an empty line has no tokens.
-                if (newRecord) {
-                    quote = true;
+                // mark quotes may be required for first empty value
+                if (newRecord == 0) {
+                    firstEmpty = true;
+                    return;
                 }
             } else {
                 char c = value.charAt(pos);
 
                 // TODO where did this rule come from?
-                if (newRecord && (c < '0' || (c > '9' && c < 'A') || (c > 'Z' && c < 'a') || (c > 'z'))) {
+                if (newRecord == 0 && (c < '0' || (c > '9' && c < 'A') || (c > 'Z' && c < 'a') || (c > 'z'))) {
                     quote = true;
                 } else if (c <= COMMENT) {
                     // Some other chars at the start of a value caused the parser to fail, so for now
@@ -318,7 +318,7 @@ public void printComment(final String comment) throws IOException {
         if (!format.isCommentMarkerSet()) {
             return;
         }
-        if (!newRecord) {
+        if (newRecord > 0) {
             println();
         }
         out.append(format.getCommentMarker().charValue());
@@ -351,11 +351,20 @@ public void printComment(final String comment) throws IOException {
      *             If an I/O error occurs
      */
     public void println() throws IOException {
+        // if the line only contains an empty value
+        if (newRecord == 1 && firstEmpty
+                && (format.getQuoteMode() == null || format.getQuoteMode() == QuoteMode.MINIMAL)) {
+            final char quoteChar = format.getQuoteCharacter().charValue();
+            out.append(quoteChar);
+            out.append(quoteChar);
+        }
+
         final String recordSeparator = format.getRecordSeparator();
         if (recordSeparator != null) {
             out.append(recordSeparator);
         }
-        newRecord = true;
+        newRecord = 0;
+        firstEmpty = false;
     }
 
     /**

src/test/java/org/apache/commons/csv/CSVPrinterTest.java

@@ -597,6 +597,24 @@ public void testPrintCustomNullValues() throws IOException {
         printer.close();
     }
 
+    @Test
+    public void testPrintFirstEmptyValue() throws IOException {
+        final StringWriter sw = new StringWriter();
+        final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT);
+        printer.printRecord("", "b", "c");
+        assertEquals(",b,c" + recordSeparator, sw.toString());
+        printer.close();
+    }
+
+    @Test
+    public void testPrintOnlyEmptyValue() throws IOException {
+        final StringWriter sw = new StringWriter();
+        final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT);
+        printer.printRecord("");
+        assertEquals("\"\"" + recordSeparator, sw.toString());
+        printer.close();
+    }
+
     @Test
     public void testParseCustomNullValues() throws IOException {
         final StringWriter sw = new StringWriter();