Fail deserialization into LocalDateTime of datetime with timezone (#192)

Author: angelyan

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

@@ -18,9 +18,7 @@
 
 import java.io.IOException;
 import java.time.DateTimeException;
-import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -29,6 +27,8 @@
 import com.fasterxml.jackson.core.JsonTokenId;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * Deserializer for Java 8 temporal {@link LocalDateTime}s.
@@ -152,17 +152,22 @@ protected LocalDateTime _fromString(JsonParser p, DeserializationContext ctxt,
             return null;
         }
         try {
+            // 21-Oct-2020, tatu: Removed as per [modules-base#94];
+            //   original flawed change from [modules-base#56]
             if (_formatter == DEFAULT_FORMATTER) {
                 // JavaScript by default includes time and zone in JSON serialized Dates (UTC/ISO instant format).
                 if (string.length() > 10 && string.charAt(10) == 'T') {
                    if (string.endsWith("Z")) {
-                       return LocalDateTime.ofInstant(Instant.parse(string), ZoneOffset.UTC);
-                   } else {
-                       return LocalDateTime.parse(string, DEFAULT_FORMATTER);
+                       JavaType t = getValueType(ctxt);
+                       ctxt.reportInputMismatch(t,
+"Invalid value ('%s') for %s: should not contain timezone/offset (define custom `@JsonFormat(pattern=)` if you must accept)",
+string, ClassUtil.getTypeDescription(t));
                    }
+//                       return LocalDateTime.ofInstant(Instant.parse(string), ZoneOffset.UTC);
+//                   } else {
+//                       return LocalDateTime.parse(string, DEFAULT_FORMATTER);
                 }
             }
-
            return LocalDateTime.parse(string, _formatter);
         } catch (DateTimeException e) {
             return _handleDateTimeException(ctxt, e, string);

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ModuleTestBase.java

@@ -36,7 +36,7 @@ protected static JsonMapper.Builder mapperBuilder() {
         return JsonMapper.builder()
                 .addModule(new JavaTimeModule());
     }
-    
+
     protected String quote(String value) {
         return "\"" + value + "\"";
     }

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

@@ -16,6 +16,16 @@
 
 package com.fasterxml.jackson.datatype.jsr310.deser;
 
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.Temporal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Feature;
 import com.fasterxml.jackson.annotation.JsonFormat.Value;
@@ -32,18 +42,6 @@
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.Temporal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-import java.util.TimeZone;
-
 import static org.junit.Assert.*;
 
 public class LocalDateTimeDeserTest
@@ -169,12 +167,17 @@ public void testDeserializationAsString03() throws Exception
         assertEquals("The value is not correct.", time, value);
     }
 
+    // [modules-java#94]: Should not include timezone
     @Test
-    public void testDeserializationAsString04() throws Exception
+    public void testBadDeserializationOfTimeWithTimeZone() throws Exception
     {
-        Instant instant = Instant.now();
-        LocalDateTime value = MAPPER.readValue('"' + instant.toString() + '"', LocalDateTime.class);
-        assertEquals("The value is not correct.", LocalDateTime.ofInstant(instant, ZoneOffset.UTC), value);
+        try {
+            MAPPER.readValue(quote("2020-10-22T00:16:20.504Z"), LocalDateTime.class);
+            fail("expected fail");
+        } catch (InvalidFormatException e) {
+            verifyException(e, "Cannot deserialize value of type");
+            verifyException(e, "from String \"");
+        }
     }
 
     @Test
@@ -493,7 +496,6 @@ public void testStrictCustomFormatInvalidDateAndTime() throws Exception
         /*StrictWrapper w =*/ MAPPER.readValue("{\"value\":\"2019-11-31 25:45\"}", StrictWrapper.class);
     }
 
-
     private void expectSuccess(ObjectReader reader, Object exp, String json) throws IOException {
         final LocalDateTime value = reader.readValue(aposToQuotes(json));
         assertNotNull("The value should not be null.", value);