Fixed #76 as per suggestion, just slightly reworked to use shared base method

Author: cowtowncoder

pom.xml

@@ -32,7 +32,7 @@
     <!-- Java8 takes Javadoc-Nazi attitude, insert some sanity here --> 
     <additionalparam>-Xdoclint:none</additionalparam>
 
-    <version.jackson.core>2.7.3</version.jackson.core>
+    <version.jackson.core>2.7.4-SNAPSHOT</version.jackson.core>
 
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/datatype/jsr310</packageVersion.dir>

release-notes/VERSION

@@ -10,6 +10,8 @@ Project: jackson-datatype-jsr310
  (contributed by Arzie@github)
 #71: Add LICENSE file in jar that is built
  (reported by puntogil@github)
+#76: Use `InvalidFormatException` for deserialization parse failures
+ (suggested by Mike W)
 
 2.7.3 (16-Mar-2016)
 

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationDeserializer.java

@@ -63,13 +63,13 @@ public Duration deserialize(JsonParser parser, DeserializationContext context) t
 
             case JsonTokenId.ID_STRING:
                 String string = parser.getText().trim();
-                if(string.length() == 0) {
+                if (string.length() == 0) {
                     return null;
                 }
                 try {
                     return Duration.parse(string);
                 } catch (DateTimeException e) {
-                    _rethrowDateTimeException(parser, e);
+                    _rethrowDateTimeException(parser, context, e, string);
                 }
         }
         throw context.mappingException("Expected type float, integer, or string.");

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java

@@ -153,7 +153,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I
                         return adjust.apply(value, this.getZone(context));
                     }
                 } catch (DateTimeException e) {
-                    _rethrowDateTimeException(parser, e);
+                    _rethrowDateTimeException(parser, context, e, string);
                     value = null;
                 }
                 return value;

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310DeserializerBase.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.time.DateTimeException;
+import java.time.format.DateTimeParseException;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -55,11 +56,19 @@ protected void _reportWrongToken(JsonParser parser, DeserializationContext conte
                 "Expected "+exp.name()+" for '"+unit+"' of "+handledType().getName()+" value");
     }
 
-    protected void _rethrowDateTimeException(JsonParser p, DateTimeException e) throws IOException
+    protected void _rethrowDateTimeException(JsonParser p, DeserializationContext context,
+            DateTimeException e0, String value) throws JsonMappingException
     {
-        throw JsonMappingException.from(p,
+        JsonMappingException e;
+        if (e0 instanceof DateTimeParseException) {
+            e = context.weirdStringException(value, handledType(), e0.getMessage());
+            e.initCause(e0);
+        } else {
+            e = JsonMappingException.from(p,
                 String.format("Failed to deserialize %s: (%s) %s",
-                        handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+                        handledType().getName(), e0.getClass().getName(), e0.getMessage()), e0);
+        }
+        throw e;
     }
 
     /**

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java

@@ -88,7 +88,7 @@ public Object deserialize(JsonParser parser, DeserializationContext context) thr
                     return ZoneOffset.of(string);
                 }
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, e);
+                _rethrowDateTimeException(parser, context, e, string);
             }
         }
         throw context.wrongTokenException(parser, JsonToken.VALUE_STRING, null);

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

@@ -79,7 +79,7 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)
                 }
                 return LocalDate.parse(string, format);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, e);
+                _rethrowDateTimeException(parser, context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {

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

@@ -82,7 +82,7 @@ public LocalDateTime deserialize(JsonParser parser, DeserializationContext conte
 
                 return LocalDateTime.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, e);
+                _rethrowDateTimeException(parser, context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {

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, e);
+                _rethrowDateTimeException(parser, context, e, string);
             }
         }
         if (parser.isExpectedStartArrayToken()) {

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/MonthDayDeserializer.java

@@ -32,14 +32,14 @@ protected JsonDeserializer<MonthDay> withDateFormat(DateTimeFormatter dtf) {
     public MonthDay deserialize(JsonParser parser, DeserializationContext context) throws IOException
     {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            String str = parser.getValueAsString().trim();
+            String string = parser.getValueAsString().trim();
             try {
                 if (_formatter == null) {
-                    return MonthDay.parse(str);
+                    return MonthDay.parse(string);
                 }
-                return MonthDay.parse(str, _formatter);
+                return MonthDay.parse(string, _formatter);
             } catch (DateTimeException e) {
-                _rethrowDateTimeException(parser, e);
+                _rethrowDateTimeException(parser, context, e, string);
             }
         }
         throw context.mappingException("Unexpected token (%s), expected VALUE_STRING or VALUE_NUMBER_INT",