Fix #69

Author: cowtowncoder

pom.xml

@@ -29,7 +29,7 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
   </contributors>
 
   <properties>
-    <version.jackson>2.6.0-rc1</version.jackson>
+    <version.jackson>2.6.0-rc2-SNAPSHOT</version.jackson>
 
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/datatype/guava</packageVersion.dir>

release-notes/VERSION

@@ -9,6 +9,7 @@ Project: jackson-datatype-guava
 #66: Add `GuavaModule.configureAbsentsAsNulls(boolean)` to change whether
  `Optional.absent()` is to be handled same as Java null during serialization
  (default: true) or not.
+#69: Add support for `JsonInclude.Include.NON_ABSENT`, to compensate for #66
 
 2.5.4 (not yet released)
 

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

@@ -99,6 +99,10 @@ public JavaType modifyType(JavaType type, Type jdkType, TypeBindings context, Ty
                  * Not sure if it'd be with Range; but let's assume it is, for now: sub-classes
                  * could eliminate/change type parameterization anyway.
                  */
+                // 28-May-2015, tatu: Further, Optional needs to be a ReferenceType
+                if (target == Optional.class) {
+                    return typeFactory.constructReferenceType(raw, t);
+                }
                 return typeFactory.constructParametrizedType(raw, target, t);
             }
         }

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

@@ -4,11 +4,9 @@
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-
 import com.fasterxml.jackson.core.type.TypeReference;
-
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.google.common.base.Optional;
 
 public class TestOptional extends ModuleTestBase
@@ -45,6 +43,15 @@ public void link(Unit u) {
     /**********************************************************************
      */
 
+    public void testOptionalTypeResolution() throws Exception
+    {
+        // With 2.6, we need to recognize it as ReferenceType
+        JavaType t = MAPPER.constructType(Optional.class);
+        assertNotNull(t);
+        assertEquals(Optional.class, t.getRawClass());
+        assertTrue(t.isReferenceType());
+    }
+    
     public void testDeserAbsent() throws Exception {
         Optional<?> value = MAPPER.readValue("null", new TypeReference<Optional<String>>() {});
         assertFalse(value.isPresent());
@@ -146,7 +153,12 @@ public void testSerOptDisableAsNull() throws Exception {
         mapper = new ObjectMapper()
             .registerModule(mod)
             .setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+        assertEquals("{}", mapper.writeValueAsString(data));
 
+        // and with new (2.6) NON_ABSENT
+        mapper = new ObjectMapper()
+            .registerModule(mod)
+            .setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
         assertEquals("{}", mapper.writeValueAsString(data));
     }