Merge pull request #66 from remal/2.9

cowtowncoder · web-flow · commit f4ea3e35afde · 2018-04-04T20:44:38.000-07:00
Using DeserializationContext.handleWeirdStringValue for DateTimeException
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationDeserializer.java
@@ -70,7 +70,7 @@ public Duration deserialize(JsonParser parser, DeserializationContext context) t
                 try {
                     return Duration.parse(string);
                 } catch (DateTimeException e) {
-                    return _rethrowDateTimeException(parser, context, e, string);
+                    return _handleDateTimeException(context, e, string);
                 }
             case JsonTokenId.ID_EMBEDDED_OBJECT:
                 // 20-Apr-2016, tatu: Related to [databind#1208], can try supporting embedded
@@ -80,7 +80,7 @@ public Duration deserialize(JsonParser parser, DeserializationContext context) t
             case JsonTokenId.ID_START_ARRAY:
             	return _deserializeFromArray(parser, context);
         }
-        return _reportWrongToken(parser, context, JsonToken.VALUE_STRING,
+        return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING,
                 JsonToken.VALUE_NUMBER_INT, JsonToken.VALUE_NUMBER_FLOAT);
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java
@@ -209,7 +209,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I
                         return adjust.apply(value, this.getZone(context));
                     }
                 } catch (DateTimeException e) {
-                    value = _rethrowDateTimeException(parser, context, e, string);
+                    value = _handleDateTimeException(context, e, string);
                 }
                 return value;
             }
@@ -222,7 +222,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I
             case JsonTokenId.ID_START_ARRAY:
             	return _deserializeFromArray(parser, context);
         }
-        return _reportWrongToken(parser, context, JsonToken.VALUE_STRING,
+        return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING,
                 JsonToken.VALUE_NUMBER_INT, JsonToken.VALUE_NUMBER_FLOAT);
     }
 
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310DeserializerBase.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310DeserializerBase.java
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.time.DateTimeException;
-import java.time.format.DateTimeParseException;
 import java.util.Arrays;
 
 import com.fasterxml.jackson.core.JsonParser;
@@ -38,7 +37,7 @@
 abstract class JSR310DeserializerBase<T> extends StdScalarDeserializer<T>
 {
     private static final long serialVersionUID = 1L;
-    
+
     protected JSR310DeserializerBase(Class<T> supportedType)
     {
         super(supportedType);
@@ -73,35 +72,55 @@ protected <BOGUS> BOGUS _reportWrongToken(JsonParser parser, DeserializationCont
                 handledType().getName());
     }
 
-    protected <BOGUS> BOGUS _rethrowDateTimeException(JsonParser p, DeserializationContext context,
-            DateTimeException e0, String value) throws JsonMappingException
+    @SuppressWarnings("unchecked")
+    protected <R> R _handleDateTimeException(DeserializationContext context,
+              DateTimeException e0, String value) throws JsonMappingException
     {
-        JsonMappingException e;
-        if (e0 instanceof DateTimeParseException) {
-            e = context.weirdStringException(value, handledType(), e0.getMessage());
+        try {
+            return (R) context.handleWeirdStringValue(handledType(), value,
+                    "Failed to deserialize %s: (%s) %s",
+                    handledType().getName(), e0.getClass().getName(), e0.getMessage());
+
+        } catch (JsonMappingException e) {
             e.initCause(e0);
             throw e;
-        }
-        if (e0 instanceof DateTimeException) {
-            String msg = e0.getMessage();
-            // 26-Mar-2017, tatu: Let's add some more logic to try to find likely format(ting)
-            //   issues
-            if (msg.contains("invalid format")) {
-                e = context.weirdStringException(value, handledType(), e0.getMessage());
+        } catch (IOException e) {
+            if (null == e.getCause()) {
                 e.initCause(e0);
-                throw e;
             }
+            throw JsonMappingException.fromUnexpectedIOE(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <R> R _handleUnexpectedToken(DeserializationContext context,
+              JsonParser parser, String message, Object... args) throws JsonMappingException {
+        try {
+            return (R) context.handleUnexpectedToken(handledType(), parser.getCurrentToken(),
+                    parser, message, args);
+
+        } catch (JsonMappingException e) {
+            throw e;
+        } catch (IOException e) {
+            throw JsonMappingException.fromUnexpectedIOE(e);
         }
-        return context.reportInputMismatch(handledType(),
-                "Failed to deserialize %s: (%s) %s",
-                handledType().getName(), e0.getClass().getName(), e0.getMessage());
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <R> R _handleUnexpectedToken(DeserializationContext context,
+              JsonParser parser, JsonToken... expTypes) throws JsonMappingException {
+        return _handleUnexpectedToken(context, parser,
+                "Unexpected token (%s), expected one of %s for %s value",
+                parser.currentToken(),
+                Arrays.asList(expTypes),
+                handledType().getName());
     }
 
     /**
      * Helper method used to peel off spurious wrappings of DateTimeException
      *
      * @param e DateTimeException to peel
-     * 
+     *
      * @return DateTimeException that does not have another DateTimeException as its cause.
      */
     protected DateTimeException _peelDTE(DateTimeException e) {
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java
@@ -89,7 +89,7 @@ public Object deserialize(JsonParser parser, DeserializationContext context) thr
                     return ZoneOffset.of(string);
                 }
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateDeserializer.java
@@ -80,7 +80,7 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)
                 }
                 return LocalDate.parse(string, format);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {
@@ -118,7 +118,6 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)
         if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
             return LocalDate.ofEpochDay(parser.getLongValue());
         }
-        throw context.wrongTokenException(parser, handledType(), JsonToken.VALUE_STRING,
-                "Expected array or string.");
+        return _handleUnexpectedToken(context, parser, "Expected array or string.");
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateTimeDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateTimeDeserializer.java
@@ -81,7 +81,7 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte
 
                 return LocalDateTime.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {
@@ -138,7 +138,6 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte
         if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
             _throwNoNumericTimestampNeedTimeZone(parser, context);
         }
-        throw context.wrongTokenException(parser, handledType(), JsonToken.VALUE_STRING,
-                "Expected array or string.");
+        return _handleUnexpectedToken(context, parser, "Expected array or string.");
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalTimeDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalTimeDeserializer.java
@@ -71,7 +71,7 @@ public LocalTime deserialize(JsonParser parser, DeserializationContext context)
                 }
                 return LocalTime.parse(string, format);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {
@@ -127,7 +127,6 @@ public LocalTime deserialize(JsonParser parser, DeserializationContext context)
         if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
             _throwNoNumericTimestampNeedTimeZone(parser, context);
         }
-        throw context.wrongTokenException(parser, handledType(), JsonToken.START_ARRAY,
-                "Expected array or string.");
+        return _handleUnexpectedToken(context, parser, "Expected array or string.");
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/MonthDayDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/MonthDayDeserializer.java
@@ -39,7 +39,7 @@ public MonthDay deserialize(JsonParser parser, DeserializationContext context) t
                 }
                 return MonthDay.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
@@ -48,6 +48,6 @@ public MonthDay deserialize(JsonParser parser, DeserializationContext context) t
         if (parser.hasToken(JsonToken.START_ARRAY)){
         	return _deserializeFromArray(parser, context);
     	}
-        return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);
+        return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetTimeDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetTimeDeserializer.java
@@ -60,7 +60,7 @@ public OffsetTime deserialize(JsonParser parser, DeserializationContext context)
             try {
                 return OffsetTime.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (!parser.isExpectedStartArrayToken()) {
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearDeserializer.java
@@ -61,7 +61,7 @@ public Year deserialize(JsonParser parser, DeserializationContext context) throw
                 }
                 return Year.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (t == JsonToken.VALUE_NUMBER_INT) {
@@ -73,6 +73,6 @@ public Year deserialize(JsonParser parser, DeserializationContext context) throw
         if (parser.hasToken(JsonToken.START_ARRAY)){
             return _deserializeFromArray(parser, context);
         }
-        return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);
+        return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearMonthDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearMonthDeserializer.java
@@ -66,7 +66,7 @@ public YearMonth deserialize(JsonParser parser, DeserializationContext context)
             try {
                 return YearMonth.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, context, e, string);
+                return _handleDateTimeException(context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {
@@ -102,6 +102,6 @@ public YearMonth deserialize(JsonParser parser, DeserializationContext context)
         if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {
             return (YearMonth) parser.getEmbeddedObject();
         }
-        return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.START_ARRAY);
+        return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.START_ARRAY);
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/DurationKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/DurationKeyDeserializer.java
@@ -19,7 +19,7 @@ protected Duration deserialize(String key, DeserializationContext ctxt) throws I
         try {
             return Duration.parse(key);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, Duration.class, e, key);
+            return _handleDateTimeException(ctxt, Duration.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/InstantKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/InstantKeyDeserializer.java
@@ -20,7 +20,7 @@ protected Instant deserialize(String key, DeserializationContext ctxt) throws IO
         try {
             return DateTimeFormatter.ISO_INSTANT.parse(key, Instant::from);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, Instant.class, e, key);
+            return _handleDateTimeException(ctxt, Instant.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/Jsr310KeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/Jsr310KeyDeserializer.java
@@ -24,19 +24,24 @@ public final Object deserializeKey(String key, DeserializationContext ctxt)
 
     protected abstract Object deserialize(String key, DeserializationContext ctxt)
         throws IOException;
- 
-    protected <T> T _rethrowDateTimeException(DeserializationContext ctxt,
-            Class<?> type, DateTimeException e0, String value) throws IOException
+
+    @SuppressWarnings("unchecked")
+    protected <T> T _handleDateTimeException(DeserializationContext ctxt,
+              Class<?> type, DateTimeException e0, String value) throws IOException
     {
-        JsonMappingException e;
-        if (e0 instanceof DateTimeParseException) {
-            e = ctxt.weirdStringException(value, type, e0.getMessage());
+        try {
+            return (T) ctxt.handleWeirdStringValue(type, value,
+                    "Failed to deserialize %s: (%s) %s",
+                    type.getName(), e0.getClass().getName(), e0.getMessage());
+
+        } catch (JsonMappingException e) {
             e.initCause(e0);
-        } else {
-            e = JsonMappingException.from(ctxt,
-                String.format("Failed to deserialize %s: (%s) %s",
-                        type.getName(), e0.getClass().getName(), e0.getMessage()), e0);
+            throw e;
+        } catch (IOException e) {
+            if (null == e.getCause()) {
+                e.initCause(e0);
+            }
+            throw JsonMappingException.fromUnexpectedIOE(e);
         }
-        throw e;
     }
-}
+}
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalDateKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalDateKeyDeserializer.java
@@ -20,7 +20,7 @@ protected LocalDate deserialize(String key, DeserializationContext ctxt) throws
         try {
             return LocalDate.parse(key, DateTimeFormatter.ISO_LOCAL_DATE);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, LocalDate.class, e, key);
+            return _handleDateTimeException(ctxt, LocalDate.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalDateTimeKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalDateTimeKeyDeserializer.java
@@ -20,7 +20,7 @@ protected LocalDateTime deserialize(String key, DeserializationContext ctxt) thr
         try {
             return LocalDateTime.parse(key, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, LocalDateTime.class, e, key);
+            return _handleDateTimeException(ctxt, LocalDateTime.class, e, key);
         }
     }
 
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalTimeKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/LocalTimeKeyDeserializer.java
@@ -20,7 +20,7 @@ protected LocalTime deserialize(String key, DeserializationContext ctxt) throws
         try {
             return LocalTime.parse(key, DateTimeFormatter.ISO_LOCAL_TIME);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, LocalTime.class, e, key);
+            return _handleDateTimeException(ctxt, LocalTime.class, e, key);
         }
     }
 
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/MonthDayKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/MonthDayKeyDeserializer.java
@@ -32,7 +32,7 @@ protected MonthDay deserialize(String key, DeserializationContext ctxt) throws I
         try {
             return MonthDay.parse(key, PARSER);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, MonthDay.class, e, key);
+            return _handleDateTimeException(ctxt, MonthDay.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/OffsetDateTimeKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/OffsetDateTimeKeyDeserializer.java
@@ -20,7 +20,7 @@ protected OffsetDateTime deserialize(String key, DeserializationContext ctxt) th
         try {
             return OffsetDateTime.parse(key, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, OffsetDateTime.class, e, key);
+            return _handleDateTimeException(ctxt, OffsetDateTime.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/OffsetTimeKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/OffsetTimeKeyDeserializer.java
@@ -20,7 +20,7 @@ protected OffsetTime deserialize(String key, DeserializationContext ctxt) throws
         try {
             return OffsetTime.parse(key, DateTimeFormatter.ISO_OFFSET_TIME);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, OffsetTime.class, e, key);
+            return _handleDateTimeException(ctxt, OffsetTime.class, e, key);
         }
     }
 
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/PeriodKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/PeriodKeyDeserializer.java
@@ -19,7 +19,7 @@ protected Period deserialize(String key, DeserializationContext ctxt) throws IOE
         try {
             return Period.parse(key);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, Period.class, e, key);
+            return _handleDateTimeException(ctxt, Period.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/YearKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/YearKeyDeserializer.java
@@ -31,7 +31,7 @@ protected Year deserialize(String key, DeserializationContext ctxt) throws IOExc
         try {
             return Year.parse(key, FORMATTER);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, Year.class, e, key);
+            return _handleDateTimeException(ctxt, Year.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/YearMothKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/YearMothKeyDeserializer.java
@@ -32,7 +32,7 @@ protected YearMonth deserialize(String key, DeserializationContext ctxt) throws
         try {
             return YearMonth.parse(key, FORMATTER);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, YearMonth.class, e, key);
+            return _handleDateTimeException(ctxt, YearMonth.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZoneIdKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZoneIdKeyDeserializer.java
@@ -19,7 +19,7 @@ protected Object deserialize(String key, DeserializationContext ctxt) throws IOE
         try {
             return ZoneId.of(key);
         } catch (DateTimeException e) {
-            return _rethrowDateTimeException(ctxt, ZoneId.class, e, key);
+            return _handleDateTimeException(ctxt, ZoneId.class, e, key);
         }
     }
 }
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZoneOffsetKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZoneOffsetKeyDeserializer.java
diff --git a/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZonedDateTimeKeyDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/key/ZonedDateTimeKeyDeserializer.java
diff --git a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java
diff --git a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeKeySerialization.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeKeySerialization.java

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public Duration deserialize(JsonParser parser, DeserializationContext context) t`
`70`	`70`	`try {`
`71`	`71`	`return Duration.parse(string);`
`72`	`72`	`} catch (DateTimeException e) {`
`73`		`- return _rethrowDateTimeException(parser, context, e, string);`
	`73`	`+ return _handleDateTimeException(context, e, string);`
`74`	`74`	`}`
`75`	`75`	`case JsonTokenId.ID_EMBEDDED_OBJECT:`
`76`	`76`	`// 20-Apr-2016, tatu: Related to [databind#1208], can try supporting embedded`
`@@ -80,7 +80,7 @@ public Duration deserialize(JsonParser parser, DeserializationContext context) t`
`80`	`80`	`case JsonTokenId.ID_START_ARRAY:`
`81`	`81`	`return _deserializeFromArray(parser, context);`
`82`	`82`	`}`
`83`		`- return _reportWrongToken(parser, context, JsonToken.VALUE_STRING,`
	`83`	`+ return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING,`
`84`	`84`	`JsonToken.VALUE_NUMBER_INT, JsonToken.VALUE_NUMBER_FLOAT);`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I`
`209`	`209`	`return adjust.apply(value, this.getZone(context));`
`210`	`210`	`}`
`211`	`211`	`} catch (DateTimeException e) {`
`212`		`- value = _rethrowDateTimeException(parser, context, e, string);`
	`212`	`+ value = _handleDateTimeException(context, e, string);`
`213`	`213`	`}`
`214`	`214`	`return value;`
`215`	`215`	`}`
`@@ -222,7 +222,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I`
`222`	`222`	`case JsonTokenId.ID_START_ARRAY:`
`223`	`223`	`return _deserializeFromArray(parser, context);`
`224`	`224`	`}`
`225`		`- return _reportWrongToken(parser, context, JsonToken.VALUE_STRING,`
	`225`	`+ return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING,`
`226`	`226`	`JsonToken.VALUE_NUMBER_INT, JsonToken.VALUE_NUMBER_FLOAT);`
`227`	`227`	`}`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public Object deserialize(JsonParser parser, DeserializationContext context) thr`
`89`	`89`	`return ZoneOffset.of(string);`
`90`	`90`	`}`
`91`	`91`	`} catch (DateTimeException e) {`
`92`		`- _rethrowDateTimeException(parser, context, e, string);`
	`92`	`+ return _handleDateTimeException(context, e, string);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)`
`80`	`80`	`}`
`81`	`81`	`return LocalDate.parse(string, format);`
`82`	`82`	`} catch (DateTimeException e) {`
`83`		`- _rethrowDateTimeException(parser, context, e, string);`
	`83`	`+ return _handleDateTimeException(context, e, string);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`if (parser.isExpectedStartArrayToken()) {`
`@@ -118,7 +118,6 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)`
`118`	`118`	`if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {`
`119`	`119`	`return LocalDate.ofEpochDay(parser.getLongValue());`
`120`	`120`	`}`
`121`		`- throw context.wrongTokenException(parser, handledType(), JsonToken.VALUE_STRING,`
`122`		`- "Expected array or string.");`
	`121`	`+ return _handleUnexpectedToken(context, parser, "Expected array or string.");`
`123`	`122`	`}`
`124`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte`
`81`	`81`
`82`	`82`	`return LocalDateTime.parse(string, _formatter);`
`83`	`83`	`} catch (DateTimeException e) {`
`84`		`- _rethrowDateTimeException(parser, context, e, string);`
	`84`	`+ return _handleDateTimeException(context, e, string);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`if (parser.isExpectedStartArrayToken()) {`
`@@ -138,7 +138,6 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte`
`138`	`138`	`if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {`
`139`	`139`	`_throwNoNumericTimestampNeedTimeZone(parser, context);`
`140`	`140`	`}`
`141`		`- throw context.wrongTokenException(parser, handledType(), JsonToken.VALUE_STRING,`
`142`		`- "Expected array or string.");`
	`141`	`+ return _handleUnexpectedToken(context, parser, "Expected array or string.");`
`143`	`142`	`}`
`144`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public LocalTime deserialize(JsonParser parser, DeserializationContext context)`
`71`	`71`	`}`
`72`	`72`	`return LocalTime.parse(string, format);`
`73`	`73`	`} catch (DateTimeException e) {`
`74`		`- _rethrowDateTimeException(parser, context, e, string);`
	`74`	`+ return _handleDateTimeException(context, e, string);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`if (parser.isExpectedStartArrayToken()) {`
`@@ -127,7 +127,6 @@ public LocalTime deserialize(JsonParser parser, DeserializationContext context)`
`127`	`127`	`if (parser.hasToken(JsonToken.VALUE_NUMBER_INT)) {`
`128`	`128`	`_throwNoNumericTimestampNeedTimeZone(parser, context);`
`129`	`129`	`}`
`130`		`- throw context.wrongTokenException(parser, handledType(), JsonToken.START_ARRAY,`
`131`		`- "Expected array or string.");`
	`130`	`+ return _handleUnexpectedToken(context, parser, "Expected array or string.");`
`132`	`131`	`}`
`133`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public MonthDay deserialize(JsonParser parser, DeserializationContext context) t`
`39`	`39`	`}`
`40`	`40`	`return MonthDay.parse(string, _formatter);`
`41`	`41`	`} catch (DateTimeException e) {`
`42`		`- _rethrowDateTimeException(parser, context, e, string);`
	`42`	`+ return _handleDateTimeException(context, e, string);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {`
`@@ -48,6 +48,6 @@ public MonthDay deserialize(JsonParser parser, DeserializationContext context) t`
`48`	`48`	`if (parser.hasToken(JsonToken.START_ARRAY)){`
`49`	`49`	`return _deserializeFromArray(parser, context);`
`50`	`50`	`}`
`51`		`- return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);`
	`51`	`+ return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public OffsetTime deserialize(JsonParser parser, DeserializationContext context)`
`60`	`60`	`try {`
`61`	`61`	`return OffsetTime.parse(string, _formatter);`
`62`	`62`	`} catch (DateTimeException e) {`
`63`		`- _rethrowDateTimeException(parser, context, e, string);`
	`63`	`+ return _handleDateTimeException(context, e, string);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`if (!parser.isExpectedStartArrayToken()) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Year deserialize(JsonParser parser, DeserializationContext context) throw`
`61`	`61`	`}`
`62`	`62`	`return Year.parse(string, _formatter);`
`63`	`63`	`} catch (DateTimeException e) {`
`64`		`- _rethrowDateTimeException(parser, context, e, string);`
	`64`	`+ return _handleDateTimeException(context, e, string);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`if (t == JsonToken.VALUE_NUMBER_INT) {`
`@@ -73,6 +73,6 @@ public Year deserialize(JsonParser parser, DeserializationContext context) throw`
`73`	`73`	`if (parser.hasToken(JsonToken.START_ARRAY)){`
`74`	`74`	`return _deserializeFromArray(parser, context);`
`75`	`75`	`}`
`76`		`- return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);`
	`76`	`+ return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);`
`77`	`77`	`}`
`78`	`78`	`}`