Improve error reporting wrt #47

Author: cowtowncoder

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310DateTimeDeserializerBase.java

@@ -1,9 +1,11 @@
 package com.fasterxml.jackson.datatype.jsr310.deser;
 
+import java.io.IOException;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
@@ -51,4 +53,12 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         }
         return this;
    }
+
+    protected void _throwNoNumericTimestampNeedTimeZone(JsonParser p, DeserializationContext ctxt)
+        throws IOException
+    {
+        ctxt.reportInputMismatch(handledType(),
+"raw timestamp (%d) not allowed for `%s`: need additional information such as an offset or time-zone (see class Javadocs)",
+p.getNumberValue(), handledType().getName());
+    }
 }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateDeserializer.java

@@ -114,6 +114,7 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
             return (LocalDate) parser.getEmbeddedObject();
         }
+        // 06-Jan-2018, tatu: Is this actually safe? Do users expect such coercion?
         if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
             return LocalDate.ofEpochDay(parser.getLongValue());
         }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateTimeDeserializer.java

@@ -135,6 +135,9 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
             return (LocalDateTime) parser.getEmbeddedObject();
         }
+        if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
+            _throwNoNumericTimestampNeedTimeZone(parser, context);
+        }
         throw context.wrongTokenException(parser, handledType(), JsonToken.VALUE_STRING,
                 "Expected array or string.");
     }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalTimeDeserializer.java

@@ -124,6 +124,9 @@ public LocalTime deserialize(JsonParser parser, DeserializationContext context)
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
             return (LocalTime) parser.getEmbeddedObject();
         }
+        if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
+            _throwNoNumericTimestampNeedTimeZone(parser, context);
+        }
         throw context.wrongTokenException(parser, handledType(), JsonToken.START_ARRAY,
                 "Expected array or string.");
     }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetTimeDeserializer.java

@@ -67,6 +67,9 @@ public OffsetTime deserialize(JsonParser parser, DeserializationContext context)
             if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
                 return (OffsetTime) parser.getEmbeddedObject();
             }
+            if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
+                _throwNoNumericTimestampNeedTimeZone(parser, context);
+            }
             throw context.wrongTokenException(parser, handledType(), JsonToken.START_ARRAY,
                     "Expected array or string.");
         }

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateTimeDeserTest.java

@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.datatype.jsr310.MockObjectConfiguration;
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 
@@ -41,6 +42,12 @@ public class LocalDateTimeDeserTest
 {
     private final ObjectMapper mapper = newMapper();
 
+    /*
+    /**********************************************************
+    /* Tests for deserializing from int array
+    /**********************************************************
+     */
+    
     @Test
     public void testDeserializationAsTimestamp01() throws Exception
     {
@@ -108,6 +115,12 @@ public void testDeserializationAsTimestamp04Milliseconds02() throws Exception
         assertEquals("The value is not correct.", time, value);
     }
 
+    /*
+    /**********************************************************
+    /* Tests for deserializing from textual representation
+    /**********************************************************
+     */
+    
     @Test
     public void testDeserializationAsString01() throws Exception
     {
@@ -140,6 +153,12 @@ public void testDeserializationAsString04() throws Exception
         assertEquals("The value is not correct.", LocalDateTime.ofInstant(instant, ZoneOffset.UTC), value);
     }
 
+    /*
+    /**********************************************************
+    /* Tests for polymorphic handling
+    /**********************************************************
+     */
+    
     @Test
     public void testDeserializationWithTypeInfo01() throws Exception
     {
@@ -204,4 +223,18 @@ public void testDeserializeToDate() throws Exception
         assertEquals(45, cal.get(Calendar.MINUTE));
         assertEquals(5, cal.get(Calendar.SECOND));
     }
+
+    // [modules-java8#47]: should indicate why timestamp won't work
+    @Test
+    public void testDeserilizeFromSimpleTimestamp() throws Exception
+    {
+        ObjectReader r = mapper.readerFor(LocalDateTime.class);
+        LocalDateTime value;
+        try {
+            value = r.readValue("1235");
+            fail("Should not succeed, instead got: "+value);
+        } catch (MismatchedInputException e) {
+            verifyException(e, "raw timestamp (1235) not allowed for `java.time.LocalDateTime`");
+        }
+    }
 }

release-notes/VERSION

@@ -13,6 +13,8 @@ Modules:
 #46: Double array serialization of `LocalDate` stored as an object with
   wrapper object typing enabled
  (reported by unintended@github)
+- Improve error reporting for `LocalDateTime`, `LocalTime`, `OffsetTime` for
+  timestamp input (JSON integer value)
 
 2.9.2 (14-Oct-2017)
 2.9.1 (07-Sep-2017)