mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
add methods
This commit is contained in:
Looly
parent
97f5e2bfa7
commit
edd0449187
@ -14,10 +14,13 @@
|
||||
* 【core 】 PhoneUtil增加中国澳门和中国台湾手机号校检方法（pr#331@Gitee）
|
||||
* 【db 】 分页查询，自定义sql查询，添加参数（pr#332@Gitee）
|
||||
* 【core 】 IdCardUtil.isValidCard增加非空判断
|
||||
* 【json 】 JSONObject构造增加SortedMap判断（pr#333@Gitee）
|
||||
* 【core 】 Tuple增加部分方法（pr#333@Gitee）
|
||||
|
||||
### 🐞Bug修复
|
||||
* 【core 】 修复XmlUtil中omitXmlDeclaration参数无效问题（issue#1581@Github）
|
||||
* 【core 】 修复NumberUtil.decimalFormat参数传错的问题（issue#I3SDS3@Gitee）
|
||||
* 【json 】 修复JSONArray.put方法不能覆盖值的问题
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
# 5.6.5 (2021-05-08)
|
||||
|
||||
@ -2,17 +2,23 @@ package cn.hutool.core.lang;
|
||||
|
||||
import cn.hutool.core.clone.CloneSupport;
|
||||
import cn.hutool.core.collection.ArrayIter;
|
||||
import cn.hutool.core.collection.ListUtil;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Spliterator;
|
||||
import java.util.Spliterators;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
/**
|
||||
* 不可变数组类型，用于多值返回<br>
|
||||
* 不可变数组类型（元组），用于多值返回<br>
|
||||
* 多值可以支持每个元素值类型不同
|
||||
*
|
||||
* @author Looly
|
||||
*
|
||||
*/
|
||||
public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Serializable {
|
||||
private static final long serialVersionUID = -7689304393482182157L;
|
||||
@ -23,6 +29,7 @@ public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Seri
|
||||
|
||||
/**
|
||||
* 构造
|
||||
*
|
||||
* @param members 成员数组
|
||||
*/
|
||||
public Tuple(Object... members) {
|
||||
@ -31,6 +38,7 @@ public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Seri
|
||||
|
||||
/**
|
||||
* 获取指定位置元素
|
||||
*
|
||||
* @param <T> 返回对象类型
|
||||
* @param index 位置
|
||||
* @return 元素
|
||||
@ -42,12 +50,23 @@ public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Seri
|
||||
|
||||
/**
|
||||
* 获得所有元素
|
||||
*
|
||||
* @return 获得所有元素
|
||||
*/
|
||||
public Object[] getMembers() {
|
||||
return this.members;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将元组转换成列表
|
||||
*
|
||||
* @return 转换得到的列表
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public final List<Object> toList() {
|
||||
return ListUtil.toList(this.members);
|
||||
}
|
||||
|
||||
/**
|
||||
* 缓存Hash值，当为true时，此对象的hash值只被计算一次，常用于Tuple中的值不变时使用。
|
||||
* 注意：当为true时，member变更对象后，hash值不会变更。
|
||||
@ -61,6 +80,59 @@ public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Seri
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 得到元组的大小
|
||||
*
|
||||
* @return 元组的大小
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public int size() {
|
||||
return this.members.length;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断元组中是否包含某元素
|
||||
*
|
||||
* @param value 需要判定的元素
|
||||
* @return 是否包含
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public boolean contains(Object value) {
|
||||
return ArrayUtil.contains(this.members, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将元组转成流
|
||||
*
|
||||
* @return 流
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public final Stream<Object> stream() {
|
||||
return Arrays.stream(this.members);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将元组转成并行流
|
||||
*
|
||||
* @return 流
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public final Stream<Object> parallelStream() {
|
||||
return StreamSupport.stream(spliterator(), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* 截取元组指定部分
|
||||
*
|
||||
* @param start 起始位置（包括）
|
||||
* @param end 终止位置（不包括）
|
||||
* @return 截取得到的元组
|
||||
* @since 5.6.6
|
||||
*/
|
||||
public final Tuple sub(final int start, final int end) {
|
||||
return new Tuple(ArrayUtil.sub(this.members, start, end));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
if (this.cacheHash && 0 != this.hashCode) {
|
||||
@ -95,9 +167,13 @@ public class Tuple extends CloneSupport<Tuple> implements Iterable<Object>, Seri
|
||||
return Arrays.toString(members);
|
||||
}
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Override
|
||||
public Iterator<Object> iterator() {
|
||||
return new ArrayIter<>(members);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final Spliterator<Object> spliterator() {
|
||||
return Spliterators.spliterator(this.members, Spliterator.ORDERED);
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,15 +36,22 @@ import static cn.hutool.json.JSONConverter.jsonConvert;
|
||||
public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, RandomAccess {
|
||||
private static final long serialVersionUID = 2664900568717612292L;
|
||||
|
||||
/** 默认初始大小 */
|
||||
/**
|
||||
* 默认初始大小
|
||||
*/
|
||||
public static final int DEFAULT_CAPACITY = 10;
|
||||
|
||||
/** 持有原始数据的List */
|
||||
/**
|
||||
* 持有原始数据的List
|
||||
*/
|
||||
private final List<Object> rawList;
|
||||
/** 配置项 */
|
||||
/**
|
||||
* 配置项
|
||||
*/
|
||||
private final JSONConfig config;
|
||||
|
||||
// -------------------------------------------------------------------------------------------------------------------- Constructor start
|
||||
|
||||
/**
|
||||
* 构造<br>
|
||||
* 默认使用{@link ArrayList} 实现
|
||||
@ -284,9 +291,10 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
|
||||
* @param value 值对象. 可以是以下类型: Boolean, Double, Integer, JSONArray, JSONObject, Long, String, or the JSONNull.NULL.
|
||||
* @return this.
|
||||
* @throws JSONException index < 0 或者非有限的数字
|
||||
* @see #set(int, Object)
|
||||
*/
|
||||
public JSONArray put(int index, Object value) throws JSONException {
|
||||
this.add(index, value);
|
||||
this.set(index, value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -335,7 +343,6 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Override
|
||||
public Iterator<Object> iterator() {
|
||||
return rawList.iterator();
|
||||
@ -441,6 +448,13 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 加入或者替换JSONArray中指定Index的值，如果index大于JSONArray的长度，将在指定index设置值，之前的位置填充JSONNull.Null
|
||||
*
|
||||
* @param index 位置
|
||||
* @param element 值对象. 可以是以下类型: Boolean, Double, Integer, JSONArray, JSONObject, Long, String, or the JSONNull.NULL.
|
||||
* @return 替换的值，即之前的值
|
||||
*/
|
||||
@Override
|
||||
public Object set(int index, Object element) {
|
||||
return this.rawList.set(index, JSONUtil.wrap(element, this.config));
|
||||
@ -473,19 +487,16 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
|
||||
return this.rawList.lastIndexOf(o);
|
||||
}
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Override
|
||||
public ListIterator<Object> listIterator() {
|
||||
return this.rawList.listIterator();
|
||||
}
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Override
|
||||
public ListIterator<Object> listIterator(int index) {
|
||||
return this.rawList.listIterator(index);
|
||||
}
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Override
|
||||
public List<Object> subList(int fromIndex, int toIndex) {
|
||||
return this.rawList.subList(fromIndex, toIndex);
|
||||
|
||||
@ -25,10 +25,10 @@ import java.math.BigInteger;
|
||||
import java.util.Collection;
|
||||
import java.util.Enumeration;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.TreeMap;
|
||||
import java.util.Map;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.Set;
|
||||
import java.util.SortedMap;
|
||||
|
||||
/**
|
||||
* JSON对象<br>
|
||||
@ -158,7 +158,7 @@ public class JSONObject implements JSON, JSONGetter<String>, Map<String, Object>
|
||||
* @since 3.0.9
|
||||
*/
|
||||
public JSONObject(Object source, boolean ignoreNullValue) {
|
||||
this(source, ignoreNullValue, (source instanceof LinkedHashMap) || (source instanceof TreeMap));
|
||||
this(source, ignoreNullValue, (source instanceof LinkedHashMap) || (source instanceof SortedMap));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user