From 8387823c124b95e8a5df978398b2a2aa4937c072 Mon Sep 17 00:00:00 2001 From: michaelok Date: Sat, 19 Oct 2019 14:59:35 -0500 Subject: [PATCH] restore fix for parsing of ZoneId that conflicted with changes for issue 138 --- .../jsr310/deser/JSR310StringParsableDeserializer.java | 2 +- .../jackson/datatype/jsr310/deser/ZoneIdDeserTest.java | 3 +-- .../jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java | 3 +-- release-notes/VERSION | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) 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 index 72872b8c..b51cb586 100644 --- 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 @@ -98,7 +98,7 @@ public Object deserialize(JsonParser parser, DeserializationContext context) thr if (!isLenient()) { return _failForNotLenient(parser, context, JsonToken.VALUE_STRING); } - return null; + return _coerceEmptyString(context, false); } try { switch (_typeSelector) { diff --git a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneIdDeserTest.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneIdDeserTest.java index 427a79d6..70d631ac 100644 --- a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneIdDeserTest.java +++ b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneIdDeserTest.java @@ -114,8 +114,7 @@ public void testStrictDeserializeFromEmptyString() throws Exception { objectReader.readValue(valueFromEmptyStr); } - // [module-java8#68]: Was to prevent it but... conflicts with [#138] - @Ignore + // [module-java8#68] @Test public void testZoneOffsetDeserFromEmpty() throws Exception { diff --git a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java index 2b48969a..abb3a4ce 100644 --- a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java +++ b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java @@ -182,8 +182,7 @@ public void testStrictDeserializeFromEmptyString() throws Exception { objectReader.readValue(valueFromEmptyStr); } - // [module-java8#68]: Was to prevent it but... conflicts with [#138] - @Ignore + // [module-java8#68] @Test public void testZoneOffsetDeserFromEmpty() throws Exception { diff --git a/release-notes/VERSION b/release-notes/VERSION index 33202774..a0da7bb6 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -15,6 +15,8 @@ due to number of types. 3.0.0 (not yet released) +- #68: Parsing of `ZoneId` should respect `ALLOW_COERCION_OF_SCALARS` + wrt empty String - Deprecate "paramater names" and "datatypes" modules as functionality now included directly in `jackson-databind` - Remove legacy `JSR310Module`