Fix #222

Author: cowtowncoder

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java

@@ -298,6 +298,11 @@ private Feature(boolean defaultState) {
      */
     protected int _columnCount = 0;
 
+    /**
+     * @since 2.12
+     */
+    protected boolean _cfgEmptyStringAsNull;
+
     /*
     /**********************************************************************
     /* State
@@ -395,6 +400,7 @@ public CsvParser(CsvIOContext ctxt, int stdFeatures, int csvFeatures,
         _parsingContext = JsonReadContext.createRootContext(dups);
         _reader = new CsvDecoder(this, ctxt, reader, _schema, _textBuffer,
                 stdFeatures, csvFeatures);
+        _cfgEmptyStringAsNull = CsvParser.Feature.EMPTY_STRING_AS_NULL.enabledIn(csvFeatures);
     }
 
     /*
@@ -495,6 +501,7 @@ public JsonParser overrideFormatFeatures(int values, int mask) {
         if (oldF != newF) {
             _formatFeatures = newF;
             _reader.overrideFormatFeatures(newF);
+            _cfgEmptyStringAsNull = CsvParser.Feature.EMPTY_STRING_AS_NULL.enabledIn(_formatFeatures);
         }
         return this;
     }
@@ -512,6 +519,7 @@ public JsonParser overrideFormatFeatures(int values, int mask) {
     public JsonParser enable(Feature f)
     {
         _formatFeatures |= f.getMask();
+        _cfgEmptyStringAsNull = CsvParser.Feature.EMPTY_STRING_AS_NULL.enabledIn(_formatFeatures);
         return this;
     }
 
@@ -522,6 +530,7 @@ public JsonParser enable(Feature f)
     public JsonParser disable(Feature f)
     {
         _formatFeatures &= ~f.getMask();
+        _cfgEmptyStringAsNull = CsvParser.Feature.EMPTY_STRING_AS_NULL.enabledIn(_formatFeatures);
         return this;
     }
 
@@ -944,6 +953,9 @@ protected JsonToken _handleNamedValue() throws IOException
                 return JsonToken.VALUE_NULL;
             }
         }
+        if (_cfgEmptyStringAsNull && "".equals(_currentValue)) {
+            return JsonToken.VALUE_NULL;
+        }
         return JsonToken.VALUE_STRING;
     }
 
@@ -968,6 +980,9 @@ protected JsonToken _handleUnnamedValue() throws IOException
                 return JsonToken.VALUE_NULL;
             }
         }
+        if (_cfgEmptyStringAsNull && "".equals(_currentValue)) {
+            return JsonToken.VALUE_NULL;
+        }
         return JsonToken.VALUE_STRING;
     }
 
@@ -1010,6 +1025,9 @@ protected JsonToken _handleArrayValue() throws IOException
                 return JsonToken.VALUE_NULL;
             }
         }
+        if (_cfgEmptyStringAsNull && "".equals(_currentValue)) {
+            return JsonToken.VALUE_NULL;
+        }
         return JsonToken.VALUE_STRING;
     }
 
@@ -1055,7 +1073,6 @@ protected JsonToken _handleExtraColumn(String value) throws IOException
                 if (next == null) { // should end of record or input
                     return _handleObjectRowEnd();
                 }
-                System.err.println("... yet we did NOT skip");
             }
         }
         // 21-May-2015, tatu: Need to enter recovery mode, to skip remainder of the line
@@ -1167,9 +1184,8 @@ public String getText() throws IOException {
         if (_currToken == JsonToken.FIELD_NAME) {
             return _currentName;
         }
-        if (_currentValue.equals("")) {
-            return isEnabled(CsvParser.Feature.EMPTY_STRING_AS_NULL) ? null : _currentValue;
-        }
+        // 08-Sep-2020, tatu: Used to check for empty String wrt EMPTY_STRING_AS_NULL
+        //    here, but now demoted to actual "nextToken()" handling
         return _currentValue;
     }
 

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/EmptyStringAsNullTest.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.dataformat.csv.deser;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
+import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvParser;
@@ -69,4 +69,28 @@ public void testSimpleParseEmptyStringAsNull() throws IOException {
         assertNull("The column that contains an empty String should be deserialized as null ", actualTestUser.middleName);
         assertEquals(expectedTestUser.lastName, actualTestUser.lastName);
     }
+
+    // [dataformats-text#222]
+    public void testEmptyStringAsNullNonPojo() throws Exception
+    {
+        String csv = "Grace,,Hopper";
+
+        ObjectReader r = MAPPER.reader()
+                .with(CsvParser.Feature.EMPTY_STRING_AS_NULL)
+                .with(CsvParser.Feature.WRAP_AS_ARRAY);
+
+        try (MappingIterator<Object[]> it1 =  r.forType(Object[].class).readValues(csv)) {
+            Object[] array1 = it1.next();
+            assertEquals(3, array1.length);
+            assertEquals("Grace", array1[0]);
+            assertEquals("Hopper", array1[2]);
+            assertNull(array1[1]);
+        }
+        try (MappingIterator<String[]> it2 =  r.forType(String[].class).readValues(csv)) {
+            String[] array2 = it2.next();
+            assertEquals("Grace", array2[0]);
+            assertEquals("Hopper", array2[2]);
+            assertNull(array2[1]);
+        }
+    }
 }

release-notes/VERSION-2.x

@@ -12,6 +12,9 @@ Modules:
 
 #199: (csv) Empty Lists can only be String-typed in CSV
  (reported by Simon L)
+#222: (csv) `JsonParser.Feature.EMPTY_STRING_AS_NULL` does not work when
+  text is parsed as `String[]`
+ (reported by wkwkhautbois@github)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
 2.11.2 (02-Aug-2020)