Implemented #307

Author: cowtowncoder

release-notes/VERSION

@@ -37,6 +37,7 @@ New minor version.
 #305: Add support for accessing `TypeFactory` via `TypeIdResolverBase`
  (not yet via `TypeIdResolver` interface), other configuration
 #306: Allow use of `@JsonFilter` for properties, not just classes 
+#307: Allow use of `@JsonFilter` for Maps in addition to POJOs
 #308: Improve serialization and deserialization speed of `java.util.UUID` by 4x
  (suggested by David P)
 #310: Improve `java.util.UUID` serialization with binary codecs, to use "raw" form.

src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java

@@ -728,9 +728,10 @@ protected JsonSerializer<?> buildMapSerializer(SerializationConfig config,
                 ser = new EnumMapSerializer(type.getContentType(), staticTyping, enums,
                     elementTypeSerializer, elementValueSerializer);
             } else {
+                Object filterId = findFilterId(config, beanDesc);
                 ser = MapSerializer.construct(config.getAnnotationIntrospector().findPropertiesToIgnore(beanDesc.getClassInfo()),
                     type, staticTyping, elementTypeSerializer,
-                    keySerializer, elementValueSerializer);
+                    keySerializer, elementValueSerializer, filterId);
             }
         }
         // [Issue#120]: Allow post-processing
@@ -948,6 +949,15 @@ protected JsonSerializer<Object> _findContentSerializer(SerializerProvider prov,
         return null;
     }
 
+    /**
+     * Method called to find filter that is configured to be used with bean
+     * serializer being built, if any.
+     */
+    protected Object findFilterId(SerializationConfig config, BeanDescription beanDesc)
+    {
+        return config.getAnnotationIntrospector().findFilterId((Annotated)beanDesc.getClassInfo());
+    }
+    
     /**
      * @deprecated Since 2.1: use method without 'property'
      */

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java

@@ -405,7 +405,7 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov
         builder.setFilterId(findFilterId(config, beanDesc));
 
         AnnotatedMember anyGetter = beanDesc.findAnyGetter();
-        if (anyGetter != null) { // since 1.6
+        if (anyGetter != null) {
             if (config.canOverrideAccessModifiers()) {
                 anyGetter.fixAccess();
             }
@@ -415,8 +415,9 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov
             JavaType valueType = type.getContentType();
             TypeSerializer typeSer = createTypeSerializer(config, valueType);
             // last 2 nulls; don't know key, value serializers (yet)
+            // TODO: support '@JsonIgnoreProperties' with any setter?
             MapSerializer mapSer = MapSerializer.construct(/* ignored props*/ null, type, staticTyping,
-                    typeSer, null, null);
+                    typeSer, null, null, /*filterId*/ null);
             // TODO: can we find full PropertyName?
             PropertyName name = new PropertyName(anyGetter.getName());
             BeanProperty.Std anyProp = new BeanProperty.Std(name, valueType, null,
@@ -519,15 +520,6 @@ protected PropertyBuilder constructPropertyBuilder(SerializationConfig config,
     protected BeanSerializerBuilder constructBeanSerializerBuilder(BeanDescription beanDesc) {
         return new BeanSerializerBuilder(beanDesc);
     }
-
-    /**
-     * Method called to find filter that is configured to be used with bean
-     * serializer being built, if any.
-     */
-    protected Object findFilterId(SerializationConfig config, BeanDescription beanDesc)
-    {
-        return config.getAnnotationIntrospector().findFilterId((Annotated)beanDesc.getClassInfo());
-    }
 
     /*
     /**********************************************************

src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.Annotated;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonMapFormatVisitor;
@@ -172,13 +171,32 @@ public MapSerializer withResolved(BeanProperty property,
         return new MapSerializer(this, property, keySerializer, valueSerializer, ignored);
     }
 
+    /**
+     * @since 2.3
+     */
     public MapSerializer withFilterId(Object filterId) {
         return (_filterId == filterId) ? this : new MapSerializer(this, filterId);
     }
-    
+
+    /**
+     * @deprecated Since 2.3 use the method that takes `filterId`
+     */
+    @Deprecated
     public static MapSerializer construct(String[] ignoredList, JavaType mapType,
             boolean staticValueType, TypeSerializer vts,
             JsonSerializer<Object> keySerializer, JsonSerializer<Object> valueSerializer)
+    {
+        return construct(ignoredList, mapType, staticValueType, vts,
+                keySerializer, valueSerializer);
+    }
+
+    /**
+     * @since 2.3
+     */
+    public static MapSerializer construct(String[] ignoredList, JavaType mapType,
+            boolean staticValueType, TypeSerializer vts,
+            JsonSerializer<Object> keySerializer, JsonSerializer<Object> valueSerializer,
+            Object filterId)
     {
         HashSet<String> ignoredEntries = toSet(ignoredList);
         JavaType keyType, valueType;
@@ -198,8 +216,12 @@ public static MapSerializer construct(String[] ignoredList, JavaType mapType,
                 staticValueType = false;
             }
         }
-        return new MapSerializer(ignoredEntries, keyType, valueType, staticValueType, vts,
+        MapSerializer ser = new MapSerializer(ignoredEntries, keyType, valueType, staticValueType, vts,
                 keySerializer, valueSerializer);
+        if (filterId != null) {
+            ser = ser.withFilterId(filterId);
+        }
+        return ser;
     }
 
     private static HashSet<String> toSet(String[] ignoredEntries) {

src/test/java/com/fasterxml/jackson/databind/filter/TestMapFiltering.java

@@ -11,6 +11,7 @@
 public class TestMapFiltering extends BaseMapTest
 {
     @SuppressWarnings("serial")
+    @JsonFilter("filterForMaps")
     static class FilteredBean extends LinkedHashMap<String,Integer> { }
 
     static class MapBean {
@@ -46,7 +47,7 @@ public void testMapFilteringViaClass() throws Exception
         FilteredBean bean = new FilteredBean();
         bean.put("a", 4);
         bean.put("b", 3);
-        FilterProvider prov = new SimpleFilterProvider().addFilter("filterX",
+        FilterProvider prov = new SimpleFilterProvider().addFilter("filterForMaps",
                 SimpleBeanPropertyFilter.filterOutAllExcept("b"));
         assertEquals(aposToQuotes("{'b':3}"),
                 MAPPER.writer(prov).writeValueAsString(bean));