try to fix custom deserializer for Optional

Author: cowtowncoder

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

@@ -17,22 +17,19 @@
 class Jdk8Deserializers extends Deserializers.Base
 {
     @Override
-    public JsonDeserializer<?> findBeanDeserializer(JavaType type, DeserializationConfig config, BeanDescription beanDesc)
-    throws JsonMappingException
+    public JsonDeserializer<?> findBeanDeserializer(JavaType type,
+            DeserializationConfig config, BeanDescription beanDesc)
+        throws JsonMappingException
     {
         final Class<?> raw = type.getRawClass();
         if (raw == Optional.class) {
             JavaType[] types = config.getTypeFactory().findTypeParameters(type, Optional.class);
             JavaType refType = (types == null) ? TypeFactory.unknownType() : types[0];
-            JsonDeserializer<?> valueDeser = type.getValueHandler();
-            TypeDeserializer typeDeser = type.getTypeHandler();
-            // [jackson-datatype-guava:Issue#42]: Polymorphic types need type deserializer
+            JsonDeserializer<?> valueDeser = refType.getValueHandler();
+            TypeDeserializer typeDeser = refType.getTypeHandler();
+            // [jackson-datatype#42]: Polymorphic types need type deserializer
             if (typeDeser == null) {
-                try {
-                    typeDeser = config.findTypeDeserializer(refType);
-                } catch (NoSuchMethodError e) { // Running on Jackson 2.3.x, remove this ugly hack once we drop support
-                    typeDeser = null;
-                }
+                typeDeser = config.findTypeDeserializer(refType);
             }
             return new OptionalDeserializer(type, refType, typeDeser, valueDeser);
         }

src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalTest.java

@@ -4,8 +4,19 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
 public class OptionalTest extends ModuleTestBase
 {
@@ -92,6 +103,39 @@ public BooleanBean(Boolean b) {
         }
     }
 
+    static class CaseChangingStringWrapper {
+        @JsonSerialize(contentUsing=UpperCasingSerializer.class)
+        @JsonDeserialize(contentUsing=LowerCasingDeserializer.class)
+        public Optional<String> value;
+
+        CaseChangingStringWrapper() { }
+        public CaseChangingStringWrapper(String s) { value = Optional.ofNullable(s); }
+    }
+
+    @SuppressWarnings("serial")
+    public static class UpperCasingSerializer extends StdScalarSerializer<String>
+    {
+        public UpperCasingSerializer() { super(String.class); }
+
+        @Override
+        public void serialize(String value, JsonGenerator gen,
+                SerializerProvider provider) throws IOException {
+            gen.writeString(value.toUpperCase());
+        }
+    }
+
+    @SuppressWarnings("serial")
+    public static class LowerCasingDeserializer extends StdScalarDeserializer<String>
+    {
+        public LowerCasingDeserializer() { super(String.class); }
+
+        @Override
+        public String deserialize(JsonParser p, DeserializationContext ctxt)
+                throws IOException, JsonProcessingException {
+            return p.getText().toLowerCase();
+        }
+    }
+
     private ObjectMapper MAPPER;
 
     @Override
@@ -249,7 +293,23 @@ public void testBoolean() throws Exception
         assertNotNull(b.value);
         assertFalse(b.value.isPresent());
     }
-    
+
+    /*
+    public void testWithCustomDeserializer() throws Exception
+    {
+        CaseChangingStringWrapper w = MAPPER.readValue(aposToQuotes("{'value':'FoobaR'}"),
+                CaseChangingStringWrapper.class);
+        assertEquals("foobar", w.value.get());
+    }
+    */
+
+    public void testCustomSerializer() throws Exception
+    {
+        final String VALUE = "fooBAR";
+        String json = MAPPER.writeValueAsString(new CaseChangingStringWrapper(VALUE));
+        assertEquals(json, aposToQuotes("{'value':'FOOBAR'}"));
+    }
+
     /*
     /**********************************************************
     /* Helper methods