FasterXML#359 override writeStartObject(Object forValue)

Author: arnaudroger

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

@@ -12,7 +12,7 @@
  * Specialized {@link JsonGeneratorDelegate} that allows use of
  * {@link TokenFilter} for outputting a subset of content that
  * caller tries to generate.
- * 
+ *
  * @since 2.6
  */
 public class FilteringGeneratorDelegate extends JsonGeneratorDelegate
@@ -22,7 +22,7 @@ public class FilteringGeneratorDelegate extends JsonGeneratorDelegate
     /* Configuration
     /**********************************************************
      */
-    
+
     /**
      * Object consulted to determine whether to write parts of content generator
      * is asked to write or not.
@@ -51,7 +51,7 @@ public class FilteringGeneratorDelegate extends JsonGeneratorDelegate
      * actual use case. But it seemed possible need could arise, which
      * is feature has not yet been removed. If no use is found within
      * first version or two, just remove.
-     * 
+     *
      * Marked as deprecated since its status is uncertain.
      */
     @Deprecated
@@ -76,7 +76,7 @@ public class FilteringGeneratorDelegate extends JsonGeneratorDelegate
      * property, and also used for array elements.
      */
     protected TokenFilter _itemFilter;
-    
+
     /**
      * Number of tokens for which {@link TokenFilter#INCLUDE_ALL}
      * has been returned
@@ -113,7 +113,7 @@ public FilteringGeneratorDelegate(JsonGenerator d, TokenFilter f,
     public JsonStreamContext getFilterContext() {
         return _filterContext;
     }
-    
+
     /**
      * Accessor for finding number of matches, where specific token and sub-tree
      * starting (if structured type) are passed.
@@ -127,7 +127,7 @@ public int getMatchCount() {
     /* Public API, accessors
     /**********************************************************
      */
-    
+
     @Override
     public JsonStreamContext getOutputContext() {
         /* 11-Apr-2015, tatu: Choice is between pre- and post-filter context;
@@ -136,13 +136,13 @@ public JsonStreamContext getOutputContext() {
          */
         return _filterContext;
     }
-    
+
     /*
     /**********************************************************
     /* Public API, write methods, structural
     /**********************************************************
      */
-    
+
     @Override
     public void writeStartArray() throws IOException
     {
@@ -173,7 +173,7 @@ public void writeStartArray() throws IOException
             _filterContext = _filterContext.createChildArrayContext(_itemFilter, false);
         }
     }
-        
+
     @Override
     public void writeStartArray(int size) throws IOException
     {
@@ -202,7 +202,7 @@ public void writeStartArray(int size) throws IOException
             _filterContext = _filterContext.createChildArrayContext(_itemFilter, false);
         }
     }
-    
+
     @Override
     public void writeEndArray() throws IOException
     {
@@ -230,7 +230,7 @@ public void writeStartObject() throws IOException
         if (f == null) {
             return;
         }
-        
+
         if (f != TokenFilter.INCLUDE_ALL) {
             f = f.filterStartObject();
         }
@@ -242,7 +242,37 @@ public void writeStartObject() throws IOException
             _filterContext = _filterContext.createChildObjectContext(f, false);
         }
     }
-    
+
+    @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
     {
@@ -315,7 +345,7 @@ public void writeString(String value) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeString(value);
     }
 
@@ -337,7 +367,7 @@ public void writeString(char[] text, int offset, int len) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeString(text, offset, len);
     }
 
@@ -358,7 +388,7 @@ public void writeString(SerializableString value) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeString(value);
     }
 
@@ -489,7 +519,7 @@ public void writeNumber(short v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -510,7 +540,7 @@ public void writeNumber(int v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -531,7 +561,7 @@ public void writeNumber(long v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -552,7 +582,7 @@ public void writeNumber(BigInteger v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -573,7 +603,7 @@ public void writeNumber(double v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -594,7 +624,7 @@ public void writeNumber(float v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -615,7 +645,7 @@ public void writeNumber(BigDecimal v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNumber(v);
     }
 
@@ -657,7 +687,7 @@ public void writeBoolean(boolean v) throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeBoolean(v);
     }
 
@@ -678,7 +708,7 @@ public void writeNull() throws IOException
                 }
             }
             _checkParentPath();
-        } 
+        }
         delegate.writeNull();
     }
 
@@ -695,7 +725,7 @@ public void writeOmittedField(String fieldName) throws IOException {
             delegate.writeOmittedField(fieldName);
         }
     }
-    
+
     /*
     /**********************************************************
     /* Public API, write methods, Native Ids
@@ -704,7 +734,7 @@ public void writeOmittedField(String fieldName) throws IOException {
 
     // 25-Mar-2015, tatu: These are tricky as they sort of predate actual filtering calls.
     //   Let's try to use current state as a clue at least...
-    
+
     @Override
     public void writeObjectId(Object id) throws IOException {
         if (_itemFilter != null) {
@@ -718,7 +748,7 @@ public void writeObjectRef(Object id) throws IOException {
             delegate.writeObjectRef(id);
         }
     }
-    
+
     @Override
     public void writeTypeId(Object id) throws IOException {
         if (_itemFilter != null) {
@@ -741,7 +771,7 @@ public void writeObject(Object pojo) throws IOException,JsonProcessingException
             delegate.writeObject(pojo);
             return;
         }
-        // NOTE: copied from 
+        // NOTE: copied from
         if (pojo == null) {
             writeNull();
         } else {
@@ -752,7 +782,7 @@ public void writeObject(Object pojo) throws IOException,JsonProcessingException
             _writeSimpleObject(pojo);
         }
     }
-    
+
     @Override
     public void writeTree(TreeNode rootNode) throws IOException {
         if (delegateCopyMethods) {
@@ -835,7 +865,7 @@ protected void _checkPropertyParentPath() throws IOException
             _filterContext.skipParentChecks();
         }
     }
-    
+
     protected boolean _checkBinaryWrite() throws IOException
     {
         if (_itemFilter == null) {
@@ -850,7 +880,7 @@ protected boolean _checkBinaryWrite() throws IOException
         }
         return false;
     }
-    
+
     protected boolean _checkRawValueWrite() throws IOException
     {
         if (_itemFilter == null) {