unit tests

remal · remal · commit 1ce786ef0155 · 2018-04-04T15:22:10.000+03:00
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
@@ -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
@@ -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;
@@ -93,6 +92,30 @@ protected <R> R _handleDateTimeException(DeserializationContext context,
         }
     }
 
+    @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);
+        }
+    }
+
+    @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
      *
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
@@ -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
@@ -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
@@ -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
@@ -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/YearDeserializer.java b/datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearDeserializer.java
@@ -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
@@ -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/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java
@@ -1,13 +1,19 @@
 package com.fasterxml.jackson.datatype.jsr310;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.format.DateTimeParseException;
@@ -72,6 +78,46 @@ public void testDeserializationAsEmptyArrayEnabled() throws Throwable
     	assertNull(value);
     }
 
+    @Test
+    public void testDateTimeExceptionIsHandled() throws Throwable
+    {
+        LocalDateTime now = LocalDateTime.now();
+        DeserializationProblemHandler handler = new DeserializationProblemHandler() {
+            @Override
+            public Object handleWeirdStringValue(DeserializationContext ctxt, Class<?> targetType,
+                                                 String valueToConvert, String failureMsg) throws IOException {
+                if (LocalDateTime.class == targetType) {
+                    if ("now".equals(valueToConvert)) {
+                        return now;
+                    }
+                }
+                return NOT_HANDLED;
+            }
+        };
+        ObjectMapper mapper = newMapper().addHandler(handler);
+        assertEquals(now, mapper.readValue(quote("now"), LocalDateTime.class));
+    }
+
+    @Test
+    public void testUnexpectedTokenIsHandled() throws Throwable
+    {
+        LocalDateTime now = LocalDateTime.now();
+        DeserializationProblemHandler handler = new DeserializationProblemHandler() {
+            @Override
+            public Object handleUnexpectedToken(DeserializationContext ctxt, Class<?> targetType,
+                                                JsonToken t, JsonParser p, String failureMsg) throws IOException {
+                if (LocalDateTime.class == targetType) {
+                    if (t.isBoolean()) {
+                        return now;
+                    }
+                }
+                return NOT_HANDLED;
+            }
+        };
+        ObjectMapper mapper = newMapper().addHandler(handler);
+        assertEquals(now, mapper.readValue("true", LocalDateTime.class));
+    }
+
     private void expectFailure(String json) throws Throwable {
         try {
             read(json);
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
@@ -2,13 +2,16 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -76,6 +79,29 @@ public void testDeserialization1() throws Exception {
         assertEquals("Value is incorrect", map, value);
     }
 
+    @Test
+    public void testDateTimeExceptionIsHandled() throws Throwable
+    {
+        LocalDateTime now = LocalDateTime.now();
+        DeserializationProblemHandler handler = new DeserializationProblemHandler() {
+            @Override
+            public Object handleWeirdStringValue(DeserializationContext ctxt, Class<?> targetType,
+                                                 String valueToConvert, String failureMsg) throws IOException {
+                if (LocalDateTime.class == targetType) {
+                    if ("now".equals(valueToConvert)) {
+                        return now;
+                    }
+                }
+                return NOT_HANDLED;
+            }
+        };
+        Map<LocalDateTime, String> value = om.addHandler(handler).readValue(
+                map("now", "test"),
+                TYPE_REF);
+        map.put(now, "test");
+        assertEquals(map, value);
+    }
+
     private String map(String key, String value) {
         return String.format("{\"%s\":\"%s\"}", key, value);
     }

Original file line number	Diff line number	Diff line change
`@@ -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
`@@ -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
`@@ -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
`@@ -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
`@@ -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
`@@ -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
`@@ -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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,6 @@ public YearMonth deserialize(JsonParser parser, DeserializationContext context)`
`102`	`102`	`if (parser.hasToken(JsonToken.VALUE_EMBEDDED_OBJECT)) {`
`103`	`103`	`return (YearMonth) parser.getEmbeddedObject();`
`104`	`104`	`}`
`105`		`- return _reportWrongToken(parser, context, JsonToken.VALUE_STRING, JsonToken.START_ARRAY);`
	`105`	`+ return _handleUnexpectedToken(context, parser, JsonToken.VALUE_STRING, JsonToken.START_ARRAY);`
`106`	`106`	`}`
`107`	`107`	`}`