From f54852d64c2996fae63da19a908cb3d2691b0011 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 10 Jan 2020 18:01:32 +0800 Subject: [PATCH] fix dict --- CHANGELOG.md | 1 + hutool-core/src/main/java/cn/hutool/core/lang/Dict.java | 7 ++++++- .../main/java/cn/hutool/db/handler/EntityListHandler.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cd9906a8..7f6fc4265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * 【core 】 修正NumberChineseFormatter和NumberWordFormatter(类名拼写错误) * 【all 】 修正equals,避免可能存在的空指针问题(pr#692@Github) * 【core 】 提供一个自带默认值的Map(pr#87@Gitee) +* 【core 】 修改Dict在非大小写敏感状态下get也不区分大小写 ### Bug修复 * 【core 】 修复NumberUtil.mul中null的结果错误问题(issue#I17Y4J@Gitee) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java index 6eb08875b..61208a1a8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java @@ -117,7 +117,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * @param m Map */ public Dict(Map m) { - super((null == m) ? new HashMap() : m); + super((null == m) ? new HashMap<>() : m); } // --------------------------------------------------------------- Constructor end @@ -453,6 +453,11 @@ public class Dict extends LinkedHashMap implements BasicTypeGett } // -------------------------------------------------------------------- Get end + @Override + public Object get(Object key) { + return super.get(customKey((String)key)); + } + @Override public Object put(String key, Object value) { return super.put(customKey(key), value); diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java index 1ec64edf2..b7029a76f 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java @@ -44,6 +44,6 @@ public class EntityListHandler implements RsHandler>{ @Override public List handle(ResultSet rs) throws SQLException { - return HandleHelper.handleRs(rs, new ArrayList(), this.caseInsensitive); + return HandleHelper.handleRs(rs, new ArrayList<>(), this.caseInsensitive); } }