Fix #104

Author: cowtowncoder

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

@@ -439,7 +439,10 @@ public final void writeStartArray() throws IOException
          * can not nest arrays in objects
          */
         if (_writeContext.inObject()) {
-            if (!_skipValue) {
+            if ((_skipWithin == null)
+                    && _skipValue && isEnabled(JsonGenerator.Feature.IGNORE_UNKNOWN)) {
+                _skipWithin = _writeContext;
+            } else if (!_skipValue) {
                 // First: column may have its own separator
                 String sep;
 
@@ -463,11 +466,12 @@ public final void writeStartArray() throws IOException
                 }
                 _arrayElements = 0;
             }
-        } else if (!_arraySeparator.isEmpty()) {
-            // also: no nested arrays, yet
-            _reportError("CSV generator does not support nested Array values");
+        } else {
+            if (!_arraySeparator.isEmpty()) {
+                // also: no nested arrays, yet
+                _reportError("CSV generator does not support nested Array values");
+            }
         }
-            
         _writeContext = _writeContext.createChildArrayContext();
         // and that's about it, really
     }
@@ -478,11 +482,18 @@ public final void writeEndArray() throws IOException
         if (!_writeContext.inArray()) {
             _reportError("Current context not an ARRAY but "+_writeContext.getTypeDesc());
         }
+        _writeContext = _writeContext.getParent();
+        // 14-Dec-2015, tatu: To complete skipping of ignored structured value, need this:
+        if (_skipWithin != null) {
+            if (_writeContext == _skipWithin) {
+                _skipWithin = null;
+            }
+            return;
+        }
         if (!_arraySeparator.isEmpty()) {
             _arraySeparator = CsvSchema.NO_ARRAY_ELEMENT_SEPARATOR;
             _writer.write(_columnIndex(), _arrayContents.toString());
         }
-        _writeContext = _writeContext.getParent();
         /* 20-Nov-2014, tatu: When doing "untyped"/"raw" output, this means that row
          *    is now done. But not if writing such an array field, so:
          */
@@ -517,8 +528,10 @@ public final void writeEndObject() throws IOException
         }
         _writeContext = _writeContext.getParent();
         // 14-Dec-2015, tatu: To complete skipping of ignored structured value, need this:
-        if (_writeContext == _skipWithin) {
-            _skipWithin = null;
+        if (_skipWithin != null) {
+            if (_writeContext == _skipWithin) {
+                _skipWithin = null;
+            }
             return;
         }
         // not 100% fool-proof, but chances are row should be done now

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

@@ -423,5 +423,6 @@ public void testStrictColumnReturnsExpectedData() throws IOException {
         assertEquals(7, values.get(2).x);
         assertEquals(8, values.get(2).y.intValue());
         assertEquals(9, values.get(2).z.intValue());
+        iter.close();
     }
 }

src/test/java/com/fasterxml/jackson/dataformat/csv/ser/GeneratorIgnoreUnknownTest.java

@@ -30,6 +30,24 @@ public static class PointAndStuff {
 
         public PointAndStuff(Object s) { stuff = s; }
     }
+
+    // for [dataformat-csv#104]
+    @JsonPropertyOrder({ "x", "points", "y" })
+    public static class PointAndArray {
+        public int x = 1, y = 2;
+        
+        public List<Point> points = new ArrayList<Point>();
+        {
+            points.add(new Point());
+            points.add(new Point());
+        }
+
+        protected PointAndArray() { }
+        protected PointAndArray(int x, int y) {
+            this.x = x;
+            this.y = y;
+        }
+    }    
 
     /*
     /**********************************************************
@@ -89,4 +107,24 @@ public void testIgnoreObject() throws Exception
         assertNotNull(csv);
         assertEquals("1,2\n", csv);
     }
+
+    // for [dataformat-csv#104]
+    public void testIgnoreNested() throws Exception
+    {
+        ObjectMapper mapper = mapperForCsv();
+        final CsvSchema schema = CsvSchema.builder()
+                .addColumn("x")
+                .addColumn("y")
+                .build();
+        ObjectWriter writer = mapper.writerFor(PointAndArray.class)
+                .with(schema)
+                .with(JsonGenerator.Feature.IGNORE_UNKNOWN);
+
+        String csv = writer.writeValueAsString(new PointAndArray(3,5));
+
+System.err.       println("CSV:\n"+csv);
+        
+        assertNotNull(csv);
+        assertEquals("3,5\n", csv);
+    }
 }