Fix #42 for 2.3.4 as well

Author: cowtowncoder

release-notes/VERSION

@@ -1,15 +1,20 @@
 Project: jackson-datatype-guava
-Version: 2.3.3 (10-Apr-2014)
+Version: 2.3.4 (xx-xxx-2014)
 
-#37: `Optional` not correctly deserialized from JSON null, if inside a Collection
- (reported by JYang-Addepar@github)
-#41: `Multimap` serializer does not honor @JsonInclude(JsonInclude.Include.NON_EMPTY) 
- (reported by Olve S-H)
+#42: Polymorphic deserialization involving Guava Optional<T> is broken.
+ (reported by bbeck@github)
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+2.3.3 (10-Apr-2014)
+
+#37: `Optional` not correctly deserialized from JSON null, if inside a Collection
+ (reported by JYang-Addepar@github)
+#41: `Multimap` serializer does not honor @JsonInclude(JsonInclude.Include.NON_EMPTY) 
+ (reported by Olve S-H)
+
 2.3.2 (01-Mar-2014)
 
 #36: Improve Range deserializer to work with older Guava versions (10-)

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

@@ -1,18 +1,24 @@
 package com.fasterxml.jackson.datatype.guava.deser;
 
 import java.io.IOException;
+import java.util.Collection;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.google.common.base.Optional;
 
 public class GuavaOptionalDeserializer
@@ -77,6 +83,9 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         if (deser == null) {
             deser = ctxt.findContextualValueDeserializer(_referenceType, property);
         }
+        if (typeDeser == null) {
+            typeDeser = _findTypeDeserializer(ctxt.getConfig(), _referenceType);
+        }
         if (typeDeser != null) {
             typeDeser = typeDeser.forProperty(property);
         }
@@ -85,6 +94,29 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         }
         return withResolved(typeDeser, deser);
     }
+
+    /**
+     * Method that is temporarily copied here, until 2.4 is released (at which point
+     * jackson-databind has it available via DeserializationConfig)
+     */
+    private TypeDeserializer _findTypeDeserializer(DeserializationConfig cfg, JavaType baseType)
+        throws JsonMappingException
+    {
+        BeanDescription bean = cfg.introspectClassAnnotations(baseType.getRawClass());
+        AnnotatedClass ac = bean.getClassInfo();
+        TypeResolverBuilder<?> b = cfg.getAnnotationIntrospector().findTypeResolver(cfg, ac, baseType);
+
+        Collection<NamedType> subtypes = null;
+        if (b == null) {
+            b = cfg.getDefaultTyper(baseType);
+            if (b == null) {
+                return null;
+            }
+        } else {
+            subtypes = cfg.getSubtypeResolver().collectAndResolveSubtypes(ac, cfg, cfg.getAnnotationIntrospector());
+        }
+        return b.buildTypeDeserializer(cfg, baseType, subtypes);
+    }
 
     @Override
     public Optional<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException,

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);
+    }
+}