Skip to content
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

Jump to bottom

Fix for the bug? that READ_ENUMS_USING_TO_STRING doesn't support null… #2307

Closed
wants to merge 2 commits into from
Closed

Fix for the bug? that READ_ENUMS_USING_TO_STRING doesn't support null… #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f09f5
Fix for the bug? that READ_ENUMS_USING_TO_STRING doesn't support null…
Apr 19, 2019
5362e30
adding a little more to the test.
Apr 20, 2019
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 src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static EnumResolver constructUsingToString(Class<Enum<?>> enumCls,
// from last to first, so that in case of duplicate values, first wins
for (int i = enumValues.length; --i >= 0; ) {
Enum<?> e = enumValues[i];
map.put(e.toString(), e);
map.put(e.toString() + "", e);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe it should continue if e is null and not add anything to the map

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I like "skip nulls" approach: will use that.

}
Enum<?> defaultEnum = (ai == null) ? null : ai.findDefaultEnumValue(enumCls);
return new EnumResolver(enumCls, enumValues, map, defaultEnum);
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumDeserializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.fasterxml.jackson.databind.deser.jdk;

import static com.fasterxml.jackson.databind.DeserializationFeature.READ_ENUMS_USING_TO_STRING;

import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -527,4 +530,37 @@ public void testExceptionFromCustomEnumKeyDeserializer() throws Exception {
assertTrue(e.getMessage().contains("Undefined AnEnum"));
}
}

// see here for real world example:
// https://github.com/facebook/facebook-java-business-sdk/blob/v3.2.11/src/main/java/com/facebook/ads/sdk/CustomAudience.java#L4139
static enum EnumWithToStringNullValue {
NON_NULL("NON_NULL"),
NULL(null);

private String value;

private EnumWithToStringNullValue(String value) {
this.value = value;
}

@Override
public String toString() {
return value;
}
}

static class PojoWithEnum {
public EnumWithToStringNullValue enumWithToStringNullValue;
}

public void testEnumWithToStringNullValue() {
ObjectMapper mapper = new ObjectMapper().enable(READ_ENUMS_USING_TO_STRING);
ObjectNode on = mapper.createObjectNode();
on.put("enumWithToStringNullValue", "NON_NULL");
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

w/out the supplied "fix", this throws an exception even through I'm not mapping the NULL enum.

PojoWithEnum nonNull = mapper.convertValue(on, PojoWithEnum.class);
assertEquals(EnumWithToStringNullValue.NON_NULL, nonNull.enumWithToStringNullValue);
on.put("enumWithToStringNullValue", "null");
PojoWithEnum nully = mapper.convertValue(on, PojoWithEnum.class);
assertEquals(EnumWithToStringNullValue.NULL, nully.enumWithToStringNullValue);
}
}