Skip to content

restore fix for parsing of ZoneId that conflicted with changes for issue 138 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2019
Merged

restore fix for parsing of ZoneId that conflicted with changes for issue 138 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...in/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneIdDeserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 1 addition & 2 deletions datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down