Additional unit testing

Author: cowtowncoder

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

@@ -5,7 +5,6 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
@@ -36,11 +35,18 @@ public OptionalDeserializer(JavaType fullType, JavaType refType,
     }
 
     @Override
+    @Deprecated
     public JavaType getValueType() { return _fullType; }
 
     @Override
+    @Deprecated
     public Optional<?> getNullValue() { return Optional.empty(); }
 
+    @Override
+    public Optional<?> getNullValue(DeserializationContext ctxt) {
+        return Optional.empty();
+    }
+
     /**
      * Overridable fluent factory method used for creating contextual
      * instances.

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

@@ -18,10 +18,16 @@ public OptionalDoubleDeserializer() {
     }
 
     @Override
+    @Deprecated
     public OptionalDouble getNullValue() {
         return OptionalDouble.empty();
     }
 
+    @Override
+    public OptionalDouble getNullValue(DeserializationContext ctxt) {
+        return OptionalDouble.empty();
+    }
+
     @Override
     public OptionalDouble deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
         return OptionalDouble.of(jp.getValueAsDouble());

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

@@ -18,13 +18,18 @@ public OptionalIntDeserializer() {
     }
 
     @Override
+    @Deprecated // since 2.6
     public OptionalInt getNullValue() {
         return OptionalInt.empty();
     }
 
     @Override
-    public OptionalInt deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
-    {
+    public OptionalInt getNullValue(DeserializationContext ctxt) {
+        return OptionalInt.empty();
+    }
+
+    @Override
+    public OptionalInt deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
         return OptionalInt.of(jp.getValueAsInt());
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.datatype.jdk8;
 
 import java.io.IOException;
-import java.util.OptionalDouble;
 import java.util.OptionalInt;
 
 import com.fasterxml.jackson.core.JsonGenerator;

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

@@ -18,13 +18,18 @@ public OptionalLongDeserializer() {
     }
 
     @Override
+    @Deprecated
     public OptionalLong getNullValue() {
         return OptionalLong.empty();
     }
 
     @Override
-    public OptionalLong deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
-    {
+    public OptionalLong getNullValue(DeserializationContext ctxt) {
+        return OptionalLong.empty();
+    }
+
+    @Override
+    public OptionalLong deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
         return OptionalLong.of(jp.getLongValue());
     }
 }

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

@@ -51,8 +51,8 @@ protected OptionalSerializer withResolved(BeanProperty property,
         return new OptionalSerializer(_optionalType, ser);
     }
 
-    // implemented since 2.3
     @Override
+    @Deprecated
     public boolean isEmpty(Optional<?> value) {
         return isEmpty(null, value);
     }

src/test/java/com/fasterxml/jackson/datatype/jdk8/CreatorTest.java

@@ -0,0 +1,48 @@
+package com.fasterxml.jackson.datatype.jdk8;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class CreatorTest extends ModuleTestBase
+{
+    static class CreatorWithOptionalStrings
+    {
+        Optional<String> a, b;
+
+        // note: something weird with test setup, should not need annotations
+        @JsonCreator
+        public CreatorWithOptionalStrings(@JsonProperty("a") Optional<String> a,
+                @JsonProperty("b") Optional<String> b)
+        {
+            this.a = a;
+            this.b = b;
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = mapperWithModule();
+
+    /**
+     * Test to ensure that creator parameters use defaulting
+     * (introduced in Jackson 2.6)
+     */
+    public void testCreatorWithOptional() throws Exception
+    {
+        CreatorWithOptionalStrings bean = MAPPER.readValue(
+                aposToQuotes("{'a':'foo'}"), CreatorWithOptionalStrings.class);
+        assertNotNull(bean);
+        assertNotNull(bean.a);
+        assertNotNull(bean.b);
+        assertTrue(bean.a.isPresent());
+        assertFalse(bean.b.isPresent());
+        assertEquals("foo", bean.a.get());
+    }
+}

src/test/java/com/fasterxml/jackson/datatype/jdk8/TestOptionalSerializer.java

@@ -210,13 +210,13 @@ public void testExcludeIfOptionalLongAbsent() throws Exception
         assertEquals(aposToQuotes("{}"),
                 mapper.writeValueAsString(new OptionalLongBean()));
     }
-    
+
     /*
     /**********************************************************
     /* Helper methods
     /**********************************************************
      */
-    
+
     private <T> Optional<T> roundtrip(Optional<T> obj, TypeReference<Optional<T>> type) throws IOException
     {
         return MAPPER.readValue(MAPPER.writeValueAsBytes(obj), type);