Add a (failing) test for #17

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

@@ -339,8 +339,8 @@ protected JsonSerializer<?> findContentSerializer(SerializerProvider serializers
         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) {
+                final AnnotationIntrospector intr = serializers.getAnnotationIntrospector();
                 Object serDef = intr.findContentSerializer(m);
                 if (serDef != null) {
                     return serializers.serializerInstance(m, serDef);

datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalnclusionTest.java

@@ -38,6 +38,12 @@ public static <T> OptionalGenericData<T> construct(T data) {
         }
     }
 
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
     private final ObjectMapper MAPPER = mapperWithModule();
 
     public void testSerOptNonEmpty() throws Exception
@@ -49,6 +55,15 @@ public void testSerOptNonEmpty() throws Exception
         assertEquals("{}", value);
     }
 
+    public void testSerOptNonDefault() throws Exception
+    {
+        OptionalData data = new OptionalData();
+        data.myString = null;
+        String value = mapperWithModule().setSerializationInclusion(
+                JsonInclude.Include.NON_DEFAULT).writeValueAsString(data);
+        assertEquals("{}", value);
+    }
+
     public void testSerOptNonAbsent() throws Exception
     {
         OptionalData data = new OptionalData();

datatypes/src/test/java/com/fasterxml/jackson/failing/ContextualOptional17Test.java

@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.Date;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.ModuleTestBase;
+
+public class ContextualOptional17Test extends ModuleTestBase
+{
+    // [datatypes-java8#17]
+    @JsonPropertyOrder({ "date1", "date2" })
+    static class ContextualOptionals
+    {
+        @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+        public Optional<Date> date1;
+
+        @JsonFormat(shape=JsonFormat.Shape.STRING, pattern="yyyy-MM")
+        public Optional<Date> date2;
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = mapperWithModule();
+
+    public void testContextualOptionals() throws Exception
+    {
+        ContextualOptionals input = new ContextualOptionals();
+        input.date1 = Optional.ofNullable(new Date(0L));
+        input.date2 = Optional.ofNullable(new Date(0L));
+        assertEquals(aposToQuotes("{'date1':'1970-01-01','date2':'1970-01'"),
+                MAPPER.writeValueAsString(input));
+    }        
+}