mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
add of
This commit is contained in:
parent
594c181367
commit
a4e30936fb
@ -14,8 +14,9 @@
|
||||
* 【core 】 增加PathUtil和FileNameUtil,分离FileUtil中部分方法
|
||||
* 【core 】 改造IndexedComparator,增加InstanceComparator
|
||||
* 【extra 】 增加CglibUtil
|
||||
* 【extra 】 增加Ipv4Util(pr#161@Gitee)
|
||||
* 【extra 】 增加CalendarUtil和DateUtil增加isSameMonth方法(pr#161@Gitee)
|
||||
* 【core 】 增加Ipv4Util(pr#161@Gitee)
|
||||
* 【core 】 增加CalendarUtil和DateUtil增加isSameMonth方法(pr#161@Gitee)
|
||||
* 【core 】 Dict增加of方法(issue#1035@Github)
|
||||
|
||||
### Bug修复#
|
||||
* 【poi 】 修复ExcelBase.isXlsx方法判断问题(issue#I1S502@Gitee)
|
||||
|
@ -19,7 +19,6 @@ import java.util.Map;
|
||||
* 字典对象,扩充了HashMap中的方法
|
||||
*
|
||||
* @author loolly
|
||||
*
|
||||
*/
|
||||
public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGetter<String> {
|
||||
private static final long serialVersionUID = 6135423866861206530L;
|
||||
@ -27,10 +26,13 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
|
||||
static final float DEFAULT_LOAD_FACTOR = 0.75f;
|
||||
static final int DEFAULT_INITIAL_CAPACITY = 1 << 4; // aka 16
|
||||
|
||||
/** 是否大小写不敏感 */
|
||||
/**
|
||||
* 是否大小写不敏感
|
||||
*/
|
||||
private boolean caseInsensitive;
|
||||
|
||||
// --------------------------------------------------------------- Static method start
|
||||
|
||||
/**
|
||||
* 创建Dict
|
||||
*
|
||||
@ -50,9 +52,59 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
|
||||
public static <T> Dict parse(T bean) {
|
||||
return create().parseBean(bean);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据给定的Pair数组创建Dict对象
|
||||
*
|
||||
* @param pairs 键值对
|
||||
* @return Dict
|
||||
* @since 5.4.1
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static Dict of(Pair<String, Object>... pairs) {
|
||||
final Dict dict = create();
|
||||
for (Pair<String, Object> pair : pairs) {
|
||||
dict.put(pair.getKey(), pair.getValue());
|
||||
}
|
||||
return dict;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据给定的键值对数组创建Dict对象,传入参数必须为key,value,key,value...
|
||||
*
|
||||
* <p>奇数参数必须为key,key最后会转换为String类型。</p>
|
||||
* <p>奇数参数必须为value,可以为任意类型。</p>
|
||||
*
|
||||
* <pre>
|
||||
Dict dict = Dict.of(
|
||||
* "RED", "#FF0000",
|
||||
* "GREEN", "#00FF00",
|
||||
* "BLUE", "#0000FF"
|
||||
* );
|
||||
* </pre>
|
||||
*
|
||||
* @param keysAndValues 键值对列表,必须奇数参数为key,偶数参数为value
|
||||
* @return Dict
|
||||
* @since 5.4.1
|
||||
*/
|
||||
public static Dict of(Object... keysAndValues) {
|
||||
final Dict dict = create();
|
||||
|
||||
String key = null;
|
||||
for(int i = 0; i < keysAndValues.length; i++){
|
||||
if(i % 2 == 0){
|
||||
dict.put(key, keysAndValues[i]);
|
||||
} else{
|
||||
key = Convert.toStr(keysAndValues[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
// --------------------------------------------------------------- Static method end
|
||||
|
||||
// --------------------------------------------------------------- Constructor start
|
||||
|
||||
/**
|
||||
* 构造
|
||||
*/
|
||||
@ -263,6 +315,7 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------- Set start
|
||||
|
||||
/**
|
||||
* 设置列
|
||||
*
|
||||
@ -455,7 +508,7 @@ public class Dict extends LinkedHashMap<String, Object> implements BasicTypeGett
|
||||
|
||||
@Override
|
||||
public Object get(Object key) {
|
||||
return super.get(customKey((String)key));
|
||||
return super.get(customKey((String) key));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -289,7 +289,11 @@ public class MapUtil {
|
||||
* </pre>
|
||||
*
|
||||
* <pre>
|
||||
* Map<Object, Object> colorMap = MapUtil.of(new String[][] { { "RED", "#FF0000" }, { "GREEN", "#00FF00" }, { "BLUE", "#0000FF" } });
|
||||
* Map<Object, Object> colorMap = MapUtil.of(new String[][] {
|
||||
* { "RED", "#FF0000" },
|
||||
* { "GREEN", "#00FF00" },
|
||||
* { "BLUE", "#0000FF" }
|
||||
* });
|
||||
* </pre>
|
||||
* <p>
|
||||
* 参考:commons-lang
|
||||
@ -305,7 +309,7 @@ public class MapUtil {
|
||||
}
|
||||
final HashMap<Object, Object> map = new HashMap<>((int) (array.length * 1.5));
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
Object object = array[i];
|
||||
final Object object = array[i];
|
||||
if (object instanceof Map.Entry) {
|
||||
Map.Entry entry = (Map.Entry) object;
|
||||
map.put(entry.getKey(), entry.getValue());
|
||||
@ -315,7 +319,7 @@ public class MapUtil {
|
||||
map.put(entry[0], entry[1]);
|
||||
}
|
||||
} else if (object instanceof Iterable) {
|
||||
Iterator iter = ((Iterable) object).iterator();
|
||||
final Iterator iter = ((Iterable) object).iterator();
|
||||
if (iter.hasNext()) {
|
||||
final Object key = iter.next();
|
||||
if (iter.hasNext()) {
|
||||
@ -324,7 +328,7 @@ public class MapUtil {
|
||||
}
|
||||
}
|
||||
} else if (object instanceof Iterator) {
|
||||
Iterator iter = ((Iterator) object);
|
||||
final Iterator iter = ((Iterator) object);
|
||||
if (iter.hasNext()) {
|
||||
final Object key = iter.next();
|
||||
if (iter.hasNext()) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user