Fix #42 for master (2.4.0)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaDeserializers.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.MapLikeType;
 import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.datatype.guava.deser.*;
 import com.fasterxml.jackson.datatype.guava.deser.multimap.list.ArrayListMultimapDeserializer;
 import com.fasterxml.jackson.datatype.guava.deser.multimap.list.LinkedListMultimapDeserializer;
@@ -210,12 +211,19 @@ public JsonDeserializer<?> findMapLikeDeserializer(MapLikeType type,
 
     @Override
     public JsonDeserializer<?> findBeanDeserializer(final JavaType type, DeserializationConfig config,
-            BeanDescription beanDesc) throws JsonMappingException {
+            BeanDescription beanDesc) throws JsonMappingException
+    {
         Class<?> raw = type.getRawClass();
         if (Optional.class.isAssignableFrom(raw)){
+            JavaType[] types = config.getTypeFactory().findTypeParameters(type, Optional.class);
+            JavaType refType = (types == null) ? TypeFactory.unknownType() : types[0];
             JsonDeserializer<?> valueDeser = type.getValueHandler();
             TypeDeserializer typeDeser = type.getTypeHandler();
-            return new GuavaOptionalDeserializer(type, typeDeser, valueDeser);
+            // [Issue#42]: Polymorphic types need type deserializer
+            if (typeDeser == null) {
+                typeDeser = config.findTypeDeserializer(refType);
+            }
+            return new GuavaOptionalDeserializer(type, refType, typeDeser, valueDeser);
         }
         if (Range.class.isAssignableFrom(raw)) {
             return new RangeDeserializer(type);

src/main/java/com/fasterxml/jackson/datatype/guava/deser/GuavaOptionalDeserializer.java

@@ -21,39 +21,38 @@ public class GuavaOptionalDeserializer
 {
     private static final long serialVersionUID = 1L;
 
+    protected final JavaType _fullType;
+    
     protected final JavaType _referenceType;
 
     protected final JsonDeserializer<?> _valueDeserializer;
 
     protected final TypeDeserializer _valueTypeDeserializer;
 
-    @Deprecated // since 2.3, 
-    public GuavaOptionalDeserializer(JavaType valueType) {
-        this(valueType, null, null);
-    }
-    
-    public GuavaOptionalDeserializer(JavaType valueType,
+    public GuavaOptionalDeserializer(JavaType fullType, JavaType refType,
             TypeDeserializer typeDeser, JsonDeserializer<?> valueDeser)
     {
-        super(valueType);
-        _referenceType = valueType.containedType(0);
+        super(fullType);
+        _fullType = fullType;
+        _referenceType = refType;
         _valueTypeDeserializer = typeDeser;
         _valueDeserializer = valueDeser;
     }
 
     @Override
-    public Optional<?> getNullValue() {
-        return Optional.absent();
-    }
+    public JavaType getValueType() { return _fullType; }
+    
+    @Override
+    public Optional<?> getNullValue() { return Optional.absent(); }
 
     /**
      * Overridable fluent factory method used for creating contextual
      * instances.
      */
-    public GuavaOptionalDeserializer withResolved(
+    protected GuavaOptionalDeserializer withResolved(
             TypeDeserializer typeDeser, JsonDeserializer<?> valueDeser)
     {
-        return new GuavaOptionalDeserializer(_referenceType,
+        return new GuavaOptionalDeserializer(_fullType, _referenceType,
                 typeDeser, valueDeser);
     }
 
@@ -74,8 +73,11 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
     {
         JsonDeserializer<?> deser = _valueDeserializer;
         TypeDeserializer typeDeser = _valueTypeDeserializer;
+
         if (deser == null) {
             deser = ctxt.findContextualValueDeserializer(_referenceType, property);
+        } else { // otherwise directly assigned, probably not contextual yet:
+            deser = ctxt.handleSecondaryContextualization(deser, property);
         }
         if (typeDeser != null) {
             typeDeser = typeDeser.forProperty(property);
@@ -88,7 +90,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
 
     @Override
     public Optional<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException,
-            JsonProcessingException
+        JsonProcessingException
     {
         Object refd;
 

src/test/java/com/fasterxml/jackson/datatype/guava/TestOptionalWithPolymorphic.java

@@ -0,0 +1,106 @@
+package com.fasterxml.jackson.datatype.guava;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+
+public class TestOptionalWithPolymorphic extends BaseTest
+{
+    static class ContainerA {
+        @JsonProperty private Optional<String> name = Optional.absent();
+        @JsonProperty private Optional<Strategy> strategy = Optional.absent();
+    }
+
+    static class ContainerB {
+        @JsonProperty private Optional<String> name = Optional.absent();
+        @JsonProperty private Strategy strategy = null;
+    }
+         
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+    @JsonSubTypes({
+    @JsonSubTypes.Type(name = "Foo", value = Foo.class),
+    @JsonSubTypes.Type(name = "Bar", value = Bar.class),
+    @JsonSubTypes.Type(name = "Baz", value = Baz.class)
+    })
+    interface Strategy {
+    }
+     
+    static class Foo implements Strategy {
+        @JsonProperty private final int foo;
+        @JsonCreator Foo(@JsonProperty("foo") int foo) {
+            this.foo = foo;
+        }
+    }
+         
+    static class Bar implements Strategy {
+        @JsonProperty private final boolean bar;
+        @JsonCreator Bar(@JsonProperty("bar") boolean bar) {
+            this.bar = bar;
+        }
+    }
+         
+    static class Baz implements Strategy {
+        @JsonProperty private final String baz;
+        @JsonCreator Baz(@JsonProperty("baz") String baz) {
+            this.baz = baz;
+        }
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    final ObjectMapper MAPPER = mapperWithModule();
+    
+    public void testOptionalMapsFoo() throws Exception {
+
+        ImmutableMap<String, Object> foo = ImmutableMap.<String, Object>builder()
+            .put("name", "foo strategy")
+            .put("strategy", ImmutableMap.builder()
+            .put("type", "Foo")
+            .put("foo", 42)
+            .build())
+            .build();
+        _test(MAPPER, foo);
+    }
+
+    public void testOptionalMapsBar() throws Exception {
+
+        ImmutableMap<String, Object> bar = ImmutableMap.<String, Object>builder()
+            .put("name", "bar strategy")
+            .put("strategy", ImmutableMap.builder()
+            .put("type", "Bar")
+            .put("bar", true)
+            .build())
+            .build();
+        _test(MAPPER, bar);
+    }
+
+    public void testOptionalMapsBaz() throws Exception {
+        ImmutableMap<String, Object> baz = ImmutableMap.<String, Object>builder()
+            .put("name", "baz strategy")
+            .put("strategy", ImmutableMap.builder()
+            .put("type", "Baz")
+            .put("baz", "hello world!")
+            .build())
+            .build();
+        _test(MAPPER, baz);
+    }
+         
+    private void _test(ObjectMapper m, Map<String, ?> map) throws Exception
+    {
+        String json = m.writeValueAsString(map);
+
+        ContainerA objA = m.readValue(json, ContainerA.class);
+        assertNotNull(objA);
+
+        ContainerB objB = m.readValue(json, ContainerB.class);
+        assertNotNull(objB);
+    }
+}