zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复JSONUtil.toBean目标存在Map字段无序问题

Browse Source
This commit is contained in:
Looly
2023-04-25 16:37:56 +08:00
parent acb40326f6
commit 74d895ccb6
4 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java
View File

@@ -8,8 +8,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.TypeUtil;
import java.lang.reflect.Type;
import java.util.Map;
import java.util.Objects;
import java.util.*;
/**
* {@link Map} 转换器
@@ -65,14 +64,21 @@ public class MapConverter extends AbstractConverter<Map<?, ?>> {
return (Map) value;
}
}
map = MapUtil.createMap(TypeUtil.getClass(this.mapType));
final Class<?> mapClass = TypeUtil.getClass(this.mapType);
if (null == mapClass || mapClass.isAssignableFrom(AbstractMap.class)) {
// issue#I6YN2A，默认有序
map = new LinkedHashMap<>();
} else{
map = MapUtil.createMap(mapClass);
}
convertMapToMap((Map) value, map);
} else if (BeanUtil.isBean(value.getClass())) {
map = BeanUtil.beanToMap(value);
// 二次转换，转换键值类型
map = convertInternal(map);
} else {
throw new UnsupportedOperationException(StrUtil.format("Unsupport toMap value type: {}", value.getClass().getName()));
throw new UnsupportedOperationException(StrUtil.format("Unsupported toMap value type: {}", value.getClass().getName()));
}
return map;
}