Merge branch '2.10'

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -896,3 +896,7 @@ Victor Noël (victornoel@github)
    (2.10.0)
   * Reported #2339: Suboptimal return type for `ObjectNode.set()`
    (2.10.0)
+
+Chris Mercer (cmercer@github)
+  * Reported #2331: `JsonMappingException` through nested getter with generic wildcard return type
+   (2.10.0)

release-notes/VERSION-2.x

@@ -8,6 +8,8 @@ Project: jackson-databind
 
 #2331: `JsonMappingException` through nested getter with generic wildcard return type
  (reported by sunchezz89@github)
+#2390: `Iterable` serialization breaks when adding `@JsonFilter` annotation
+ (reported by Chris M)
 #2392: `BeanDeserializerModifier.modifyDeserializer()` not applied to custom bean deserializers
  (reported by andreasbaus@github)
 #2393: `TreeTraversingParser.getLongValue()` incorrectly checks `canConvertToInt()`

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

@@ -219,16 +219,10 @@ protected JsonSerializer<?> _createSerializer2(SerializerProvider ctxt,
                     // And this is where this class comes in: if type is not a
                     // known "primary JDK type", perhaps it's a bean? We can still
                     // get a null, if we can't find a single suitable bean property.
-                    ser = findBeanSerializer(ctxt, beanDesc, type, formatOverrides);
+                    ser = constructBeanOrAddOnSerializer(ctxt, type, beanDesc, formatOverrides, staticTyping);
                     // Finally: maybe we can still deal with it as an implementation of some basic JDK interface?
                     if (ser == null) {
-                        ser = findSerializerByAddonType(ctxt, type, beanDesc, formatOverrides, staticTyping);
-                        // 18-Sep-2014, tatu: Actually, as per [jackson-databind#539], need to get
-                        //   'unknown' serializer assigned earlier, here, so that it gets properly
-                        //   post-processed
-                        if (ser == null) {
-                            ser = ctxt.getUnknownTypeSerializer(beanDesc.getBeanClass());
-                        }
+                        ser = ctxt.getUnknownTypeSerializer(beanDesc.getBeanClass());
                     }
                 }
             }
@@ -242,43 +236,31 @@ protected JsonSerializer<?> _createSerializer2(SerializerProvider ctxt,
         return ser;
     }
 
-    /*
-    /**********************************************************************
-    /* Other public methods that are not part of `SerializerFactory` API
-    /**********************************************************************
-     */
-
-    /**
-     * Method that will try to construct a {@link BeanSerializer} for
-     * given class. Returns null if no properties are found.
-     */
-    public JsonSerializer<Object> findBeanSerializer(SerializerProvider ctxt, BeanDescription beanDesc,
-            JavaType type, JsonFormat.Value format)
-        throws JsonMappingException
-    {
-        // First things first: we know some types are not beans...
-        if (!isPotentialBeanType(type.getRawClass())) {
-            // Except we do need to allow serializers for Enums, if shape dictates (which it does
-            // if we end up here)
-            if (!type.isEnumType()) {
-                return null;
-            }
-        }
-        return constructBeanSerializer(ctxt, beanDesc);
-    }
-
     /*
     /**********************************************************************
     /* Overridable non-public factory methods
     /**********************************************************************
      */
 
     /**
-     * Method called to construct serializer for serializing specified bean type.
+     * Method called to construct serializer based on checking which condition is matched:
+     * <ol>
+     *  <li>Nominal type is {@code java.lang.Object}: if so, return special "no type known" serializer
+     *   </li>
+     *  <li>If a known "not-POJO" type (like JDK {@code Proxy}), return {@code null}
+     *   </li>
+     *  <li>If at least one logical property found, build actual {@code BeanSerializer}
+     *   </li>
+     *  <li>If add-on type (like {@link java.lang.Iterable}) found, create appropriate serializer
+     *   </li>
+     *  <li>If one of Jackson's "well-known" annotations found, create bogus "empty Object" Serializer
+     *   </li>
+     *  </ol>
+     *  or, if none matched, return {@code null}.
      */
     @SuppressWarnings("unchecked")
-    protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider ctxt,
-            BeanDescription beanDesc)
+    protected JsonSerializer<Object> constructBeanOrAddOnSerializer(SerializerProvider ctxt,
+            JavaType type, BeanDescription beanDesc, JsonFormat.Value format, boolean staticTyping)
         throws JsonMappingException
     {
         // 13-Oct-2010, tatu: quick sanity check: never try to create bean serializer for plain Object
@@ -287,6 +269,16 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider ctxt
             return ctxt.getUnknownTypeSerializer(Object.class);
 //            throw new IllegalArgumentException("Cannot create bean serializer for Object.class");
         }
+
+        // We also know some types are not beans...
+        if (!isPotentialBeanType(type.getRawClass())) {
+            // Except we do need to allow serializers for Enums, if shape dictates (which it does
+            // if we end up here)
+            if (!type.isEnumType()) {
+                return null;
+            }
+        }
+        
         final SerializationConfig config = ctxt.getConfig();
         BeanSerializerBuilder builder = constructBeanSerializerBuilder(beanDesc);
         builder.setConfig(config);
@@ -329,18 +321,18 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider ctxt
 
         AnnotatedMember anyGetter = beanDesc.findAnyGetter();
         if (anyGetter != null) {
-            JavaType type = anyGetter.getType();
+            JavaType anyType = anyGetter.getType();
             // copied from BasicSerializerFactory.buildMapSerializer():
-            boolean staticTyping = config.isEnabled(MapperFeature.USE_STATIC_TYPING);
-            JavaType valueType = type.getContentType();
+            JavaType valueType = anyType.getContentType();
             TypeSerializer typeSer = ctxt.findTypeSerializer(valueType);
             // last 2 nulls; don't know key, value serializers (yet)
             // 23-Feb-2015, tatu: As per [databind#705], need to support custom serializers
             JsonSerializer<?> anySer = findSerializerFromAnnotation(ctxt, anyGetter);
             if (anySer == null) {
                 // TODO: support '@JsonIgnoreProperties' with any setter?
                 anySer = MapSerializer.construct(/* ignored props*/ (Set<String>) null,
-                        type, staticTyping, typeSer, null, null, /*filterId*/ null);
+                        anyType, config.isEnabled(MapperFeature.USE_STATIC_TYPING),
+                        typeSer, null, null, /*filterId*/ null);
             }
             // TODO: can we find full PropertyName?
             PropertyName name = PropertyName.construct(anyGetter.getName());
@@ -366,11 +358,15 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider ctxt
                     beanDesc.getType(), e.getClass().getName(), e.getMessage());
         }
         if (ser == null) {
-            // If we get this far, there were no properties found, so no regular BeanSerializer
-            // would be constructed. But, couple of exceptions.
-            // First: if there are known annotations, just create 'empty bean' serializer
-            if (beanDesc.hasKnownClassAnnotations()) {
-                return builder.createDummy();
+            // [databind#2390]: Need to consider add-ons before fallback "empty" serializer
+            ser = (JsonSerializer<Object>) findSerializerByAddonType(ctxt, type, beanDesc, format, staticTyping);
+            if (ser == null) {
+                // If we get this far, there were no properties found, so no regular BeanSerializer
+                // would be constructed. But, couple of exceptions.
+                // First: if there are known annotations, just create 'empty bean' serializer
+                if (beanDesc.hasKnownClassAnnotations()) {
+                    return builder.createDummy();
+                }
             }
         }
         return ser;

src/test/java/com/fasterxml/jackson/databind/jsontype/TestWithGenerics.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
 
 public class TestWithGenerics extends BaseMapTest
@@ -96,22 +95,8 @@ public void resolve(SerializerProvider provider) throws JsonMappingException
             beanSerializer.resolve(provider);
         }
     }
-    
-    @SuppressWarnings("serial")
-    protected static class CustomJsonSerializerFactory extends BeanSerializerFactory
-    {
-        public CustomJsonSerializerFactory() { super(null); }
-
-        @Override
-        protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov,
-                BeanDescription beanDesc)
-            throws JsonMappingException
-        {                
-            return new CustomJsonSerializer(super.constructBeanSerializer(prov, beanDesc) );
-        }
-    }
 
-    // [Issue#543]
+    // [databind#543]
     static class ContainerWithTwoAnimals<U extends Animal,V extends Animal> extends ContainerWithField<U> {
          public V otherAnimal;
 
@@ -195,25 +180,7 @@ public void testJackson387() throws Exception
         assertEquals(4, mc2.params.size());
     }
 
-    public void testJackson430() throws Exception
-    {
-//        om.getSerializationConfig().setSerializationInclusion( Inclusion.NON_NULL );
-        ObjectMapper om = jsonMapperBuilder()
-                .serializerFactory(new CustomJsonSerializerFactory())
-                .build();
-        MyClass mc = new MyClass();
-        mc.params.add(new MyParam<Integer>(1));
-
-        String str = om.writeValueAsString( mc );
-//        System.out.println( str );
-        
-        MyClass mc2 = om.readValue( str, MyClass.class );
-        assertNotNull(mc2);
-        assertNotNull(mc2.params);
-        assertEquals(1, mc2.params.size());
-    }
-
-    // [Issue#543]
+    // [databind#543]
     public void testValueWithMoreGenericParameters() throws Exception
     {
         WrappedContainerWithField wrappedContainerWithField = new WrappedContainerWithField();

src/test/java/com/fasterxml/jackson/databind/ser/TestIterable.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.core.JsonGenerator;
 
 import com.fasterxml.jackson.databind.*;
@@ -45,7 +46,7 @@ static class BeanWithIterator {
 
         public Iterator<String> getValues() { return values.iterator(); }
     }
-    
+
     static class IntIterable implements Iterable<Integer>
     {
         @Override
@@ -99,6 +100,10 @@ public void serialize(A a, JsonGenerator jsonGenerator, SerializerProvider provi
         }
     }
 
+    // [databind#2390]
+    @JsonFilter("default")
+    static class IntIterable2390 extends IntIterable { }
+
     /*
     /**********************************************************************
     /* Test methods
@@ -168,4 +173,11 @@ public void testIterable358() throws Exception {
         String json = MAPPER.writeValueAsString(new B());
         assertEquals("{\"list\":[[\"Hello world.\"]]}", json);
     }
+
+    // [databind#2390]
+    public void testIterableWithAnnotation() throws Exception
+    {
+        assertEquals("[1,2,3]",
+                STATIC_MAPPER.writeValueAsString(new IntIterable2390()));
+    }
 }