Add (failing) tests related to continuation of #15

FasterXML · Mar 15, 2017 · 858fcae · 858fcae
1 parent 1dcb9e6
commit 858fcae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/datatypes/src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalIntDeserializer.java b/datatypes/src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalIntDeserializer.java
@@ -4,6 +4,7 @@
 import java.util.OptionalInt;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 
@@ -24,6 +25,11 @@ public OptionalInt getNullValue(DeserializationContext ctxt) {
 
     @Override
     public OptionalInt deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        // minor optimization, first, for common case
+        if (p.hasToken(JsonToken.VALUE_NUMBER_INT)) {
+            return OptionalInt.of(p.getValueAsInt());
+        }
+        // but aside of that try to use standard handling:
         return OptionalInt.of(p.getValueAsInt());
     }
 }
diff --git a/datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalNumbersTest.java b/datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalNumbersTest.java
@@ -67,6 +67,10 @@ public void testOptionalIntCoerceFromString() throws Exception
     {
         OptionalInt opt = MAPPER.readValue(quote("123"), OptionalInt.class);
         assertEquals(123, opt.getAsInt());
+        opt = MAPPER.readValue("\"\"", OptionalInt.class);
+        assertNotNull(opt);
+        assertFalse(opt.isPresent());
+
         OptionalIntBean bean = MAPPER.readValue(aposToQuotes("{'value':null}"),
                 OptionalIntBean.class);
         assertNotNull(bean.value);
@@ -105,6 +109,12 @@ public void testOptionalLongCoerceFromString() throws Exception
     {
         OptionalLong opt = MAPPER.readValue(quote("123"), OptionalLong.class);
         assertEquals(123L, opt.getAsLong());
+
+        // should coerce from empty String too (by default)
+        opt = MAPPER.readValue("\"\"", OptionalLong.class);
+        assertNotNull(opt);
+        assertFalse(opt.isPresent());
+
         OptionalLongBean bean = MAPPER.readValue(aposToQuotes("{'value':null}"),
                 OptionalLongBean.class);
         assertNotNull(bean.value);
@@ -162,6 +172,12 @@ public void testOptionalDoubleCoerceFromString() throws Exception
     {
         OptionalDouble opt = MAPPER.readValue(quote("0.25"), OptionalDouble.class);
         assertEquals(0.25, opt.getAsDouble());
+
+        // should coerce from empty String too (by default)
+        opt = MAPPER.readValue("\"\"", OptionalDouble.class);
+        assertNotNull(opt);
+        assertFalse(opt.isPresent());
+
         OptionalDoubleBean bean = MAPPER.readValue(aposToQuotes("{'value':null}"),
                 OptionalDoubleBean.class);
         assertNotNull(bean.value);