Looly 6 years ago
parent
commit
f54852d64c

+ 1 - 0
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)

+ 6 - 1
hutool-core/src/main/java/cn/hutool/core/lang/Dict.java

@@ -117,7 +117,7 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
 	 * @param m Map
 	 */
 	public Dict(Map<String, Object> m) {
-		super((null == m) ? new HashMap<String, Object>() : m);
+		super((null == m) ? new HashMap<>() : m);
 	}
 	// --------------------------------------------------------------- Constructor end
 
@@ -454,6 +454,11 @@ public class Dict extends LinkedHashMap<String, Object> 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);
 	}

+ 1 - 1
hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java

@@ -44,6 +44,6 @@ public class EntityListHandler implements RsHandler<List<Entity>>{
 
 	@Override
 	public List<Entity> handle(ResultSet rs) throws SQLException {
-		return HandleHelper.handleRs(rs, new ArrayList<Entity>(), this.caseInsensitive);
+		return HandleHelper.handleRs(rs, new ArrayList<>(), this.caseInsensitive);
 	}
 }