diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java b/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java index f5d3b0783..062e7ac11 100755 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java @@ -42,7 +42,7 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa /** * 元注解 */ - private static final Set> META_ANNOTATIONS = SetUtil.newHashSet(Target.class, // + private static final Set> META_ANNOTATIONS = SetUtil.of(Target.class, // Retention.class, // Inherited.class, // Documented.class, // diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index 6d096cad4..ef9530366 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -575,7 +575,7 @@ public class BeanUtil { public static Map beanToMap(final Object bean, final String... properties) { Editor keyEditor = null; if(ArrayUtil.isNotEmpty(properties)){ - final Set propertiesSet = SetUtil.set(false, properties); + final Set propertiesSet = SetUtil.of(properties); keyEditor = property -> propertiesSet.contains(property) ? property : null; } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index 644168d57..33c4070e5 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -121,7 +121,7 @@ public class CollUtil { final ArrayList list = new ArrayList<>(Math.max(coll1.size(), coll2.size())); final Map map1 = countMap(coll1); final Map map2 = countMap(coll2); - final Set elts = SetUtil.newHashSet(coll2); + final Set elts = SetUtil.of(coll2); elts.addAll(coll1); int m; for (final T t : elts) { @@ -238,7 +238,7 @@ public class CollUtil { final ArrayList list = new ArrayList<>(Math.min(coll1.size(), coll2.size())); final Map map1 = countMap(coll1); final Map map2 = countMap(coll2); - final Set elts = SetUtil.newHashSet(coll2); + final Set elts = SetUtil.of(coll2); int m; for (final T t : elts) { m = Math.min(Convert.toInt(map1.get(t), 0), Convert.toInt(map2.get(t), 0)); @@ -347,7 +347,7 @@ public class CollUtil { final List result = new ArrayList<>(); final Map map1 = countMap(coll1); final Map map2 = countMap(coll2); - final Set elts = SetUtil.newHashSet(coll2); + final Set elts = SetUtil.of(coll2); elts.addAll(coll1); int m; for (final T t : elts) { @@ -400,7 +400,7 @@ public class CollUtil { return ListUtil.empty(); } if (isEmpty(coll2)) { - return ListUtil.list(true, coll1); + return ListUtil.of(true, coll1); } //将被交数用链表储存,防止因为频繁扩容影响性能 @@ -830,7 +830,7 @@ public class CollUtil { return ListUtil.empty(); } - final List list = collection instanceof List ? (List) collection : ListUtil.toList(collection); + final List list = collection instanceof List ? (List) collection : ListUtil.of(collection); return sub(list, start, end, step); } @@ -927,7 +927,7 @@ public class CollUtil { */ @SuppressWarnings("unchecked") public static , E> T removeAny(final T collection, final E... elesRemoved) { - collection.removeAll(SetUtil.newHashSet(elesRemoved)); + collection.removeAll(SetUtil.of(elesRemoved)); return collection; } @@ -1632,7 +1632,7 @@ public class CollUtil { * @since 3.0.9 */ public static Collection toCollection(final Iterable iterable) { - return (iterable instanceof Collection) ? (Collection) iterable : ListUtil.toList(iterable.iterator()); + return (iterable instanceof Collection) ? (Collection) iterable : ListUtil.of(iterable.iterator()); } /** @@ -1787,7 +1787,7 @@ public class CollUtil { iter = StrUtil.splitTrim(ArrayStr, CharUtil.COMMA).iterator(); } else { // 其它类型按照单一元素处理 - iter = ListUtil.toList(value).iterator(); + iter = ListUtil.of(value).iterator(); } final ConverterRegistry convert = ConverterRegistry.getInstance(); @@ -2323,11 +2323,11 @@ public class CollUtil { while (result.size() - 1 < index) { result.add(null); } - result.set(index, ListUtil.toList(t)); + result.set(index, ListUtil.of(t)); } else { subList = result.get(index); if (null == subList) { - result.set(index, ListUtil.toList(t)); + result.set(index, ListUtil.of(t)); } else { subList.add(t); } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java index 88956bfc0..56b661c4f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java @@ -1,5 +1,6 @@ package cn.hutool.core.collection; +import cn.hutool.core.collection.iter.EnumerationIter; import cn.hutool.core.collection.partition.AvgPartition; import cn.hutool.core.collection.partition.Partition; import cn.hutool.core.collection.partition.RandomAccessAvgPartition; @@ -29,51 +30,53 @@ import java.util.function.Consumer; * @author looly */ public class ListUtil { - /** - * 新建一个空List - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @return List对象 - * @since 4.1.2 - */ - public static List list(final boolean isLinked) { - return isLinked ? new LinkedList<>() : new ArrayList<>(); - } /** - * 新建一个List + * 新建一个List
+ * 如果提供的初始化数组为空,新建默认初始长度的List * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param values 数组 + * @param 集合元素类型 + * @param values 数组,可以为{@code null} * @return List对象 * @since 4.1.2 */ @SafeVarargs - public static List list(final boolean isLinked, final T... values) { + public static ArrayList of(final T... values) { if (ArrayUtil.isEmpty(values)) { - return list(isLinked); + return new ArrayList<>(); } - final List arrayList = isLinked ? new LinkedList<>() : new ArrayList<>(values.length); + final ArrayList arrayList = new ArrayList<>(values.length); Collections.addAll(arrayList, values); return arrayList; } /** - * 新建一个List + * 新建一个{@link LinkedList}
+ * 如果提供的初始化数组为空,新建默认初始长度的List * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param collection 集合 - * @return List对象 - * @since 4.1.2 + * @param 集合元素类型 + * @param values 数组,可以为{@code null} + * @return {@link LinkedList}对象 */ - public static List list(final boolean isLinked, final Collection collection) { - if (null == collection) { - return list(isLinked); + @SafeVarargs + public static LinkedList ofLinked(final T... values) { + final LinkedList list = new LinkedList<>(); + if (ArrayUtil.isNotEmpty(values)) { + Collections.addAll(list, values); } - return isLinked ? new LinkedList<>(collection) : new ArrayList<>(collection); + return list; + } + + /** + * 新建一个List
+ * 如果提供的初始化数组为空,新建默认初始长度的List + * + * @param 集合元素类型 + * @param isLinked 是否为链表 + * @return List对象 + */ + public static List of(final boolean isLinked) { + return isLinked ? ofLinked() : of(); } /** @@ -86,31 +89,15 @@ public class ListUtil { * @return List对象 * @since 4.1.2 */ - public static List list(final boolean isLinked, final Iterable iterable) { + public static List of(final boolean isLinked, final Iterable iterable) { if (null == iterable) { - return list(isLinked); + return of(isLinked); } - return list(isLinked, iterable.iterator()); - } - - /** - * 新建一个List
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param iter {@link Iterator} - * @return ArrayList对象 - * @since 4.1.2 - */ - public static List list(final boolean isLinked, final Iterator iter) { - final List list = list(isLinked); - if (null != iter) { - while (iter.hasNext()) { - list.add(iter.next()); - } + if (iterable instanceof Collection) { + final Collection collection = (Collection) iterable; + return isLinked ? new LinkedList<>(collection) : new ArrayList<>(collection); } - return list; + return of(isLinked, iterable.iterator()); } /** @@ -123,80 +110,30 @@ public class ListUtil { * @return ArrayList对象 * @since 3.0.8 */ - public static List list(final boolean isLinked, final Enumeration enumration) { - final List list = list(isLinked); - if (null != enumration) { - while (enumration.hasMoreElements()) { - list.add(enumration.nextElement()); + public static List of(final boolean isLinked, final Enumeration enumration) { + return of(isLinked, (Iterator) new EnumerationIter<>(enumration)); + } + + /** + * 新建一个List
+ * 提供的参数为null时返回空{@link ArrayList} + * + * @param 集合元素类型 + * @param isLinked 是否新建LinkedList + * @param iter {@link Iterator} + * @return ArrayList对象 + * @since 4.1.2 + */ + public static List of(final boolean isLinked, final Iterator iter) { + final List list = of(isLinked); + if (null != iter) { + while (iter.hasNext()) { + list.add(iter.next()); } } return list; } - /** - * 新建一个ArrayList - * - * @param 集合元素类型 - * @param values 数组 - * @return ArrayList对象 - */ - @SafeVarargs - public static ArrayList toList(final T... values) { - return (ArrayList) list(false, values); - } - - /** - * 新建LinkedList - * - * @param values 数组 - * @param 类型 - * @return LinkedList - * @since 4.1.2 - */ - @SafeVarargs - public static LinkedList toLinkedList(final T... values) { - return (LinkedList) list(true, values); - } - - /** - * 数组转为一个不可变List
- * 类似于Java9中的List.of - * - * @param ts 对象 - * @param 对象类型 - * @return 不可修改List - * @since 5.4.3 - */ - @SafeVarargs - public static List of(final T... ts) { - if (ArrayUtil.isEmpty(ts)) { - return Collections.emptyList(); - } - return Collections.unmodifiableList(toList(ts)); - } - - /** - * 新建一个CopyOnWriteArrayList - * - * @param 集合元素类型 - * @param collection 集合 - * @return {@link CopyOnWriteArrayList} - */ - public static CopyOnWriteArrayList toCopyOnWriteArrayList(final Collection collection) { - return (null == collection) ? (new CopyOnWriteArrayList<>()) : (new CopyOnWriteArrayList<>(collection)); - } - - /** - * 新建一个ArrayList - * - * @param 集合元素类型 - * @param collection 集合 - * @return ArrayList对象 - */ - public static ArrayList toList(final Collection collection) { - return (ArrayList) list(false, collection); - } - /** * 新建一个ArrayList
* 提供的参数为null时返回空{@link ArrayList} @@ -206,8 +143,8 @@ public class ListUtil { * @return ArrayList对象 * @since 3.1.0 */ - public static ArrayList toList(final Iterable iterable) { - return (ArrayList) list(false, iterable); + public static ArrayList of(final Iterable iterable) { + return (ArrayList) of(false, iterable); } /** @@ -219,8 +156,8 @@ public class ListUtil { * @return ArrayList对象 * @since 3.0.8 */ - public static ArrayList toList(final Iterator iterator) { - return (ArrayList) list(false, iterator); + public static ArrayList of(final Iterator iterator) { + return (ArrayList) of(false, iterator); } /** @@ -232,8 +169,71 @@ public class ListUtil { * @return ArrayList对象 * @since 3.0.8 */ - public static ArrayList toList(final Enumeration enumeration) { - return (ArrayList) list(false, enumeration); + public static ArrayList of(final Enumeration enumeration) { + return (ArrayList) of(false, enumeration); + } + + /** + * 数组转为一个不可变List
+ * 类似于Java9中的List.of + * + * @param ts 对象 + * @param 对象类型 + * @return 不可修改List + */ + @SafeVarargs + public static List view(final T... ts) { + return view(of(ts)); + } + + /** + * 转为一个不可变List
+ * 类似于Java9中的List.of + * + * @param ts 对象 + * @param 对象类型 + * @return 不可修改List,如果提供List为{@code null}或者空,返回{@link Collections#emptyList()} + */ + public static List view(final List ts) { + if (ArrayUtil.isEmpty(ts)) { + return empty(); + } + return Collections.unmodifiableList(ts); + } + + /** + * 获取一个空List,这个空List不可变 + * + * @param 元素类型 + * @return 空的List + * @see Collections#emptyList() + * @since 5.2.6 + */ + public static List empty() { + return Collections.emptyList(); + } + + /** + * 新建一个CopyOnWriteArrayList + * + * @param 集合元素类型 + * @param collection 集合 + * @return {@link CopyOnWriteArrayList} + */ + public static CopyOnWriteArrayList ofCopyOnWrite(final Collection collection) { + return (null == collection) ? (new CopyOnWriteArrayList<>()) : (new CopyOnWriteArrayList<>(collection)); + } + + /** + * 新建一个CopyOnWriteArrayList + * + * @param 集合元素类型 + * @param ts 集合 + * @return {@link CopyOnWriteArrayList} + */ + @SafeVarargs + public static CopyOnWriteArrayList ofCopyOnWrite(final T... ts) { + return (null == ts) ? (new CopyOnWriteArrayList<>()) : (new CopyOnWriteArrayList<>(ts)); } /** @@ -255,7 +255,7 @@ public class ListUtil { // 每页条目数大于总数直接返回所有 if (resultSize <= pageSize) { if (pageNo < (PageUtil.getFirstPageNo() + 1)) { - return unmodifiable(list); + return view(list); } else { // 越界直接返回空 return new ArrayList<>(0); @@ -500,33 +500,6 @@ public class ListUtil { return CollUtil.indexOfAll(list, matcher); } - /** - * 将对应List转换为不可修改的List - * - * @param list List - * @param 元素类型 - * @return 不可修改List - * @since 5.2.6 - */ - public static List unmodifiable(final List list) { - if (null == list) { - return null; - } - return Collections.unmodifiableList(list); - } - - /** - * 获取一个空List,这个空List不可变 - * - * @param 元素类型 - * @return 空的List - * @see Collections#emptyList() - * @since 5.2.6 - */ - public static List empty() { - return Collections.emptyList(); - } - /** * 通过传入分区长度,将指定列表分区为不同的块,每块区域的长度相同(最后一块可能小于长度)
* 分区是在原List的基础上进行的,返回的分区是不可变的抽象列表,原列表元素变更,分区中元素也会变更。 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java index ff9084b1a..bcddcf067 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java @@ -1,11 +1,14 @@ package cn.hutool.core.collection; +import cn.hutool.core.util.ArrayUtil; + import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; +import java.util.Set; /** * 集合中的{@link java.util.Set}相关方法封装 @@ -14,6 +17,18 @@ import java.util.LinkedHashSet; */ public class SetUtil { + /** + * 新建一个List
+ * 如果提供的初始化数组为空,新建默认初始长度的List + * + * @param 集合元素类型 + * @param isLinked 是否为链表 + * @return List对象 + */ + public static HashSet of(final boolean isLinked) { + return _of(isLinked, null); + } + /** * 新建一个HashSet * @@ -22,8 +37,8 @@ public class SetUtil { * @return HashSet对象 */ @SafeVarargs - public static HashSet newHashSet(final T... ts) { - return set(false, ts); + public static HashSet of(final T... ts) { + return _of(false, ts); } /** @@ -35,50 +50,39 @@ public class SetUtil { * @since 4.1.10 */ @SafeVarargs - public static LinkedHashSet newLinkedHashSet(final T... ts) { - return (LinkedHashSet) set(true, ts); + public static LinkedHashSet ofLinked(final T... ts) { + return (LinkedHashSet) _of(true, ts); } /** * 新建一个HashSet * * @param 集合元素类型 - * @param isSorted 是否有序,有序返回 {@link LinkedHashSet},否则返回 {@link HashSet} - * @param ts 元素数组 + * @param iterable 集合 * @return HashSet对象 */ - @SafeVarargs - public static HashSet set(final boolean isSorted, final T... ts) { - if (null == ts) { - return isSorted ? new LinkedHashSet<>() : new HashSet<>(); + public static HashSet of(final Iterable iterable) { + return of(false, iterable); + } + + /** + * 新建一个HashSet
+ * 提供的参数为null时返回空{@link HashSet} + * + * @param 集合元素类型 + * @param isLinked 是否新建LinkedList + * @param iterable {@link Iterable} + * @return HashSet对象 + */ + public static HashSet of(final boolean isLinked, final Iterable iterable) { + if (null == iterable) { + return of(isLinked); } - final int initialCapacity = Math.max((int) (ts.length / .75f) + 1, 16); - final HashSet set = isSorted ? new LinkedHashSet<>(initialCapacity) : new HashSet<>(initialCapacity); - Collections.addAll(set, ts); - return set; - } - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param collection 集合 - * @return HashSet对象 - */ - public static HashSet newHashSet(final Collection collection) { - return newHashSet(false, collection); - } - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param isSorted 是否有序,有序返回 {@link LinkedHashSet},否则返回{@link HashSet} - * @param collection 集合,用于初始化Set - * @return HashSet对象 - */ - public static HashSet newHashSet(final boolean isSorted, final Collection collection) { - return isSorted ? new LinkedHashSet<>(collection) : new HashSet<>(collection); + if (iterable instanceof Collection) { + final Collection collection = (Collection) iterable; + return isLinked ? new LinkedHashSet<>(collection) : new HashSet<>(collection); + } + return of(isLinked, iterable.iterator()); } /** @@ -90,9 +94,9 @@ public class SetUtil { * @return HashSet对象 * @since 3.0.8 */ - public static HashSet newHashSet(final boolean isSorted, final Iterator iter) { + public static HashSet of(final boolean isSorted, final Iterator iter) { if (null == iter) { - return set(isSorted, (T[]) null); + return _of(isSorted, null); } final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); while (iter.hasNext()) { @@ -105,19 +109,75 @@ public class SetUtil { * 新建一个HashSet * * @param 集合元素类型 - * @param isSorted 是否有序,有序返回 {@link LinkedHashSet},否则返回{@link HashSet} + * @param isLinked 是否有序,有序返回 {@link LinkedHashSet},否则返回{@link HashSet} * @param enumeration {@link Enumeration} * @return HashSet对象 * @since 3.0.8 */ - public static HashSet newHashSet(final boolean isSorted, final Enumeration enumeration) { + public static HashSet of(final boolean isLinked, final Enumeration enumeration) { if (null == enumeration) { - return set(isSorted, (T[]) null); + return _of(isLinked, null); } - final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); + final HashSet set = isLinked ? new LinkedHashSet<>() : new HashSet<>(); while (enumeration.hasMoreElements()) { set.add(enumeration.nextElement()); } return set; } + + /** + * 数组转为一个不可变List
+ * 类似于Java9中的List.of + * + * @param ts 对象 + * @param 对象类型 + * @return 不可修改List + */ + @SafeVarargs + public static Set view(final T... ts) { + return view(of(ts)); + } + + /** + * 转为一个不可变Set + * + * @param ts 对象 + * @param 对象类型 + * @return 不可修改List,如果提供List为{@code null}或者空,返回{@link Collections#emptySet()} + */ + public static Set view(final Set ts) { + if (ArrayUtil.isEmpty(ts)) { + return empty(); + } + return Collections.unmodifiableSet(ts); + } + + /** + * 获取一个空Set,这个空Set不可变 + * + * @param 元素类型 + * @return 空的List + * @see Collections#emptySet() + */ + public static Set empty() { + return Collections.emptySet(); + } + + /** + * 新建一个HashSet + * + * @param 集合元素类型 + * @param isLinked 是否有序,有序返回 {@link LinkedHashSet},否则返回 {@link HashSet} + * @param ts 元素数组 + * @return HashSet对象 + */ + private static HashSet _of(final boolean isLinked, final T[] ts) { + if (ArrayUtil.isEmpty(ts)) { + return isLinked ? new LinkedHashSet<>() : new HashSet<>(); + } + final int initialCapacity = Math.max((int) (ts.length / .75f) + 1, 16); + final HashSet set = isLinked ? new LinkedHashSet<>(initialCapacity) : new HashSet<>(initialCapacity); + Collections.addAll(set, ts); + return set; + } } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java index 328e8d6c4..389a2fff3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java @@ -44,7 +44,7 @@ public class CopiedIter implements IterableIter, Serializable { * @param iterator 被复制的Iterator */ public CopiedIter(final Iterator iterator) { - final List eleList = ListUtil.toList(iterator); + final List eleList = ListUtil.of(iterator); this.listIterator = eleList.iterator(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java index 233f1766f..1caf12cad 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java @@ -519,7 +519,7 @@ public class IterUtil { * @since 4.0.6 */ public static List toList(final Iterator iter) { - return ListUtil.toList(iter); + return ListUtil.of(iter); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index 91c82668c..116a763ad 100755 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -1849,8 +1849,8 @@ public class DateUtil extends CalendarUtil { * @since 5.7.21 */ public static List rangeContains(final DateRange start, final DateRange end) { - final List startDateTimes = ListUtil.toList((Iterable) start); - final List endDateTimes = ListUtil.toList((Iterable) end); + final List startDateTimes = ListUtil.of((Iterable) start); + final List endDateTimes = ListUtil.of((Iterable) end); return startDateTimes.stream().filter(endDateTimes::contains).collect(Collectors.toList()); } @@ -1864,8 +1864,8 @@ public class DateUtil extends CalendarUtil { * @since 5.7.21 */ public static List rangeNotContains(final DateRange start, final DateRange end) { - final List startDateTimes = ListUtil.toList((Iterable) start); - final List endDateTimes = ListUtil.toList((Iterable) end); + final List startDateTimes = ListUtil.of((Iterable) start); + final List endDateTimes = ListUtil.of((Iterable) end); return endDateTimes.stream().filter(item -> !startDateTimes.contains(item)).collect(Collectors.toList()); } @@ -1916,7 +1916,7 @@ public class DateUtil extends CalendarUtil { * @return {@link DateRange} */ public static List rangeToList(final Date start, final Date end, final DateField unit) { - return ListUtil.toList((Iterable) range(start, end, unit)); + return ListUtil.of((Iterable) range(start, end, unit)); } /** @@ -1930,7 +1930,7 @@ public class DateUtil extends CalendarUtil { * @since 5.7.16 */ public static List rangeToList(final Date start, final Date end, final DateField unit, final int step) { - return ListUtil.toList((Iterable) new DateRange(start, end, unit, step)); + return ListUtil.of((Iterable) new DateRange(start, end, unit, step)); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java index 6d69365ce..90309d36e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java @@ -32,7 +32,7 @@ public class MultiResource implements Resource, Iterable, Iterator, Iterator)resources; }else { - this.resources = ListUtil.toList(resources); + this.resources = ListUtil.of(resources); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java index abcd64e7c..66e28f3a2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java @@ -35,7 +35,7 @@ public class WatcherChain implements Watcher, Chain{ * @param watchers 观察者列表 */ public WatcherChain(final Watcher... watchers) { - chain = ListUtil.toList(watchers); + chain = ListUtil.of(watchers); } @Override diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java b/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java index 076562520..354c93188 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java @@ -64,7 +64,7 @@ public class Tuple extends CloneSupport implements Iterable, Seri * @since 5.6.6 */ public final List toList() { - return ListUtil.toList(this.members); + return ListUtil.of(this.members); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java index 416425636..fd9efa55e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java @@ -290,7 +290,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * @param withoutNames 不需要去除的字段名 */ public void removeEqual(final T dict, final String... withoutNames) { - final HashSet withoutSet = SetUtil.newHashSet(withoutNames); + final HashSet withoutSet = SetUtil.of(withoutNames); for (final Map.Entry entry : dict.entrySet()) { if (withoutSet.contains(entry.getKey())) { continue; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index 4c86e14a6..748e96814 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -409,7 +409,7 @@ public class MapUtil { key = entry.getKey(); valueList = resultMap.get(key); if (null == valueList) { - valueList = ListUtil.toList(entry.getValue()); + valueList = ListUtil.of(entry.getValue()); resultMap.put(key, valueList); } else { valueList.add(entry.getValue()); @@ -464,7 +464,7 @@ public class MapUtil { List vList; int vListSize; for (final Entry> entry : listMap.entrySet()) { - vList = ListUtil.toList(entry.getValue()); + vList = ListUtil.of(entry.getValue()); vListSize = vList.size(); if (index < vListSize) { map.put(entry.getKey(), vList.get(index)); diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java b/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java index 26d51c0b8..b6f10f31c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java @@ -56,8 +56,8 @@ public class TableMap implements Map, Iterable>, Ser * @param values 值列表 */ public TableMap(final K[] keys, final V[] values) { - this.keys = ListUtil.toList(keys); - this.values = ListUtil.toList(values); + this.keys = ListUtil.of(keys); + this.values = ListUtil.of(values); } @Override diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java index f9b5c19c9..1daf470f2 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java @@ -67,7 +67,7 @@ public class Ipv4Util { final String[] param = StrUtil.splitToArray(ipRange, IP_MASK_SPLIT_MARK); return list(param[0], Integer.parseInt(param[1]), isAll); } else { - return ListUtil.toList(ipRange); + return ListUtil.of(ipRange); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java index 731192367..b617e8acf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java @@ -90,7 +90,7 @@ public class MethodUtil { * @return 过滤后的方法列表 */ public static Method[] getPublicMethods(final Class clazz, final Method... excludeMethods) { - final HashSet excludeMethodSet = SetUtil.newHashSet(excludeMethods); + final HashSet excludeMethodSet = SetUtil.of(excludeMethods); return getPublicMethods(clazz, method -> false == excludeMethodSet.contains(method)); } @@ -102,7 +102,7 @@ public class MethodUtil { * @return 过滤后的方法数组 */ public static Method[] getPublicMethods(final Class clazz, final String... excludeMethodNames) { - final HashSet excludeMethodNameSet = SetUtil.newHashSet(excludeMethodNames); + final HashSet excludeMethodNameSet = SetUtil.of(excludeMethodNames); return getPublicMethods(clazz, method -> false == excludeMethodNameSet.contains(method.getName())); } diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java index 53c3d28c3..1012f0309 100755 --- a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java @@ -45,7 +45,7 @@ public class ReUtil { /** * 正则中需要被转义的关键字 */ - public final static Set RE_KEYS = SetUtil.newHashSet('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'); + public final static Set RE_KEYS = SetUtil.of('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'); /** * 获得匹配的字符串,获得正则中分组0的内容 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java index 9c649f1c1..c924b7741 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java @@ -11,7 +11,7 @@ import java.util.Set; */ public class StopChar { /** 不需要处理的词,如标点符号、空格等 */ - public static final Set STOP_WORD = SetUtil.newHashSet(' ', '\'', '、', '。', // + public static final Set STOP_WORD = SetUtil.of(' ', '\'', '、', '。', // '·', 'ˉ', 'ˇ', '々', '—', '~', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', // '』', '〖', '〗', '【', '】', '±', '+', '-', '×', '÷', '∧', '∨', '∑', '∏', '∪', '∩', '∈', '√', '⊥', '⊙', '∫', // '∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∶', '∵', '∴', '∷', '♂', '♀', '°', '′', '〃', // diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java index eb913fec2..157c26e44 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java @@ -86,7 +86,7 @@ public class WordTree extends HashMap { * @return this */ public WordTree addWords(final String... words) { - for (final String word : SetUtil.newHashSet(words)) { + for (final String word : SetUtil.of(words)) { addWord(word); } return this; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java index 7d8c10c49..5ebc60786 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java @@ -1288,7 +1288,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @since 3.0.9 */ public static T[] toArray(final Iterator iterator, final Class componentType) { - return toArray(ListUtil.toList(iterator), componentType); + return toArray(ListUtil.of(iterator), componentType); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java index a43e90a7d..de527870c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java @@ -15,7 +15,7 @@ import java.util.Set; public class BooleanUtil { /** 表示为真的字符串 */ - private static final Set TRUE_SET = SetUtil.newHashSet("true", "yes", "y", "t", "ok", "1", "on", "是", "对", "真", "對", "√"); + private static final Set TRUE_SET = SetUtil.of("true", "yes", "y", "t", "ok", "1", "on", "是", "对", "真", "對", "√"); /** * 取相反值 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java index 7cc6efb88..77453b431 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java @@ -445,7 +445,7 @@ public class RandomUtil { */ public static List randomEleList(final List source, final int count) { if (count >= source.size()) { - return ListUtil.toList(source); + return ListUtil.of(source); } final int[] randomList = ArrayUtil.sub(randomInts(source.size()), 0, count); final List result = new ArrayList<>(); diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java index f45959ffb..953b3aa51 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java @@ -102,6 +102,6 @@ public class ServiceLoaderUtil { * @since 5.4.2 */ public static List loadList(final Class clazz, final ClassLoader loader) { - return ListUtil.list(false, load(clazz, loader)); + return ListUtil.of(false, load(clazz, loader)); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java index ce6f00df1..a2c97dc37 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java @@ -1109,7 +1109,7 @@ public class XmlUtil { if (value instanceof List) { ((List) value).add(newValue); } else { - result.put(childEle.getNodeName(), ListUtil.toList(value, newValue)); + result.put(childEle.getNodeName(), ListUtil.of(value, newValue)); } } else { result.put(childEle.getNodeName(), newValue); diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java index 23e0bfd58..5814afd64 100755 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java @@ -285,7 +285,7 @@ public class BeanUtilTest { @Test public void getPropertyDescriptorsTest() { - final HashSet set = SetUtil.newHashSet(); + final HashSet set = SetUtil.of(); final PropertyDescriptor[] propertyDescriptors = BeanUtil.getPropertyDescriptors(SubPerson.class); for (final PropertyDescriptor propertyDescriptor : propertyDescriptors) { set.add(propertyDescriptor.getName()); @@ -326,7 +326,7 @@ public class BeanUtilTest { student.setAge(125); student.setNo(8848L); - final List studentList = ListUtil.of(student, student2); + final List studentList = ListUtil.view(student, student2); for (int i=0;i<5000;i++){ new Thread(()->{ @@ -633,7 +633,7 @@ public class BeanUtilTest { student.setAge(125); student.setNo(8848L); - final List studentList = ListUtil.of(student, student2); + final List studentList = ListUtil.view(student, student2); final List people = BeanUtil.copyToList(studentList, Person.class); Assert.assertEquals(studentList.size(), people.size()); @@ -759,7 +759,7 @@ public class BeanUtilTest { @Test public void issueI41WKPTest(){ - final Test1 t1 = new Test1().setStrList(ListUtil.toList("list")); + final Test1 t1 = new Test1().setStrList(ListUtil.of("list")); final Test2 t2_hu = new Test2(); BeanUtil.copyProperties(t1, t2_hu, CopyOptions.create().setIgnoreError(true)); Assert.assertNull(t2_hu.getStrList()); diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java index 1acf39503..5c1eed21e 100755 --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java @@ -35,22 +35,22 @@ public class CollUtilTest { @Test public void testPredicateContains() { - final ArrayList list = ListUtil.toList("bbbbb", "aaaaa", "ccccc"); + final ArrayList list = ListUtil.of("bbbbb", "aaaaa", "ccccc"); Assert.assertTrue(CollUtil.contains(list, s -> s.startsWith("a"))); Assert.assertFalse(CollUtil.contains(list, s -> s.startsWith("d"))); } @Test public void testRemoveWithAddIf() { - ArrayList list = ListUtil.toList(1, 2, 3); - final ArrayList exceptRemovedList = ListUtil.toList(2, 3); - final ArrayList exceptResultList = ListUtil.toList(1); + ArrayList list = ListUtil.of(1, 2, 3); + final ArrayList exceptRemovedList = ListUtil.of(2, 3); + final ArrayList exceptResultList = ListUtil.of(1); List resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele); Assert.assertEquals(list, exceptRemovedList); Assert.assertEquals(resultList, exceptResultList); - list = ListUtil.toList(1, 2, 3); + list = ListUtil.of(1, 2, 3); resultList = new ArrayList<>(); CollUtil.removeWithAddIf(list, resultList, ele -> 1 == ele); Assert.assertEquals(list, exceptRemovedList); @@ -59,27 +59,27 @@ public class CollUtilTest { @Test public void testPadLeft() { - List srcList = ListUtil.toList(); - List answerList = ListUtil.toList("a", "b"); + List srcList = ListUtil.of(); + List answerList = ListUtil.of("a", "b"); CollUtil.padLeft(srcList, 1, "b"); CollUtil.padLeft(srcList, 2, "a"); Assert.assertEquals(srcList, answerList); - srcList = ListUtil.toList("a", "b"); - answerList = ListUtil.toList("a", "b"); + srcList = ListUtil.of("a", "b"); + answerList = ListUtil.of("a", "b"); CollUtil.padLeft(srcList, 2, "a"); Assert.assertEquals(srcList, answerList); - srcList = ListUtil.toList("c"); - answerList = ListUtil.toList("a", "a", "c"); + srcList = ListUtil.of("c"); + answerList = ListUtil.of("a", "a", "c"); CollUtil.padLeft(srcList, 3, "a"); Assert.assertEquals(srcList, answerList); } @Test public void testPadRight() { - final List srcList = ListUtil.toList("a"); - final List answerList = ListUtil.toList("a", "b", "b", "b", "b"); + final List srcList = ListUtil.of("a"); + final List answerList = ListUtil.of("a", "b", "b", "b", "b"); CollUtil.padRight(srcList, 5, "b"); Assert.assertEquals(srcList, answerList); } @@ -91,7 +91,7 @@ public class CollUtilTest { @Test public void newHashSetTest() { - final Set set = SetUtil.newHashSet((String[]) null); + final Set set = SetUtil.of((String[]) null); Assert.assertNotNull(set); } @@ -114,8 +114,8 @@ public class CollUtilTest { @Test public void unionTest() { - final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = ListUtil.toList("a", "b", "b", "b", "c", "d"); + final ArrayList list1 = ListUtil.of("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.of("a", "b", "b", "b", "c", "d"); final Collection union = CollUtil.union(list1, list2); @@ -124,8 +124,8 @@ public class CollUtilTest { @Test public void intersectionTest() { - final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = ListUtil.toList("a", "b", "b", "b", "c", "d"); + final ArrayList list1 = ListUtil.of("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.of("a", "b", "b", "b", "c", "d"); final Collection intersection = CollUtil.intersection(list1, list2); Assert.assertEquals(2, CollUtil.count(intersection, "b"::equals)); @@ -133,12 +133,12 @@ public class CollUtilTest { @Test public void intersectionDistinctTest() { - final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = ListUtil.toList("a", "b", "b", "b", "c", "d"); - final ArrayList list3 = ListUtil.toList(); + final ArrayList list1 = ListUtil.of("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.of("a", "b", "b", "b", "c", "d"); + final ArrayList list3 = ListUtil.of(); final Collection intersectionDistinct = CollUtil.intersectionDistinct(list1, list2); - Assert.assertEquals(SetUtil.newLinkedHashSet("a", "b", "c", "d"), intersectionDistinct); + Assert.assertEquals(SetUtil.ofLinked("a", "b", "c", "d"), intersectionDistinct); final Collection intersectionDistinct2 = CollUtil.intersectionDistinct(list1, list2, list3); Assert.assertTrue(intersectionDistinct2.isEmpty()); @@ -146,8 +146,8 @@ public class CollUtilTest { @Test public void disjunctionTest() { - final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = ListUtil.toList("a", "b", "b", "b", "c", "d", "x2"); + final ArrayList list1 = ListUtil.of("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.of("a", "b", "b", "b", "c", "d", "x2"); final Collection disjunction = CollUtil.disjunction(list1, list2); Assert.assertTrue(disjunction.contains("b")); @@ -163,8 +163,8 @@ public class CollUtilTest { @Test public void disjunctionTest2() { // 任意一个集合为空,差集为另一个集合 - final ArrayList list1 = ListUtil.toList(); - final ArrayList list2 = ListUtil.toList("a", "b", "b", "b", "c", "d", "x2"); + final ArrayList list1 = ListUtil.of(); + final ArrayList list2 = ListUtil.of("a", "b", "b", "b", "c", "d", "x2"); final Collection disjunction = CollUtil.disjunction(list1, list2); Assert.assertEquals(list2, disjunction); @@ -175,8 +175,8 @@ public class CollUtilTest { @Test public void disjunctionTest3() { // 无交集下返回共同的元素 - final ArrayList list1 = ListUtil.toList("1", "2", "3"); - final ArrayList list2 = ListUtil.toList("a", "b", "c"); + final ArrayList list1 = ListUtil.of("1", "2", "3"); + final ArrayList list2 = ListUtil.of("a", "b", "c"); final Collection disjunction = CollUtil.disjunction(list1, list2); Assert.assertTrue(disjunction.contains("1")); @@ -196,8 +196,8 @@ public class CollUtilTest { @Test public void subtractTest() { - final List list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); - final List list2 = ListUtil.toList("a", "b", "b", "b", "c", "d", "x2"); + final List list1 = ListUtil.of("a", "b", "b", "c", "d", "x"); + final List list2 = ListUtil.of("a", "b", "b", "b", "c", "d", "x2"); final Collection subtract = CollUtil.subtract(list1, list2); Assert.assertEquals(1, subtract.size()); Assert.assertEquals("x", subtract.iterator().next()); @@ -236,7 +236,7 @@ public class CollUtilTest { map2.put("c", "值3"); // ---------------------------------------------------------------------------------------- - final ArrayList> list = ListUtil.toList(map1, map2); + final ArrayList> list = ListUtil.of(map1, map2); final Map> map = CollUtil.toListMap(list); Assert.assertEquals("值1", map.get("a").get(0)); Assert.assertEquals("值2", map.get("a").get(1)); @@ -251,7 +251,7 @@ public class CollUtilTest { public void getFieldValuesTest() { final Dict v1 = Dict.create().set("id", 12).set("name", "张三").set("age", 23); final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四"); - final ArrayList list = ListUtil.toList(v1, v2); + final ArrayList list = ListUtil.of(v1, v2); final List fieldValues = CollUtil.getFieldValues(list, "name"); Assert.assertEquals("张三", fieldValues.get(0)); @@ -260,7 +260,7 @@ public class CollUtilTest { @Test public void splitTest() { - final ArrayList list = ListUtil.toList(1, 2, 3, 4, 5, 6, 7, 8, 9); + final ArrayList list = ListUtil.of(1, 2, 3, 4, 5, 6, 7, 8, 9); final List> split = CollUtil.split(list, 3); Assert.assertEquals(3, split.size()); Assert.assertEquals(3, split.get(0).size()); @@ -285,35 +285,35 @@ public class CollUtilTest { @Test public void filterTest() { - final ArrayList list = ListUtil.toList("a", "b", "c"); + final ArrayList list = ListUtil.of("a", "b", "c"); final Collection filtered = CollUtil.edit(list, t -> t + 1); - Assert.assertEquals(ListUtil.toList("a1", "b1", "c1"), filtered); + Assert.assertEquals(ListUtil.of("a1", "b1", "c1"), filtered); } @Test public void filterTest2() { - final ArrayList list = ListUtil.toList("a", "b", "c"); + final ArrayList list = ListUtil.of("a", "b", "c"); final ArrayList filtered = CollUtil.filter(list, t -> false == "a".equals(t)); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(ListUtil.toList("b", "c"), filtered); + Assert.assertEquals(ListUtil.of("b", "c"), filtered); } @Test public void filterSetTest() { - final Set set = SetUtil.newLinkedHashSet("a", "b", "", " ", "c"); + final Set set = SetUtil.ofLinked("a", "b", "", " ", "c"); final Set filtered = CollUtil.filter(set, StrUtil::isNotBlank); - Assert.assertEquals(SetUtil.newLinkedHashSet("a", "b", "c"), filtered); + Assert.assertEquals(SetUtil.ofLinked("a", "b", "c"), filtered); } @Test public void filterRemoveTest() { - final ArrayList list = ListUtil.toList("a", "b", "c"); + final ArrayList list = ListUtil.of("a", "b", "c"); final List removed = new ArrayList<>(); final ArrayList filtered = CollUtil.filter(list, t -> { @@ -329,45 +329,45 @@ public class CollUtilTest { // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(ListUtil.toList("b", "c"), filtered); + Assert.assertEquals(ListUtil.of("b", "c"), filtered); } @Test public void removeNullTest() { - final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.of("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeNull(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(ListUtil.toList("a", "b", "c", "", " "), filtered); + Assert.assertEquals(ListUtil.of("a", "b", "c", "", " "), filtered); } @Test public void removeEmptyTest() { - final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.of("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeEmpty(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(ListUtil.toList("a", "b", "c", " "), filtered); + Assert.assertEquals(ListUtil.of("a", "b", "c", " "), filtered); } @Test public void removeBlankTest() { - final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.of("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeBlank(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(ListUtil.toList("a", "b", "c"), filtered); + Assert.assertEquals(ListUtil.of("a", "b", "c"), filtered); } @Test public void groupTest() { - final List list = ListUtil.toList("1", "2", "3", "4", "5", "6"); + final List list = ListUtil.of("1", "2", "3", "4", "5", "6"); final List> group = CollUtil.group(list, null); Assert.assertTrue(group.size() > 0); @@ -375,13 +375,13 @@ public class CollUtilTest { // 按照奇数偶数分类 return Integer.parseInt(t) % 2; }); - Assert.assertEquals(ListUtil.toList("2", "4", "6"), group2.get(0)); - Assert.assertEquals(ListUtil.toList("1", "3", "5"), group2.get(1)); + Assert.assertEquals(ListUtil.of("2", "4", "6"), group2.get(0)); + Assert.assertEquals(ListUtil.of("1", "3", "5"), group2.get(1)); } @Test public void groupByFieldTest() { - final List list = ListUtil.toList(new TestBean("张三", 12), new TestBean("李四", 13), new TestBean("王五", 12)); + final List list = ListUtil.of(new TestBean("张三", 12), new TestBean("李四", 13), new TestBean("王五", 12)); final List> groupByField = CollUtil.groupByField(list, "age"); Assert.assertEquals("张三", groupByField.get(0).get(0).getName()); Assert.assertEquals("王五", groupByField.get(0).get(1).getName()); @@ -391,7 +391,7 @@ public class CollUtilTest { @Test public void sortByPropertyTest() { - final List list = ListUtil.toList( + final List list = ListUtil.of( new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // new TestBean("李四", 13, DateUtil.parse("2018-03-01")), // new TestBean("王五", 12, DateUtil.parse("2018-04-01"))// @@ -405,7 +405,7 @@ public class CollUtilTest { @Test public void sortByPropertyTest2() { - final List list = ListUtil.toList( + final List list = ListUtil.of( new TestBean("张三", 0, DateUtil.parse("2018-05-01")), // new TestBean("李四", -12, DateUtil.parse("2018-03-01")), // new TestBean("王五", 23, DateUtil.parse("2018-04-01"))// @@ -419,7 +419,7 @@ public class CollUtilTest { @Test public void fieldValueMapTest() { - final List list = ListUtil.toList(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // + final List list = ListUtil.of(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // new TestBean("李四", 13, DateUtil.parse("2018-03-01")), // new TestBean("王五", 12, DateUtil.parse("2018-04-01"))// ); @@ -432,7 +432,7 @@ public class CollUtilTest { @Test public void fieldValueAsMapTest() { - final List list = ListUtil.toList(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // + final List list = ListUtil.of(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // new TestBean("李四", 13, DateUtil.parse("2018-03-01")), // new TestBean("王五", 14, DateUtil.parse("2018-04-01"))// ); @@ -470,8 +470,8 @@ public class CollUtilTest { @Test public void listTest() { - final List list1 = ListUtil.list(false); - final List list2 = ListUtil.list(true); + final List list1 = ListUtil.of(false); + final List list2 = ListUtil.of(true); Assert.assertTrue(list1 instanceof ArrayList); Assert.assertTrue(list2 instanceof LinkedList); @@ -479,8 +479,8 @@ public class CollUtilTest { @Test public void listTest2() { - final List list1 = ListUtil.list(false, "a", "b", "c"); - final List list2 = ListUtil.list(true, "a", "b", "c"); + final List list1 = ListUtil.of( "a", "b", "c"); + final List list2 = ListUtil.ofLinked( "a", "b", "c"); Assert.assertEquals("[a, b, c]", list1.toString()); Assert.assertEquals("[a, b, c]", list2.toString()); } @@ -492,15 +492,15 @@ public class CollUtilTest { set.add("b"); set.add("c"); - final List list1 = ListUtil.list(false, set); - final List list2 = ListUtil.list(true, set); + final List list1 = ListUtil.of(false, set); + final List list2 = ListUtil.of(true, set); Assert.assertEquals("[a, b, c]", list1.toString()); Assert.assertEquals("[a, b, c]", list2.toString()); } @Test public void getTest() { - final HashSet set = SetUtil.set(true, "A", "B", "C", "D"); + final HashSet set = SetUtil.ofLinked("A", "B", "C", "D"); String str = CollUtil.get(set, 2); Assert.assertEquals("C", str); @@ -701,43 +701,43 @@ public class CollUtilTest { @Test public void sortPageAllTest() { - final List list = ListUtil.toList(1, 2, 3, 4, 5, 6, 7, 8, 9); + final List list = ListUtil.of(1, 2, 3, 4, 5, 6, 7, 8, 9); final List sortPageAll = CollUtil.sortPageAll(1, 5, Comparator.reverseOrder(), list); - Assert.assertEquals(ListUtil.toList(4, 3, 2, 1), sortPageAll); + Assert.assertEquals(ListUtil.of(4, 3, 2, 1), sortPageAll); } @Test public void containsAnyTest() { - final ArrayList list1 = ListUtil.toList(1, 2, 3, 4, 5); - final ArrayList list2 = ListUtil.toList(5, 3, 1, 9, 11); + final ArrayList list1 = ListUtil.of(1, 2, 3, 4, 5); + final ArrayList list2 = ListUtil.of(5, 3, 1, 9, 11); Assert.assertTrue(CollUtil.containsAny(list1, list2)); } @Test public void containsAllTest() { - final ArrayList list1 = ListUtil.toList(1, 2, 3, 4, 5); - final ArrayList list2 = ListUtil.toList(5, 3, 1); + final ArrayList list1 = ListUtil.of(1, 2, 3, 4, 5); + final ArrayList list2 = ListUtil.of(5, 3, 1); Assert.assertTrue(CollUtil.containsAll(list1, list2)); - final ArrayList list3 = ListUtil.toList(1); - final ArrayList list4 = ListUtil.toList(); + final ArrayList list3 = ListUtil.of(1); + final ArrayList list4 = ListUtil.of(); Assert.assertTrue(CollUtil.containsAll(list3, list4)); } @Test public void getLastTest() { // 测试:空数组返回null而不是报错 - final List test = ListUtil.toList(); + final List test = ListUtil.of(); final String last = CollUtil.getLast(test); Assert.assertNull(last); } @Test public void zipTest() { - final Collection keys = ListUtil.toList("a", "b", "c", "d"); - final Collection values = ListUtil.toList(1, 2, 3, 4); + final Collection keys = ListUtil.of("a", "b", "c", "d"); + final Collection values = ListUtil.of(1, 2, 3, 4); final Map map = CollUtil.zip(keys, values); @@ -751,7 +751,7 @@ public class CollUtilTest { @Test public void toMapTest() { - final Collection keys = ListUtil.toList("a", "b", "c", "d"); + final Collection keys = ListUtil.of("a", "b", "c", "d"); final Map map = CollUtil.toMap(keys, new HashMap<>(), (value) -> "key" + value); Assert.assertEquals("a", map.get("keya")); Assert.assertEquals("b", map.get("keyb")); @@ -778,7 +778,7 @@ public class CollUtilTest { @Test public void countMapTest() { - final ArrayList list = ListUtil.toList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.of("a", "b", "c", "c", "a", "b", "d"); final Map countMap = CollUtil.countMap(list); Assert.assertEquals(Integer.valueOf(2), countMap.get("a")); @@ -789,7 +789,7 @@ public class CollUtilTest { @Test public void indexOfTest() { - final ArrayList list = ListUtil.toList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.of("a", "b", "c", "c", "a", "b", "d"); final int i = CollUtil.indexOf(list, (str) -> str.charAt(0) == 'c'); Assert.assertEquals(2, i); } @@ -797,14 +797,14 @@ public class CollUtilTest { @Test public void lastIndexOfTest() { // List有优化 - final ArrayList list = ListUtil.toList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.of("a", "b", "c", "c", "a", "b", "d"); final int i = CollUtil.lastIndexOf(list, (str) -> str.charAt(0) == 'c'); Assert.assertEquals(3, i); } @Test public void lastIndexOfSetTest() { - final Set list = SetUtil.set(true, "a", "b", "c", "c", "a", "b", "d"); + final Set list = SetUtil.ofLinked("a", "b", "c", "c", "a", "b", "d"); // 去重后c排第三 final int i = CollUtil.lastIndexOf(list, (str) -> str.charAt(0) == 'c'); Assert.assertEquals(2, i); @@ -812,7 +812,7 @@ public class CollUtilTest { @Test public void pageTest() { - final List objects = ListUtil.toList(); + final List objects = ListUtil.of(); for (int i = 0; i < 10; i++) { objects.add(Dict.create().set("name", "姓名:" + i)); } @@ -832,7 +832,7 @@ public class CollUtilTest { @Test public void sortComparableTest() { - final List of = ListUtil.toList("a", "c", "b"); + final List of = ListUtil.of("a", "c", "b"); final List sort = CollUtil.sort(of, new ComparableComparator<>()); Assert.assertEquals("a,b,c", CollUtil.join(sort, ",")); } @@ -880,8 +880,8 @@ public class CollUtilTest { @Test public void distinctTest(){ - final ArrayList distinct = CollUtil.distinct(ListUtil.of(5, 3, 10, 9, 0, 5, 10, 9)); - Assert.assertEquals(ListUtil.of(5, 3, 10, 9, 0), distinct); + final ArrayList distinct = CollUtil.distinct(ListUtil.view(5, 3, 10, 9, 0, 5, 10, 9)); + Assert.assertEquals(ListUtil.view(5, 3, 10, 9, 0), distinct); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java index cb1cf162e..da5c3da35 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java @@ -17,20 +17,20 @@ import java.util.Map; /** * {@link IterUtil} 单元测试 - * @author looly * + * @author looly */ public class IterUtilTest { @Test - public void getFirstNonNullTest(){ - final ArrayList strings = ListUtil.toList(null, null, "123", "456", null); + public void getFirstNonNullTest() { + final ArrayList strings = ListUtil.of(null, null, "123", "456", null); Assert.assertEquals("123", IterUtil.getFirstNoneNull(strings)); } @Test public void fieldValueMapTest() { - final ArrayList carList = ListUtil.toList(new Car("123", "大众"), new Car("345", "奔驰"), new Car("567", "路虎")); + final ArrayList carList = ListUtil.of(new Car("123", "大众"), new Car("345", "奔驰"), new Car("567", "路虎")); final Map carNameMap = IterUtil.fieldValueMap(carList.iterator(), "carNumber"); Assert.assertEquals("大众", carNameMap.get("123").getCarName()); @@ -40,30 +40,30 @@ public class IterUtilTest { @Test public void joinTest() { - final ArrayList list = ListUtil.toList("1", "2", "3", "4"); + final ArrayList list = ListUtil.of("1", "2", "3", "4"); final String join = IterUtil.join(list.iterator(), ":"); Assert.assertEquals("1:2:3:4", join); - final ArrayList list1 = ListUtil.toList(1, 2, 3, 4); + final ArrayList list1 = ListUtil.of(1, 2, 3, 4); final String join1 = IterUtil.join(list1.iterator(), ":"); Assert.assertEquals("1:2:3:4", join1); // 包装每个节点 - final ArrayList list2 = ListUtil.toList("1", "2", "3", "4"); + final ArrayList list2 = ListUtil.of("1", "2", "3", "4"); final String join2 = IterUtil.join(list2.iterator(), ":", "\"", "\""); Assert.assertEquals("\"1\":\"2\":\"3\":\"4\"", join2); } @Test public void joinWithFuncTest() { - final ArrayList list = ListUtil.toList("1", "2", "3", "4"); + final ArrayList list = ListUtil.of("1", "2", "3", "4"); final String join = IterUtil.join(list.iterator(), ":", String::valueOf); Assert.assertEquals("1:2:3:4", join); } @Test public void joinWithNullTest() { - final ArrayList list = ListUtil.toList("1", null, "3", "4"); + final ArrayList list = ListUtil.of("1", null, "3", "4"); final String join = IterUtil.join(list.iterator(), ":", String::valueOf); Assert.assertEquals("1:null:3:4", join); } @@ -94,10 +94,10 @@ public class IterUtilTest { } @Test - public void getElementTypeTest(){ + public void getElementTypeTest() { final List integers = Arrays.asList(null, 1); final Class elementType = IterUtil.getElementType(integers); - Assert.assertEquals(Integer.class,elementType); + Assert.assertEquals(Integer.class, elementType); } @Data @@ -108,9 +108,9 @@ public class IterUtilTest { } @Test - public void filterTest(){ - final List obj2 = ListUtil.toList("3"); - final List obj = ListUtil.toList("1", "3"); + public void filterTest() { + final List obj2 = ListUtil.of("3"); + final List obj = ListUtil.of("1", "3"); IterUtil.filter(obj.iterator(), obj2::contains); @@ -119,9 +119,9 @@ public class IterUtilTest { } @Test - public void filteredTest(){ - final List obj2 = ListUtil.toList("3"); - final List obj = ListUtil.toList("1", "3"); + public void filteredTest() { + final List obj2 = ListUtil.of("3"); + final List obj = ListUtil.of("1", "3"); final FilterIter filtered = IterUtil.filtered(obj.iterator(), obj2::contains); @@ -130,9 +130,9 @@ public class IterUtilTest { } @Test - public void filterToListTest(){ - final List obj2 = ListUtil.toList("3"); - final List obj = ListUtil.toList("1", "3"); + public void filterToListTest() { + final List obj2 = ListUtil.of("3"); + final List obj = ListUtil.of("1", "3"); final List filtered = IterUtil.filterToList(obj.iterator(), obj2::contains); @@ -142,7 +142,7 @@ public class IterUtilTest { @Test public void getTest() { - final HashSet set = SetUtil.set(true, "A", "B", "C", "D"); + final HashSet set = SetUtil.ofLinked("A", "B", "C", "D"); final String str = IterUtil.get(set.iterator(), 2); Assert.assertEquals("C", str); } diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java index b7e5380e0..497b66b34 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java @@ -87,7 +87,7 @@ public class ListUtilTest { @Test public void editTest() { - final List a = ListUtil.toLinkedList("1", "2", "3"); + final List a = ListUtil.ofLinked("1", "2", "3"); final List filter = (List) CollUtil.edit(a, str -> "edit" + str); Assert.assertEquals("edit1", filter.get(0)); Assert.assertEquals("edit2", filter.get(1)); @@ -96,16 +96,16 @@ public class ListUtilTest { @Test public void indexOfAll() { - final List a = ListUtil.toLinkedList("1", "2", "3", "4", "3", "2", "1"); - final int[] indexArray = ListUtil.indexOfAll(a, "2"::equals); + final List a = ListUtil.ofLinked("1", "2", "3", "4", "3", "2", "1"); + final int[] indexArray = CollUtil.indexOfAll(a, "2"::equals); Assert.assertArrayEquals(new int[]{1,5}, indexArray); - final int[] indexArray2 = ListUtil.indexOfAll(a, "1"::equals); + final int[] indexArray2 = CollUtil.indexOfAll(a, "1"::equals); Assert.assertArrayEquals(new int[]{0,6}, indexArray2); } @Test public void pageTest() { - final List a = ListUtil.toLinkedList(1, 2, 3,4,5); + final List a = ListUtil.ofLinked(1, 2, 3,4,5); PageUtil.setFirstPageNo(1); final int[] a_1 = ListUtil.page(1,2,a).stream().mapToInt(Integer::valueOf).toArray(); @@ -174,7 +174,7 @@ public class ListUtilTest { @Test public void subTest() { - final List of = ListUtil.of(1, 2, 3, 4); + final List of = ListUtil.view(1, 2, 3, 4); final List sub = ListUtil.sub(of, 2, 4); sub.remove(0); @@ -192,7 +192,7 @@ public class ListUtilTest { private String name; } - final List beanList = ListUtil.toList( + final List beanList = ListUtil.of( new TestBean(2, "test2"), new TestBean(1, "test1"), new TestBean(5, "test5"), diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java index b84b5fbfb..e4c02049c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java @@ -22,7 +22,7 @@ public class PartitionIterTest { @Test public void iterMaxTest() { - final List list = ListUtil.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 0, 12, 45, 12); + final List list = ListUtil.view(1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 0, 12, 45, 12); final PartitionIter iter = new PartitionIter<>(list.iterator(), 3); int max = 0; for (final List lines : iter) { diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java index 1b4611580..1a490c0f8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java @@ -19,10 +19,10 @@ public class CompareUtilTest { @Test public void comparingPinyin() { - final List list = ListUtil.toList("成都", "北京", "上海", "深圳"); + final List list = ListUtil.of("成都", "北京", "上海", "深圳"); - final List ascendingOrderResult = ListUtil.of("北京", "成都", "上海", "深圳"); - final List descendingOrderResult = ListUtil.of("深圳", "上海", "成都", "北京"); + final List ascendingOrderResult = ListUtil.view("北京", "成都", "上海", "深圳"); + final List descendingOrderResult = ListUtil.view("深圳", "上海", "成都", "北京"); // 正序 list.sort(CompareUtil.comparingPinyin(e -> e)); diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java index cef9e3343..d7d92504b 100755 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java @@ -293,7 +293,7 @@ public class ConvertTest { public void toSetTest(){ final Set result = Convert.convert(new TypeReference>() { }, "1,2,3"); - Assert.assertEquals(SetUtil.set(false, 1,2,3), result); + Assert.assertEquals(SetUtil.of(1,2,3), result); } @Getter diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java index 487f1995a..b3b1b6622 100755 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java @@ -128,7 +128,7 @@ public class ConvertToCollectionTest { public void toSetTest() { final Object[] a = { "a", "你", "好", "", 1 }; final LinkedHashSet set = Convert.convert(LinkedHashSet.class, a); - final ArrayList list = ListUtil.toList(set); + final ArrayList list = ListUtil.of(set); Assert.assertEquals("a", list.get(0)); Assert.assertEquals("你", list.get(1)); Assert.assertEquals("好", list.get(2)); diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java index f64bc7072..48efc9eaa 100755 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java @@ -800,13 +800,13 @@ public class DateUtilTest { Assert.assertEquals("20184", yearAndQuarter); final LinkedHashSet yearAndQuarters = DateUtil.yearAndQuarter(DateUtil.parse("2018-09-10"), DateUtil.parse("2018-12-20")); - final List list = ListUtil.list(false, yearAndQuarters); + final List list = ListUtil.of(false, yearAndQuarters); Assert.assertEquals(2, list.size()); Assert.assertEquals("20183", list.get(0)); Assert.assertEquals("20184", list.get(1)); final LinkedHashSet yearAndQuarters2 = DateUtil.yearAndQuarter(DateUtil.parse("2018-10-10"), DateUtil.parse("2018-12-10")); - final List list2 = ListUtil.list(false, yearAndQuarters2); + final List list2 = ListUtil.of(false, yearAndQuarters2); Assert.assertEquals(1, list2.size()); Assert.assertEquals("20184", list2.get(0)); } diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java index a08c44cfb..01b28ba54 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java @@ -465,7 +465,7 @@ public class FileUtilTest { @Test @Ignore public void appendLinesTest(){ - final List list = ListUtil.toList("a", "b", "c"); + final List list = ListUtil.of("a", "b", "c"); FileUtil.appendLines(list, FileUtil.file("d:/test/appendLines.txt"), CharsetUtil.UTF_8); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java index 51c84388e..8f8bca881 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java @@ -14,6 +14,6 @@ public class WeightRandomTest { random.add("C", 100); final String result = random.next(); - Assert.assertTrue(ListUtil.toList("A", "B", "C").contains(result)); + Assert.assertTrue(ListUtil.of("A", "B", "C").contains(result)); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java index ce405d440..b666768a5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java @@ -33,8 +33,8 @@ public class StrJoinerTest { @Test public void joinMultiArrayTest(){ final StrJoiner append = StrJoiner.of(","); - append.append(new Object[]{ListUtil.of("1", "2"), - SetUtil.newLinkedHashSet("3", "4") + append.append(new Object[]{ListUtil.view("1", "2"), + SetUtil.ofLinked("3", "4") }); Assert.assertEquals("1,2,3,4", append.toString()); } diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java b/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java index c1050d456..3847800db 100755 --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java @@ -27,7 +27,7 @@ public class DfaTest { // 匹配到【大】,就不再继续匹配了,因此【大土豆】不匹配 // 匹配到【刚出锅】,就跳过这三个字了,因此【出锅】不匹配(由于刚首先被匹配,因此长的被匹配,最短匹配只针对第一个字相同选最短) final List matchAll = tree.matchAll(text, -1, false, false); - Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅")); + Assert.assertEquals(matchAll, ListUtil.of("大", "土^豆", "刚出锅")); } /** @@ -43,7 +43,7 @@ public class DfaTest { // 【大】被匹配,最短匹配原则【大土豆】被跳过,【土豆继续被匹配】 // 【刚出锅】被匹配,由于不跳过已经匹配的词,【出锅】被匹配 final List matchAll = tree.matchAll(text, -1, true, false); - Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅", "出锅")); + Assert.assertEquals(matchAll, ListUtil.of("大", "土^豆", "刚出锅", "出锅")); } /** @@ -59,7 +59,7 @@ public class DfaTest { // 匹配到【大】,由于非密集匹配,因此从下一个字符开始查找,匹配到【土豆】接着被匹配 // 由于【刚出锅】被匹配,由于非密集匹配,【出锅】被跳过 final List matchAll = tree.matchAll(text, -1, false, true); - Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅")); + Assert.assertEquals(matchAll, ListUtil.of("大", "土^豆", "刚出锅")); } @@ -76,7 +76,7 @@ public class DfaTest { // 匹配到【大】,由于到最长匹配,因此【大土豆】接着被匹配,由于不跳过已经匹配的关键词,土豆继续被匹配 // 【刚出锅】被匹配,由于不跳过已经匹配的词,【出锅】被匹配 final List matchAll = tree.matchAll(text, -1, true, true); - Assert.assertEquals(matchAll, ListUtil.toList("大", "大土^豆", "土^豆", "刚出锅", "出锅")); + Assert.assertEquals(matchAll, ListUtil.of("大", "大土^豆", "土^豆", "刚出锅", "出锅")); } @@ -112,7 +112,7 @@ public class DfaTest { tree.addWord("tio"); final List all = tree.matchAll("AAAAAAAt-ioBBBBBBB"); - Assert.assertEquals(all, ListUtil.toList("t-io")); + Assert.assertEquals(all, ListUtil.of("t-io")); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java index ecba6ca0f..76755f32a 100755 --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java @@ -34,7 +34,7 @@ public class SensitiveUtilTest { @Test public void issue2126(){ - SensitiveUtil.init(ListUtil.of("赵", "赵阿", "赵阿三")); + SensitiveUtil.init(ListUtil.view("赵", "赵阿", "赵阿三")); final String result = SensitiveUtil.sensitiveFilter("赵阿三在做什么。", true, null); Assert.assertEquals("***在做什么。", result); diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java index 0773b7dd9..d56cc38d3 100755 --- a/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java @@ -1,8 +1,6 @@ package cn.hutool.core.tree; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.tree.Tree; -import cn.hutool.core.tree.TreeUtil; import lombok.Data; import org.junit.Assert; import org.junit.Test; @@ -13,7 +11,7 @@ public class Issue2279Test { @Test public void buildSingleTest() { - final List list = ListUtil.of( + final List list = ListUtil.view( // 模拟数据 new TestTree(1, 0, 1, 1), new TestTree(2, 1, 2, 2), diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java index c71079a38..693017ad9 100755 --- a/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java @@ -14,7 +14,7 @@ import java.util.List; */ public class TreeTest { // 模拟数据 - static List> nodeList = ListUtil.toList(); + static List> nodeList = ListUtil.of(); static { // 模拟数据 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java index 89b1d6cc0..0b4a96ff1 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java @@ -323,7 +323,7 @@ public class ArrayUtilTest { @Test public void toArrayTest() { - final ArrayList list = ListUtil.toList("A", "B", "C", "D"); + final ArrayList list = ListUtil.of("A", "B", "C", "D"); final String[] array = ArrayUtil.toArray(list, String.class); Assert.assertEquals("A", array[0]); Assert.assertEquals("B", array[1]); diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java index 51cca053f..7856c736a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java @@ -18,13 +18,13 @@ public class EnumUtilTest { @Test public void getNamesTest() { final List names = EnumUtil.getNames(TestEnum.class); - Assert.assertEquals(ListUtil.toList("TEST1", "TEST2", "TEST3"), names); + Assert.assertEquals(ListUtil.of("TEST1", "TEST2", "TEST3"), names); } @Test public void getFieldValuesTest() { final List types = EnumUtil.getFieldValues(TestEnum.class, "type"); - Assert.assertEquals(ListUtil.toList("type1", "type2", "type3"), types); + Assert.assertEquals(ListUtil.of("type1", "type2", "type3"), types); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java index dbea03acd..02498f7fe 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java @@ -58,7 +58,7 @@ public class ObjectUtilTest { @Test public void toStringTest() { - final ArrayList strings = ListUtil.toList("1", "2"); + final ArrayList strings = ListUtil.of("1", "2"); final String result = ObjUtil.toString(strings); Assert.assertEquals("[1, 2]", result); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java index a7747b6c0..336d7b896 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java @@ -15,13 +15,13 @@ public class RandomUtilTest { @Test public void randomEleSetTest(){ - final Set set = RandomUtil.randomEleSet(ListUtil.toList(1, 2, 3, 4, 5, 6), 2); + final Set set = RandomUtil.randomEleSet(ListUtil.of(1, 2, 3, 4, 5, 6), 2); Assert.assertEquals(set.size(), 2); } @Test public void randomElesTest(){ - final List result = RandomUtil.randomEles(ListUtil.toList(1, 2, 3, 4, 5, 6), 2); + final List result = RandomUtil.randomEles(ListUtil.of(1, 2, 3, 4, 5, 6), 2); Assert.assertEquals(result.size(), 2); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java index 51657f172..6c9ee3cd0 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java @@ -82,7 +82,7 @@ public class ReUtilTest { public void findAllTest() { // 查找所有匹配文本 final List resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<>()); - final ArrayList expected = ListUtil.toList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34"); + final ArrayList expected = ListUtil.of("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34"); Assert.assertEquals(expected, resultFindAll); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java index 707d4570e..11b1c5f3e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java @@ -110,7 +110,7 @@ public class XmlUtilTest { final Map map = XmlUtil.xmlToMap(xml); Assert.assertEquals(1, map.size()); - Assert.assertEquals(ListUtil.toList("张三", "李四"), map.get("name")); + Assert.assertEquals(ListUtil.of("张三", "李四"), map.get("name")); } @Test @@ -138,7 +138,7 @@ public class XmlUtilTest { public void mapToXmlTest2() { // 测试List final Map map = MapBuilder.create(new LinkedHashMap()) - .put("Town", ListUtil.toList("town1", "town2")) + .put("Town", ListUtil.of("town1", "town2")) .build(); final Document doc = XmlUtil.mapToXml(map, "City"); @@ -158,7 +158,7 @@ public class XmlUtilTest { @Test public void readBySaxTest(){ - final Set eles = SetUtil.newHashSet( + final Set eles = SetUtil.of( "returnsms", "returnstatus", "message", "remainpoint", "taskID", "successCounts"); XmlUtil.readBySax(ResourceUtil.getStream("test.xml"), new DefaultHandler(){ @Override diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java index 17abb34f8..5008ebf24 100755 --- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java @@ -554,7 +554,7 @@ public abstract class AbstractDb> extends DefaultConnect * @throws DbRuntimeException SQL执行异常 */ public T find(final Entity where, final RsHandler rsh, final String... fields) throws DbRuntimeException { - return find(ListUtil.toList(fields), where, rsh); + return find(ListUtil.of(fields), where, rsh); } /** diff --git a/hutool-db/src/main/java/cn/hutool/db/Entity.java b/hutool-db/src/main/java/cn/hutool/db/Entity.java index 2a1c7e95f..259c23d78 100755 --- a/hutool-db/src/main/java/cn/hutool/db/Entity.java +++ b/hutool-db/src/main/java/cn/hutool/db/Entity.java @@ -156,7 +156,7 @@ public class Entity extends Dict { */ public Entity setFieldNames(final Collection fieldNames) { if (CollUtil.isNotEmpty(fieldNames)) { - this.fieldNames = SetUtil.newHashSet(true, fieldNames); + this.fieldNames = SetUtil.of(true, fieldNames); } return this; } @@ -169,7 +169,7 @@ public class Entity extends Dict { */ public Entity setFieldNames(final String... fieldNames) { if (ArrayUtil.isNotEmpty(fieldNames)) { - this.fieldNames = SetUtil.newLinkedHashSet(fieldNames); + this.fieldNames = SetUtil.ofLinked(fieldNames); } return this; } diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java index 921d3ad4d..4794777f3 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java @@ -134,7 +134,7 @@ public interface Dialect extends Serializable { * @throws SQLException SQL执行异常 */ default PreparedStatement psForCount(final Connection conn, final Query query) throws SQLException { - return psForFind(conn, query.clone().setFields(ListUtil.toList("count(1)"))); + return psForFind(conn, query.clone().setFields(ListUtil.of("count(1)"))); } /** diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java index 05729e423..51093aa4c 100755 --- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java @@ -272,7 +272,7 @@ public class MetaUtil { indexInfo.getColumnIndexInfoList().add(ColumnIndexInfo.create(rs)); } } - table.setIndexInfoList(ListUtil.toList(indexInfoMap.values())); + table.setIndexInfoList(ListUtil.of(indexInfoMap.values())); } } catch (final SQLException e) { throw new DbRuntimeException("Get columns error!", e); diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java index b03af24f6..e18f310a5 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java @@ -55,7 +55,7 @@ public class ConditionBuilder implements Builder { * @return 参数列表 */ public List getParamValues() { - return ListUtil.unmodifiable(this.paramValues); + return ListUtil.view(this.paramValues); } /** diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Query.java b/hutool-db/src/main/java/cn/hutool/db/sql/Query.java index 05eea5691..b352b37dd 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/Query.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/Query.java @@ -113,7 +113,7 @@ public class Query implements Cloneable { * @return this */ public Query setFields(final String... fields) { - this.fields = ListUtil.toList(fields); + this.fields = ListUtil.of(fields); return this; } diff --git a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java b/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java index 2ab2a228f..dbc2796f8 100644 --- a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java @@ -107,7 +107,7 @@ public class CRUDTest { @Test public void findTest() { - final List find = db.find(ListUtil.toList("name AS name2"), Entity.create("user"), new EntityListHandler()); + final List find = db.find(ListUtil.of("name AS name2"), Entity.create("user"), new EntityListHandler()); Assert.assertFalse(find.isEmpty()); } @@ -168,7 +168,7 @@ public class CRUDTest { Console.log(data1); Console.log(data2); - final int[] result = db.insert(ListUtil.toList(data1, data2)); + final int[] result = db.insert(ListUtil.of(data1, data2)); Console.log(result); } @@ -185,7 +185,7 @@ public class CRUDTest { Console.log(data1); - final int[] result = db.insert(ListUtil.toList(data1)); + final int[] result = db.insert(ListUtil.of(data1)); Console.log(result); } diff --git a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java index df07ed8e0..5ec7d87a5 100755 --- a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java @@ -31,7 +31,7 @@ public class ConcurentTest { for(int i = 0; i < 10000; i++) { ThreadUtil.execute(() -> { final List find; - find = db.find(ListUtil.toList("name AS name2"), Entity.create("user"), new EntityListHandler()); + find = db.find(ListUtil.of("name AS name2"), Entity.create("user"), new EntityListHandler()); Console.log(find); }); } diff --git a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java index 87964dd65..63bdf949b 100644 --- a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java @@ -15,7 +15,7 @@ public class PicTransferTest { @Ignore public void findTest() { Db.of().find( - ListUtil.of("NAME", "TYPE", "GROUP", "PIC"), + ListUtil.view("NAME", "TYPE", "GROUP", "PIC"), Entity.create("PIC_INFO").set("TYPE", 1), rs -> { while(rs.next()){ diff --git a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java index d43ca226c..0c5f65dd4 100644 --- a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java @@ -27,7 +27,7 @@ public class MetaUtilTest { @Test public void getTableMetaTest() { final Table table = MetaUtil.getTableMeta(ds, "user"); - Assert.assertEquals(SetUtil.newHashSet("id"), table.getPkNames()); + Assert.assertEquals(SetUtil.of("id"), table.getPkNames()); } @Test diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java index b081741d2..1e57695b7 100644 --- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java @@ -23,6 +23,6 @@ public class ConditionGroupTest { final ConditionBuilder conditionBuilder = ConditionBuilder.of(cg2, condition4); Assert.assertEquals("((a = ? OR b = ?) AND c = ?) AND d = ?", conditionBuilder.build()); - Assert.assertEquals(ListUtil.of("A", "B", "C", "D"), conditionBuilder.getParamValues()); + Assert.assertEquals(ListUtil.view("A", "B", "C", "D"), conditionBuilder.getParamValues()); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java index 1a217f9d5..e81e93c15 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java @@ -434,7 +434,7 @@ public class MailUtil { } else if (StrUtil.contains(addresses, ';')) { result = StrUtil.splitTrim(addresses, ';'); } else { - result = ListUtil.toList(addresses); + result = ListUtil.of(addresses); } return result; } diff --git a/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java b/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java index 5fa7fe886..ce1b31c9a 100644 --- a/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java +++ b/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java @@ -58,7 +58,7 @@ public class RootAction implements Action { */ public RootAction(final File rootDir, final String... indexFileNames) { this.rootDir = rootDir; - this.indexFileNames = ListUtil.toList(indexFileNames); + this.indexFileNames = ListUtil.of(indexFileNames); } @Override diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java index 5f766525f..2ef37ba85 100755 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java @@ -27,7 +27,7 @@ public class Browser extends UserAgentInfo { /** * 支持的浏览器类型 */ - public static final List browers = ListUtil.toList( + public static final List browers = ListUtil.of( // 部分特殊浏览器是基于安卓、Iphone等的,需要优先判断 // 企业微信 企业微信使用微信浏览器内核,会包含 MicroMessenger 所以要放在前面 new Browser("wxwork", "wxwork", "wxwork\\/([\\d\\w\\.\\-]+)"), diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java index eb2703647..2317bd461 100755 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java @@ -21,7 +21,7 @@ public class Engine extends UserAgentInfo { /** * 支持的引擎类型 */ - public static final List engines = ListUtil.of( + public static final List engines = ListUtil.view( new Engine("Trident", "trident"), new Engine("Webkit", "webkit"), new Engine("Chrome", "chrome"), diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java index 47bb27806..34b260521 100755 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java @@ -23,7 +23,7 @@ public class OS extends UserAgentInfo { /** * 支持的引擎类型 */ - public static final List oses = ListUtil.of(// + public static final List oses = ListUtil.view(// new OS("Windows 10 or Windows Server 2016", "windows nt 10\\.0", "windows nt (10\\.0)"),// new OS("Windows 8.1 or Windows Server 2012R2", "windows nt 6\\.3", "windows nt (6\\.3)"),// new OS("Windows 8 or Windows Server 2012", "windows nt 6\\.2", "windows nt (6\\.2)"),// diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java index d329325a7..aaabcb420 100644 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java @@ -49,7 +49,7 @@ public class Platform extends UserAgentInfo { /** * 支持的移动平台类型 */ - public static final List mobilePlatforms = ListUtil.of(// + public static final List mobilePlatforms = ListUtil.view(// WINDOWS_PHONE, // IPAD, // IPOD, // @@ -65,7 +65,7 @@ public class Platform extends UserAgentInfo { /** * 支持的桌面平台类型 */ - public static final List desktopPlatforms = ListUtil.of(// + public static final List desktopPlatforms = ListUtil.view(// new Platform("Windows", "windows"), // new Platform("Mac", "(macintosh|darwin)"), // new Platform("Linux", "linux"), // diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java index 3afb2064a..437621b7c 100755 --- a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java @@ -49,7 +49,7 @@ public class Issue2131Test { @Data static class GoodsResponse extends BaseResponse { // 由于定义成了final形式,setXXX无效,导致无法注入。 - private final List collections = ListUtil.list(false); + private final List collections = ListUtil.of(false); } @Data diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java index b76e818aa..922e40b2e 100644 --- a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java @@ -19,7 +19,7 @@ public class IssueI1AU86Test { @Test public void toListTest() { - final List redisList = ListUtil.toList( + final List redisList = ListUtil.of( "{\"updateDate\":1583376342000,\"code\":\"move\",\"id\":1,\"sort\":1,\"name\":\"电影大全\"}", "{\"updateDate\":1583378882000,\"code\":\"zy\",\"id\":3,\"sort\":5,\"name\":\"综艺会\"}" ); diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java index b2d4a8a23..e56fe9517 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -42,7 +42,7 @@ public class JSONArrayTest { @Test public void addNullTest(){ - final List aaa = ListUtil.of("aaa", null); + final List aaa = ListUtil.view("aaa", null); final String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa, JSONConfig.create().setIgnoreNullValue(false))); Assert.assertEquals("[\"aaa\",null]", jsonStr); @@ -97,7 +97,7 @@ public class JSONArrayTest { b2.setAkey("aValue2"); b2.setBkey("bValue2"); - final ArrayList list = ListUtil.toList(b1, b2); + final ArrayList list = ListUtil.of(b1, b2); final JSONArray jsonArray = JSONUtil.parseArray(list); Assert.assertEquals("aValue1", jsonArray.getJSONObject(0).getStr("akey")); diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java index 362e4b7c7..b33f4cd2a 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java @@ -238,7 +238,7 @@ public class JSONObjectTest { userA.setA("A user"); userA.setName("{\n\t\"body\":{\n\t\t\"loginId\":\"id\",\n\t\t\"password\":\"pwd\"\n\t}\n}"); userA.setDate(new Date()); - userA.setSqs(ListUtil.toList(new Seq("seq1"), new Seq("seq2"))); + userA.setSqs(ListUtil.of(new Seq("seq1"), new Seq("seq2"))); final JSONObject json = JSONUtil.parseObj(userA); final UserA userA2 = json.toBean(UserA.class); @@ -320,7 +320,7 @@ public class JSONObjectTest { final UserA userA = new UserA(); userA.setName("nameTest"); userA.setDate(new Date()); - userA.setSqs(ListUtil.toList(new Seq(null), new Seq("seq2"))); + userA.setSqs(ListUtil.of(new Seq(null), new Seq("seq2"))); final JSONObject json = JSONUtil.parseObj(userA, false); @@ -333,7 +333,7 @@ public class JSONObjectTest { final TestBean bean = new TestBean(); bean.setDoubleValue(111.1); bean.setIntValue(123); - bean.setList(ListUtil.toList("a", "b", "c")); + bean.setList(ListUtil.of("a", "b", "c")); bean.setStrValue("strTest"); bean.setTestEnum(TestEnum.TYPE_B); diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java index 266fda729..a79a4bffe 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java @@ -58,7 +58,7 @@ public class JSONUtilTest { a2.setDate(DateUtil.date()); a2.setName("AAAA222Name"); - final ArrayList list = ListUtil.toList(a1, a2); + final ArrayList list = ListUtil.of(a1, a2); final HashMap map = MapUtil.newHashMap(); map.put("total", 13); map.put("rows", list); @@ -229,7 +229,7 @@ public class JSONUtilTest { public void toXmlTest(){ final JSONObject obj = JSONUtil.createObj(); obj.set("key1", "v1") - .set("key2", ListUtil.of("a", "b", "c")); + .set("key2", ListUtil.view("a", "b", "c")); final String xmlStr = JSONUtil.toXmlStr(obj); Assert.assertEquals("v1abc", xmlStr); } diff --git a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java b/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java index 9f8621c60..f9c3cd578 100644 --- a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java @@ -24,12 +24,12 @@ public class ParseBeanTest { c2.setTest("test2"); final B b1 = new B(); - b1.setCs(ListUtil.toList(c1, c2)); + b1.setCs(ListUtil.of(c1, c2)); final B b2 = new B(); - b2.setCs(ListUtil.toList(c1, c2)); + b2.setCs(ListUtil.of(c1, c2)); final A a = new A(); - a.setBs(ListUtil.toList(b1, b2)); + a.setBs(ListUtil.of(b1, b2)); final JSONObject json = JSONUtil.parseObj(a); final A a1 = JSONUtil.toBean(json, A.class); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java index c406301bf..57b4f6d42 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java @@ -1017,7 +1017,7 @@ public class ExcelWriter extends ExcelBase { } } else if (rowBean instanceof Hyperlink) { // Hyperlink当成一个值 - return writeRow(ListUtil.toList(rowBean), isWriteKeyAsHead); + return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead); } else if (BeanUtil.isBean(rowBean.getClass())) { if (MapUtil.isEmpty(this.headerAlias)) { rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false); @@ -1027,7 +1027,7 @@ public class ExcelWriter extends ExcelBase { } } else { // 其它转为字符串默认输出 - return writeRow(ListUtil.toList(rowBean), isWriteKeyAsHead); + return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead); } return writeRow(rowMap, isWriteKeyAsHead); } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java index 14f5a00d7..23fb8e29d 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java @@ -157,7 +157,7 @@ public class SheetRidReader extends DefaultHandler { * @since 5.7.17 */ public List getSheetNames() { - return ListUtil.toList(this.NAME_RID_MAP.keySet()); + return ListUtil.of(this.NAME_RID_MAP.keySet()); } @Override diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java index d20abcca7..8ea6cd955 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java @@ -44,7 +44,7 @@ public abstract class BeanRowHandler extends AbstractRowHandler { @Override public void handle(final int sheetIndex, final long rowIndex, final List rowCells) { if (rowIndex == this.headerRowIndex) { - this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells)); + this.headerList = ListUtil.view(Convert.toList(String.class, rowCells)); return; } super.handle(sheetIndex, rowIndex, rowCells); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java index 8e0aa08a8..36c5ba9fe 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java @@ -41,7 +41,7 @@ public abstract class MapRowHandler extends AbstractRowHandler rowCells) { if (rowIndex == this.headerRowIndex) { - this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells)); + this.headerList = ListUtil.view(Convert.toList(String.class, rowCells)); return; } super.handle(sheetIndex, rowIndex, rowCells); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java index e8eafcde9..6b281060b 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java @@ -94,7 +94,7 @@ public class TableUtil { rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false); } else { // 其它转为字符串默认输出 - writeRow(row, ListUtil.toList(rowBean), isWriteKeyAsHead); + writeRow(row, ListUtil.of(rowBean), isWriteKeyAsHead); return; } diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java index eba767523..cd929bb8e 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java @@ -177,7 +177,7 @@ public class CsvUtilTest { String mobile; } - final List header = ListUtil.of("用户id", "用户名", "手机号"); + final List header = ListUtil.view("用户id", "用户名", "手机号"); final List row = new ArrayList<>(); final List datas = new ArrayList<>(); diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java index 17d388a7a..ddd4f46f0 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java @@ -30,7 +30,7 @@ public class BigExcelWriteTest { @Test @Ignore public void writeTest2() { - final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("e:/excel/single_line.xlsx"); overtimeWriter.write(row); overtimeWriter.close(); @@ -39,13 +39,13 @@ public class BigExcelWriteTest { @Test @Ignore public void writeTest() { - final List row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); for(int i=0; i < 400000; i++) { //超大列表写出测试 rows.add(ObjUtil.clone(row1)); @@ -70,13 +70,13 @@ public class BigExcelWriteTest { @Test @Ignore public void mergeTest() { - final List row1 = ListUtil.toList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); // 通过工具类创建writer final BigExcelWriter writer = ExcelUtil.getBigWriter("e:/mergeTest.xlsx"); @@ -114,7 +114,7 @@ public class BigExcelWriteTest { row2.put("是否合格", false); row2.put("考试日期", DateUtil.date()); - final ArrayList> rows = ListUtil.toList(row1, row2); + final ArrayList> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final String path = "e:/bigWriteMapTest.xlsx"; @@ -174,7 +174,7 @@ public class BigExcelWriteTest { bean2.setScore(38.50); bean2.setExamDate(DateUtil.date()); - final List rows = ListUtil.toList(bean1, bean2); + final List rows = ListUtil.of(bean1, bean2); // 通过工具类创建writer final String file = "e:/bigWriteBeanTest.xlsx"; FileUtil.del(file); diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java index 7c2f420b1..faa12dd0d 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java @@ -46,12 +46,12 @@ public class ExcelWriteTest { @Test public void writeNoFlushTest(){ - final List row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); final ExcelWriter writer = ExcelUtil.getWriter(); writer.write(rows); @@ -61,13 +61,13 @@ public class ExcelWriteTest { @Test @Ignore public void testRowOrColumnCellStyle() { - final List row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("d:/test/style_line.xlsx"); overtimeWriter.write(rows, true); @@ -105,7 +105,7 @@ public class ExcelWriteTest { @Test @Ignore public void writeTest2() { - final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); final ExcelWriter overtimeWriter = ExcelUtil.getWriter("e:/excel/single_line.xlsx"); overtimeWriter.writeRow(row); overtimeWriter.close(); @@ -117,12 +117,12 @@ public class ExcelWriteTest { final ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1"); // 写出第一张表 - final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); writer.writeRow(row); // 写出第二张表 writer.setSheet("表格2"); - final List row2 = ListUtil.toList("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2"); + final List row2 = ListUtil.of("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2"); writer.writeRow(row2); // 生成文件或导出Excel @@ -134,13 +134,13 @@ public class ExcelWriteTest { @Test @Ignore public void writeTest() { - final List row1 = ListUtil.toList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); for (int i = 0; i < 400; i++) { // 超大列表写出测试 rows.add(ObjUtil.clone(row1)); @@ -169,13 +169,13 @@ public class ExcelWriteTest { @Test @Ignore public void mergeTest() { - final List row1 = ListUtil.toList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = ListUtil.toList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = ListUtil.toList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = ListUtil.toList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = ListUtil.toList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + final List row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); + final List row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); + final List row3 = ListUtil.of("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); + final List row4 = ListUtil.of("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); + final List row5 = ListUtil.of("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/mergeTest.xlsx"); @@ -213,7 +213,7 @@ public class ExcelWriteTest { row2.put("是否合格", false); row2.put("考试日期", DateUtil.date()); - final ArrayList> rows = ListUtil.toList(row1, row2); + final ArrayList> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeMapTest.xlsx"); @@ -243,7 +243,7 @@ public class ExcelWriteTest { row2.put("是否合格", false); row2.put("考试日期", DateUtil.date()); - final ArrayList> rows = ListUtil.toList(row1, row2); + final ArrayList> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("e:/excel/writeMapTest.xlsx"); @@ -325,7 +325,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = ListUtil.toList(row1, row2); + final List> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final String file = "d:/test/writeMapAlias.xlsx"; FileUtil.del(file); @@ -360,7 +360,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = ListUtil.toList(row1, row2); + final List> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final String file = "f:/test/test_alias.xlsx"; FileUtil.del(file); @@ -393,7 +393,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = ListUtil.toList(row1, row2); + final List> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final String file = "d:/test/test_alias.xls"; final ExcelWriter writer = ExcelUtil.getWriter(file, "test1"); @@ -424,7 +424,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = ListUtil.toList(row1, row2); + final List> rows = ListUtil.of(row1, row2); // 通过工具类创建writer final String file = "d:/test/test_alias.xls"; final ExcelWriter writer = ExcelUtil.getWriter(file, "test1"); @@ -458,7 +458,7 @@ public class ExcelWriteTest { bean2.setScore(38.50); bean2.setExamDate(DateUtil.date()); - final List rows = ListUtil.toList(bean1, bean2); + final List rows = ListUtil.of(bean1, bean2); // 通过工具类创建writer final String file = "e:/writeBeanTest.xlsx"; FileUtil.del(file); @@ -490,7 +490,7 @@ public class ExcelWriteTest { order1.setNum("456"); order1.setBody("body2"); - final List rows = ListUtil.toList(order1, order2); + final List rows = ListUtil.of(order1, order2); // 通过工具类创建writer final String file = "f:/test/writeBeanTest2.xlsx"; FileUtil.del(file); @@ -517,7 +517,7 @@ public class ExcelWriteTest { @Test @Ignore public void addSelectTest() { - final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); final ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx"); overtimeWriter.writeCellValue(3, 4, "AAAA"); overtimeWriter.addSelect(3, 4, row.toArray(new String[0])); @@ -674,7 +674,7 @@ public class ExcelWriteTest { public void writeNumberFormatTest() { final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx"); writer.disableDefaultStyle(); - writer.writeRow(ListUtil.toList(51.33333333, 90.111111111)); + writer.writeRow(ListUtil.of(51.33333333, 90.111111111)); final CellStyle columnStyle = writer.createCellStyle(0, 0); columnStyle.setDataFormat((short) BuiltinFormats.getBuiltinFormat("0.00")); writer.close(); @@ -683,13 +683,13 @@ public class ExcelWriteTest { @Test @Ignore public void writeSecHeadRowTest() { - final List row1 = ListUtil.toList(1, "aa", "bb", "cc", "dd", "ee"); - final List row2 = ListUtil.toList(2, "aa1", "bb1", "cc1", "dd1", "ee1"); - final List row3 = ListUtil.toList(3, "aa2", "bb2", "cc2", "dd2", "ee2"); - final List row4 = ListUtil.toList(4, "aa3", "bb3", "cc3", "dd3", "ee3"); - final List row5 = ListUtil.toList(5, "aa4", "bb4", "cc4", "dd4", "ee4"); + final List row1 = ListUtil.of(1, "aa", "bb", "cc", "dd", "ee"); + final List row2 = ListUtil.of(2, "aa1", "bb1", "cc1", "dd1", "ee1"); + final List row3 = ListUtil.of(3, "aa2", "bb2", "cc2", "dd2", "ee2"); + final List row4 = ListUtil.of(4, "aa3", "bb3", "cc3", "dd3", "ee3"); + final List row5 = ListUtil.of(5, "aa4", "bb4", "cc4", "dd4", "ee4"); - final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.of(row1, row2, row3, row4, row5); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeSecHeadRowTest.xlsx"); @@ -718,7 +718,7 @@ public class ExcelWriteTest { writer.merge(2, 2, 4, 5, "DDEE", true); writer.setCurrentRow(3); - final List sechead = ListUtil.toList("AA", "BB", "DD", "EE"); + final List sechead = ListUtil.of("AA", "BB", "DD", "EE"); writer.writeSecHeadRow(sechead); // 一次性写出内容,使用默认样式 writer.write(rows); @@ -800,7 +800,7 @@ public class ExcelWriteTest { @Ignore public void changeHeaderStyleTest(){ final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx"); - writer.writeHeadRow(ListUtil.of("姓名", "性别", "年龄")); + writer.writeHeadRow(ListUtil.view("姓名", "性别", "年龄")); final CellStyle headCellStyle = writer.getStyleSet().getHeadCellStyle(); headCellStyle.setFillForegroundColor(IndexedColors.YELLOW1.index); headCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); @@ -816,7 +816,7 @@ public class ExcelWriteTest { FileUtil.del(path); final ExcelWriter writer = ExcelUtil.getWriter(path); - writer.writeRow(ListUtil.of(22.9f)); + writer.writeRow(ListUtil.view(22.9f)); writer.close(); } @@ -826,7 +826,7 @@ public class ExcelWriteTest { // https://gitee.com/dromara/hutool/issues/I466ZZ // 需要输出S_20000314_x5116_0004 // 此处加入一个转义前缀:_x005F - final List row = ListUtil.of(new EscapeStrCellSetter("S_20000314_x5116_0004")); + final List row = ListUtil.view(new EscapeStrCellSetter("S_20000314_x5116_0004")); final ExcelWriter writer = ExcelUtil.getWriter("d:/test/_x.xlsx"); writer.writeRow(row); @@ -838,7 +838,7 @@ public class ExcelWriteTest { public void writeLongTest(){ //https://gitee.com/dromara/hutool/issues/I49R6U final ExcelWriter writer = ExcelUtil.getWriter("d:/test/long.xlsx"); - writer.write(ListUtil.of(1427545395336093698L)); + writer.write(ListUtil.view(1427545395336093698L)); writer.close(); } @@ -849,7 +849,7 @@ public class ExcelWriteTest { final Hyperlink hyperlink = writer.createHyperlink(HyperlinkType.URL, "https://hutool.cn"); - writer.write(ListUtil.of(hyperlink)); + writer.write(ListUtil.view(hyperlink)); writer.close(); } diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java index 19b88aea1..696b5a12d 100755 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java @@ -27,7 +27,7 @@ public class Issue2221Test { writer.setOnlyAlias(true); // 写入数据 - final List> data = ListUtil.of( + final List> data = ListUtil.view( MapUtil.ofEntries(MapUtil.entry("androidLc", "1次"), MapUtil.entry("androidAc", "3人")), MapUtil.ofEntries(MapUtil.entry("androidLc", "1次"), MapUtil.entry("androidAc", "3人")) ); @@ -75,7 +75,7 @@ public class Issue2221Test { writer.merge(0, 0, 3, 4, "新增人数", true); // 写入数据 - final List> data = ListUtil.of( + final List> data = ListUtil.view( MapUtil.ofEntries( MapUtil.entry("date", "2022-01-01"), MapUtil.entry("androidLc", "1次"), diff --git a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java index a0dd7bbdd..4e7c6f0bc 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java @@ -48,7 +48,7 @@ public class WordWriterTest { map.put("成绩", 88.32); map.put("是否合格", true); - writer.addTable(ListUtil.toList(map)); + writer.addTable(ListUtil.of(map)); writer.flush(FileUtil.file("d:/test/test.docx")); } @@ -71,7 +71,7 @@ public class WordWriterTest { data2.put("是否合格", false); data2.put("考试日期", DateUtil.date()); - final ArrayList> mapArrayList = ListUtil.toList(data, data2); + final ArrayList> mapArrayList = ListUtil.of(data, data2); // 添加段落(标题) writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分"); @@ -87,8 +87,8 @@ public class WordWriterTest { @Test public void overflowTest(){ final Word07Writer word07Writer = new Word07Writer(); - final List list = ListUtil.list(false); - final List list2 = ListUtil.list(false); + final List list = ListUtil.of(false); + final List list2 = ListUtil.of(false); list.add("溢出测试"); list2.add(list); word07Writer.addTable(list); diff --git a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java index bc0626570..5663a8412 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java @@ -279,7 +279,7 @@ public class GroupedSet extends HashMap> { public boolean contains(final String group, final String value, final String... otherValues) { if (ArrayUtil.isNotEmpty(otherValues)) { // 需要测试多个值的情况 - final List valueList = ListUtil.toList(otherValues); + final List valueList = ListUtil.of(otherValues); valueList.add(value); return contains(group, valueList); } else { diff --git a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java index 89247575f..7332c5f02 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java @@ -437,7 +437,7 @@ public class Setting extends AbsSetting implements Map { * @return 获得所有分组名 */ public List getGroups() { - return ListUtil.toList(this.groupedMap.keySet()); + return ListUtil.of(this.groupedMap.keySet()); } /**