work on #40

FasterXML · May 16, 2014 · 4ad7d63 · 4ad7d63
1 parent 2ce5d2c
commit 4ad7d63
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 613 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -3,6 +3,7 @@ Version: 2.3.4 (xx-xxx-2014)
 
 #38: Extra column delimiter added when column is escaped and follows empty column
  (reported by Paul M, Magrath@github)
+- Allow sub-classing of `CsvWriter`
 
 ------------------------------------------------------------------------
 === History: ===

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java b/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java
@@ -110,11 +110,18 @@ private Feature(boolean defaultState) {
     public CsvGenerator(IOContext ctxt, int jsonFeatures, int csvFeatures,
             ObjectCodec codec, Writer out,
             char columnSeparator, char quoteChar, char[] linefeed)
+    {
+        this(ctxt, jsonFeatures, csvFeatures, codec,
+                new CsvWriter(ctxt, out, columnSeparator, quoteChar, linefeed));
+    }
+
+    public CsvGenerator(IOContext ctxt, int jsonFeatures, int csvFeatures,
+            ObjectCodec codec, CsvWriter csvWriter)
     {
         super(jsonFeatures, codec);
         _ioContext = ctxt;
         _csvFeatures = csvFeatures;
-        _writer = new CsvWriter(ctxt, out, columnSeparator, quoteChar, linefeed);
+        _writer = csvWriter;
     }
 
     /*                                                                                       

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvWriter.java b/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvWriter.java
@@ -12,7 +12,7 @@
  * Low-level helper class that handles actual output of CSV, purely
  * based on indexes given without worrying about reordering etc.
  */
-public final class CsvWriter
+public class CsvWriter
 {
     /* As an optimization we try coalescing short writes into
      * buffer; but pass longer directly.
@@ -568,7 +568,7 @@ public void close(boolean autoClose) throws IOException
      * Helper method that determines whether given String is likely
      * to require quoting; check tries to optimize for speed.
      */
-    protected final boolean _mayNeedQuotes(String value, int length)
+    protected boolean _mayNeedQuotes(String value, int length)
     {
         // let's not bother checking long Strings, just quote already:
         if (length > MAX_QUOTE_CHECK) {