Fixes #10: missing null writes with Object[]

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

@@ -237,6 +237,14 @@ private Feature(boolean defaultState) {
      */
     protected boolean _skipValue;
 
+    /**
+     * Flag set when a row has just been finished, used to distinguish between
+     * null values within a row vs null rows.
+     *
+     * @since 2.21
+     */
+    protected boolean _justFinishedRow = false;
+
     /**
      * Separator to use during writing of (simple) array value, to be encoded as a
      * single column value, if any.
@@ -562,6 +570,7 @@ public void close() throws IOException
     public final void writeStartArray() throws IOException
     {
         _verifyValueWrite("start an array");
+        _justFinishedRow = false; // Clear flag when starting new array
         // Ok to create root-level array to contain Objects/Arrays, but
         // can not nest arrays in objects
         if (_tokenWriteContext.inObject()) {
@@ -882,7 +891,12 @@ public void writeNull() throws IOException
                 //   just skip; can change, if so desired, to expose "root null" as empty rows, possibly
                 //   based on either schema property, or CsvGenerator.Feature.
                 //  Note: if nulls are to be written that way, would need to call `finishRow()` right after `writeNull()`
-                if (!_tokenWriteContext.getParent().inRoot()) {
+                // [dataformats-text#10]: When we have a schema and we haven't just finished a row,
+                //   it means we're inside an array-as-row (like Object[]), so null is a column value
+                boolean writeNullValue = !_tokenWriteContext.getParent().inRoot()
+                    || (_schema.size() > 0 && !_justFinishedRow);
+
+                if (writeNullValue) {
                     // 26-Aug-2024, tatu: [dataformats-text#495] Decorations?
                     if (_nextColumnDecorator != null) {
                         String nvl = _nextColumnDecorator.decorateNull(this);
@@ -1132,6 +1146,7 @@ protected void finishRow() throws IOException
     {
         _writer.endRow();
         _nextColumnByName = -1;
+        _justFinishedRow = true;
     }
 
     protected void _handleFirstLine() throws IOException

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java → csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ser/ObjectArrayNullWrite10Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.csv.tofix;
+package com.fasterxml.jackson.dataformat.csv.ser;
 
 import java.io.StringWriter;
 
@@ -7,16 +7,14 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.*;
-import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class MissingNullsOnObjectArrayWrite10Test extends ModuleTestBase
+public class ObjectArrayNullWrite10Test extends ModuleTestBase
 {
     private final CsvMapper MAPPER = mapperForCsv();
 
     // for [dataformats-text#10]
-    @JacksonTestFailureExpected
     @Test
     public void testNullsOnObjectArrayWrites2Col() throws Exception
     {

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/NullWriting116Test.java → csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ser/ObjectArrayNullWrite116Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.csv.tofix;
+package com.fasterxml.jackson.dataformat.csv.ser;
 
 import java.io.StringWriter;
 
@@ -7,41 +7,35 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.*;
-import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class NullWriting116Test extends ModuleTestBase
+public class ObjectArrayNullWrite116Test extends ModuleTestBase
 {
-    private final CsvMapper csv = mapperForCsv();
+    private final CsvMapper MAPPER = mapperForCsv();
 
-    // [dataformat#116]
-    @JacksonTestFailureExpected
+    // for [dataformats-text#116]
     @Test
-    public void testWithObjectArray() throws Exception 
+    public void testWithObjectArray() throws Exception
     {
         CsvSchema schema = CsvSchema.builder()
                                     .addColumn("a", CsvSchema.ColumnType.NUMBER)
                                     .addColumn("b", CsvSchema.ColumnType.NUMBER)
                                     .setUseHeader(true)
                                     .build();
-        ObjectWriter writer = csv.writer(schema);
+        ObjectWriter writer = MAPPER.writer(schema);
         StringWriter out = new StringWriter();
         SequenceWriter sequence = writer.writeValues(out);
 
         sequence.write(new Object[]{ 1, 2 });
-//        sequence.write(new Object[]{ null, 2 });
         sequence.write(new Object[]{ null, null });
         sequence.write(new Object[]{ 1, null });
 
         sequence.close();
 
-//System.err.println("CSV:\n"+out);
         assertEquals("a,b\n" +
                      "1,2\n" +
-//                     ",2\n" +
                      ",\n" +
                      "1,\n", out.toString());
     }
-
 }