Implement #811, support JsonInclude.Include.NON_ABSENT

Author: cowtowncoder

pom.xml

@@ -69,12 +69,12 @@ javax.xml.datatype, javax.xml.namespace, javax.xml.parsers
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.6.0-rc1</version>
+      <version>2.6.0-rc2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.6.0-rc1</version>
+      <version>2.6.0-rc2-SNAPSHOT</version>
     </dependency>
 
     <!-- and for testing we need a few libraries

release-notes/VERSION

@@ -74,6 +74,8 @@ Project: jackson-databind
 #801: Using `@JsonCreator` cause generating invalid path reference in `JsonMappingException`
  (contributed by Kamil B)
 #810: Force value coercion for `java.util.Properties`, so that values are `String`s
+#811: Add new option, `JsonInclude.Include.NON_ABSENT` (to support exclusion of
+  JDK8/Guava Optionals)
 - Fix handling of Enums wrt JSON Schema, when 'toString()' used for serialization
 
 2.5.3 (24-Apr-2015)

src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java

@@ -110,6 +110,14 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
                     }
                 }
                 break;
+            case NON_ABSENT: // new with 2.6, to support Guava/JDK8 Optionals
+                // always suppress nulls
+                suppressNulls = true;
+                // and for referential types, also "empty", which in their case means "absent"
+                if (declaredType.isReferenceType()) {
+                    valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
+                }
+                break;
             case NON_EMPTY:
                 // always suppress nulls
                 suppressNulls = true;

src/test/java/com/fasterxml/jackson/databind/deser/TestSimpleAtomicTypes.java

@@ -84,6 +84,17 @@ public void testAtomicReference() throws Exception
         assertEquals(2, longs[1]);
     }
 
+    // for [databind#811]
+    public void testAbsentExclusion() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT);
+        assertEquals(aposToQuotes("{'value':true}"),
+                mapper.writeValueAsString(new SimpleWrapper(Boolean.TRUE)));
+        assertEquals(aposToQuotes("{}"),
+                mapper.writeValueAsString(new SimpleWrapper(null)));
+    }
+
     // [databind#340]
     public void testPolymorphicAtomicReference() throws Exception
     {