Backport fix for #359 in 2.8

Author: cowtowncoder

release-notes/CREDITS

@@ -111,3 +111,7 @@ Kevin Gallardo (newkek@github)
 Alessio Soldano (asoldano@github)
   * Contributed #322: Trim tokens in error messages to 256 byte to prevent attacks
    (2.8.6)
+
+Arnaud Roger (arnaudroger@github)
+  * Contributed #359: FilteringGeneratorDelegate does not override writeStartObject(Object forValue)
+   (2.8.8)

release-notes/VERSION

@@ -18,6 +18,11 @@ JSON library.
 
 #304: Optimize `NumberOutput.outputLong()` method
 
+2.8.8 (not yet released)
+
+#359: FilteringGeneratorDelegate does not override writeStartObject(Object forValue)
+ (contributed by Arnaud R)
+
 2.8.7 (21-Feb-2017)
 
 #349: CharsToNameCanonicalizer performance bottleneck 

src/main/java/com/fasterxml/jackson/core/filter/FilteringGeneratorDelegate.java

@@ -243,6 +243,36 @@ public void writeStartObject() throws IOException
         }
     }
 
+    @Override
+    public void writeStartObject(Object forValue) throws IOException
+    {
+        if (_itemFilter == null) {
+            _filterContext = _filterContext.createChildObjectContext(_itemFilter, false);
+            return;
+        }
+        if (_itemFilter == TokenFilter.INCLUDE_ALL) {
+            _filterContext = _filterContext.createChildObjectContext(_itemFilter, true);
+            delegate.writeStartObject(forValue);
+            return;
+        }
+
+        TokenFilter f = _filterContext.checkValue(_itemFilter);
+        if (f == null) {
+            return;
+        }
+
+        if (f != TokenFilter.INCLUDE_ALL) {
+            f = f.filterStartObject();
+        }
+        if (f == TokenFilter.INCLUDE_ALL) {
+            _checkParentPath();
+            _filterContext = _filterContext.createChildObjectContext(f, true);
+            delegate.writeStartObject(forValue);
+        } else { // filter out
+            _filterContext = _filterContext.createChildObjectContext(f, false);
+        }
+    }
+
     @Override
     public void writeEndObject() throws IOException
     {

src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java

@@ -305,4 +305,29 @@ public void testIndexMatchWithPath2() throws Exception
         writeJsonDoc(JSON_F, JSON, gen);
         assertEquals(aposToQuotes("{'array':[1,2]}"), w.toString());
     }
+
+    public void testWriteStartObjectWithObject() throws Exception
+    {
+        StringWriter w = new StringWriter();
+
+        JsonGenerator gen = new FilteringGeneratorDelegate(JSON_F.createGenerator(w),
+                TokenFilter.INCLUDE_ALL,
+                true, true);
+
+        String value = "val";
+
+        gen.writeStartObject(new Object());
+        gen.writeFieldName("field1");
+        {
+            gen.writeStartObject(value);
+            gen.writeEndObject();
+        }
+
+        gen.writeFieldName("field2");
+        gen.writeString("val2");
+
+        gen.writeEndObject();
+        gen.close();
+        assertEquals(aposToQuotes("{'field1':{},'field2':'val2'}"), w.toString());
+    }
 }