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.

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

fix: 解决反序列化时枚举实现了EnumDict,但泛型不是String类型会抛异常的问题 #273

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -413,8 +413,17 @@ public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
};
if (EnumDict.class.isAssignableFrom(findPropertyType) && findPropertyType.isEnum()) {
if (node.isObject()) {
JsonNode valueNode = node.get("value");
Object value = null;
if (valueNode != null) {
if (valueNode.isTextual()) {
value = valueNode.textValue();
} else if (valueNode.isNumber()) {
value = valueNode.numberValue();
}
}
return (EnumDict) EnumDict
.findByValue(findPropertyType, node.has("value") ? node.get("value").textValue() : null)
.findByValue(findPropertyType, value)
.orElseThrow(exceptionSupplier);
}
if (node.isNumber()) {
Original file line number Diff line number Diff line change
@@ -90,6 +90,8 @@ public void testEq() {
public static class TestEntity {
private TestEnum testEnum = TestEnum.E1;

private TestEnumInteger testEnumInteger = TestEnumInteger.E1;

private SimpleEnum simpleEnum = SimpleEnum.A;

private TestEnum[] testEnums;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.hswebframework.web.dict;

import lombok.AllArgsConstructor;
import lombok.Getter;

/**
* @author Qingsheng.Ning
*/
@Getter
@AllArgsConstructor
public enum TestEnumInteger implements EnumDict<Integer> {
E1(1), E2(2)
;

private final Integer value;

@Override
public String getText() {
return name();
}
}