Fix problem with Optional, @JsonSerialize(contentUsing=) (#31)

Author: cowtowncoder

release-notes/VERSION

@@ -4,6 +4,12 @@ Project: jackson-datatype-jdk8
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.6 (not yet released)
+
+#31: Support `@JsonSerialize(contentUsing=)` and `@JsonDeserialize(contentUsing=)`
+  for `Optional`
+ (reported by selenareneephillips)
+
 2.6.5 (19-Jan-2016)
 
 No changes since 2.6.4.

src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalSerializer.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 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.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
@@ -83,14 +84,17 @@ protected OptionalSerializer withResolved(BeanProperty prop,
     public JsonSerializer<?> createContextual(SerializerProvider provider,
             BeanProperty property) throws JsonMappingException
     {
-        JsonSerializer<?> ser = _valueSerializer;
+        JsonSerializer<?> ser = findContentSerializer(provider, property);
         if (ser == null) {
-            // A few conditions needed to be able to fetch serializer here:
-            if (_useStatic(provider, property, _referredType)) {
-                ser = _findSerializer(provider, _referredType, property);
+            ser = _valueSerializer;
+            if (ser == null) {
+                // A few conditions needed to be able to fetch serializer here:
+                if (_useStatic(provider, property, _referredType)) {
+                    ser = _findSerializer(provider, _referredType, property);
+                }
+            } else {
+                ser = provider.handlePrimaryContextualization(ser, property);
             }
-        } else {
-            ser = provider.handlePrimaryContextualization(ser, property);
         }
         return withResolved(property, ser, _unwrapper);
     }
@@ -262,4 +266,24 @@ private final JsonSerializer<Object> _findSerializer(SerializerProvider provider
     {
         return provider.findTypedValueSerializer(type, true, prop);
     }
+
+    // !!! 22-Mar-2016, tatu: Method added in jackson-databind 2.7.4; may be used
+    //    when we go 2.8
+    protected JsonSerializer<?> findContentSerializer(SerializerProvider serializers,
+            BeanProperty property)
+        throws JsonMappingException
+    {
+        if (property != null) {
+            // First: if we have a property, may have property-annotation overrides
+            AnnotatedMember m = property.getMember();
+            final AnnotationIntrospector intr = serializers.getAnnotationIntrospector();
+            if (m != null) {
+                Object serDef = intr.findContentSerializer(m);
+                if (serDef != null) {
+                    return serializers.serializerInstance(m, serDef);
+                }
+            }
+        }
+        return null;
+    }
 }