Merge branch '2.6'

Conflicts:
	pom.xml
	release-notes/VERSION
	src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalSerializer.java

Author: cowtowncoder

.gitattributes

@@ -0,0 +1,3 @@
+# Do not merge `pom.xml` from older version, as it will typically conflict
+
+pom.xml merge=ours

pom.xml

@@ -22,6 +22,7 @@ JDK 8 data types.
   </scm>
   <properties>
     <version.jackson.core>2.7.3</version.jackson.core>
+
     <!-- explicitly target JDK 8 -->
     <javac.src.version>1.8</javac.src.version>
     <javac.target.version>1.8</javac.target.version>

release-notes/VERSION

@@ -4,6 +4,12 @@ Project: jackson-datatype-jdk8
 === Releases ===
 ------------------------------------------------------------------------
 
+2.7.4 (not yet release)
+
+#31: Support `@JsonSerialize(contentUsing=)` and `@JsonDeserialize(contentUsing=)`
+  for `Optional`
+ (reported by selenareneephillips)
+
 2.7.3 (16-Mar-2016)
 2.7.2 (27-Feb-2016)
 2.7.1 (02-Feb-2016)
@@ -15,7 +21,13 @@ No changes since 2.7.0
 #18: Allow use of `@JsonInclude(content=Include.NON_EMPTY)` with `Optional<>`
  (requested by James L)
 
-2.6.4 (not yet released)
+2.6.6 (not yet released)
+
+2.6.5 (19-Jan-2016)
+
+No changes since 2.6.4.
+
+2.6.4 (07-Dec-2015)
 
 #20: fails to serialize empty Optional with @JsonUnwrapped annotation
  (reported by Peter R, osi@github)

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

@@ -10,6 +10,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;
@@ -137,14 +138,17 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
         if (vts != null) {
             vts = vts.forProperty(property);
         }
-        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);
         }
         // Also: may want to have more refined exclusion based on referenced value
         JsonInclude.Include contentIncl = _contentInclusion;
@@ -325,4 +329,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;
+    }
 }