Cleanup: use Std(De)Serializer as base, support exclusion of empty values

Author: cowtowncoder

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

@@ -4,13 +4,9 @@
 import java.util.Optional;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanProperty;
-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.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
@@ -77,9 +73,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         if (deser == null) {
             deser = ctxt.findContextualValueDeserializer(_referenceType, property);
         } else { // otherwise directly assigned, probably not contextual yet:
-            // !!! TODO: in 2.6, use this instead:
-            // deser = ctxt.handleSecondaryContextualization(deser, property, _referenceType);
-            deser = ctxt.handleSecondaryContextualization(deser, property);
+            deser = ctxt.handleSecondaryContextualization(deser, property, _referenceType);
         }
         if (typeDeser != null) {
             typeDeser = typeDeser.forProperty(property);
@@ -91,8 +85,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
     }
 
     @Override
-    public Optional<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException,
-        JsonProcessingException
+    public Optional<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         Object refd;
 
@@ -108,7 +101,7 @@ public Optional<?> deserialize(JsonParser jp, DeserializationContext ctxt) throw
      */
     @Override
     public Optional<?> deserializeWithType(JsonParser jp, DeserializationContext ctxt, TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         final JsonToken t = jp.getCurrentToken();
         if (t == JsonToken.VALUE_NULL) {

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

@@ -5,20 +5,25 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-final class OptionalDoubleDeserializer extends JsonDeserializer<OptionalDouble>
+final class OptionalDoubleDeserializer extends StdDeserializer<OptionalDouble>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalDoubleDeserializer INSTANCE = new OptionalDoubleDeserializer();
 
+    public OptionalDoubleDeserializer() {
+        super(OptionalDouble.class);
+    }
+
     @Override
     public OptionalDouble getNullValue() {
         return OptionalDouble.empty();
     }
 
     @Override
-    public OptionalDouble deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
-    {
-        return OptionalDouble.of(jp.getDoubleValue());
+    public OptionalDouble deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
+        return OptionalDouble.of(jp.getValueAsDouble());
     }
 }

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

@@ -4,16 +4,22 @@
 import java.util.OptionalDouble;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-final class OptionalDoubleSerializer extends JsonSerializer<OptionalDouble>
+public class OptionalDoubleSerializer extends StdSerializer<OptionalDouble>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalDoubleSerializer INSTANCE = new OptionalDoubleSerializer();
 
+    public OptionalDoubleSerializer() {
+        super(OptionalDouble.class);
+    }
+    
     @Override
     public void serialize(OptionalDouble value, JsonGenerator jgen, SerializerProvider provider)
-    throws IOException
+        throws IOException
     {
         if (value.isPresent()) {
             jgen.writeNumber(value.getAsDouble());

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

@@ -5,12 +5,18 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-final class OptionalIntDeserializer extends JsonDeserializer<OptionalInt>
+public class OptionalIntDeserializer extends StdDeserializer<OptionalInt>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalIntDeserializer INSTANCE = new OptionalIntDeserializer();
 
+    public OptionalIntDeserializer() {
+        super(OptionalInt.class);
+    }
+    
     @Override
     public OptionalInt getNullValue() {
         return OptionalInt.empty();
@@ -19,6 +25,6 @@ public OptionalInt getNullValue() {
     @Override
     public OptionalInt deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
-        return OptionalInt.of(jp.getIntValue());
+        return OptionalInt.of(jp.getValueAsInt());
     }
 }

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

@@ -4,16 +4,28 @@
 import java.util.OptionalInt;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-final class OptionalIntSerializer extends JsonSerializer<OptionalInt>
+final class OptionalIntSerializer extends StdSerializer<OptionalInt>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalIntSerializer INSTANCE = new OptionalIntSerializer();
 
+    public OptionalIntSerializer() {
+        super(OptionalInt.class);
+    }
+
+    // @since 2.6
+    @Override
+    public boolean isEmpty(SerializerProvider provider, OptionalInt value) {
+        return (value == null) || !value.isPresent();
+    }
+    
     @Override
     public void serialize(OptionalInt value, JsonGenerator jgen, SerializerProvider provider)
-    throws IOException
+        throws IOException
     {
         if (value.isPresent()) {
             jgen.writeNumber(value.getAsInt());

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

@@ -5,12 +5,18 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-final class OptionalLongDeserializer extends JsonDeserializer<OptionalLong>
+public class OptionalLongDeserializer extends StdDeserializer<OptionalLong>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalLongDeserializer INSTANCE = new OptionalLongDeserializer();
 
+    public OptionalLongDeserializer() {
+        super(OptionalLong.class);
+    }
+
     @Override
     public OptionalLong getNullValue() {
         return OptionalLong.empty();

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

@@ -4,20 +4,32 @@
 import java.util.OptionalLong;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-final class OptionalLongSerializer extends JsonSerializer<OptionalLong>
+final class OptionalLongSerializer extends StdSerializer<OptionalLong>
 {
+    private static final long serialVersionUID = 1L;
+
     static final OptionalLongSerializer INSTANCE = new OptionalLongSerializer();
 
+    public OptionalLongSerializer() {
+        super(OptionalLong.class);
+    }
+
+    // @since 2.6
+    @Override
+    public boolean isEmpty(SerializerProvider provider, OptionalLong value) {
+        return (value == null) || !value.isPresent();
+    }
+    
     @Override
     public void serialize(OptionalLong value, JsonGenerator jgen, SerializerProvider provider)
     throws IOException
     {
         if (value.isPresent()) {
             jgen.writeNumber(value.getAsLong());
-        } else {
+        } else { // should we get here?
             jgen.writeNull();
         }
     }

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

@@ -16,10 +16,12 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
-final class OptionalSerializer
+public class OptionalSerializer
     extends StdSerializer<Optional<?>>
     implements ContextualSerializer
 {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Declared type for the property being serialized with
      * this serializer instance.
@@ -52,13 +54,12 @@ protected OptionalSerializer withResolved(BeanProperty property,
     // implemented since 2.3
     @Override
     public boolean isEmpty(Optional<?> value) {
-        return (value == null) || !value.isPresent();
+        return isEmpty(null, value);
     }
 
     @Override
     public boolean isEmpty(SerializerProvider provider, Optional<?> value) {
-        // TODO: change to chain the other way in 2.6+
-        return isEmpty(value);
+        return (value == null) || !value.isPresent();
     }
 
     @Override