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 c68f2d27d..f5d3b0783 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 @@ -1,6 +1,6 @@ package cn.hutool.core.annotation; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.map.TableMap; import java.io.Serializable; @@ -42,7 +42,7 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa /** * 元注解 */ - private static final Set> META_ANNOTATIONS = CollUtil.newHashSet(Target.class, // + private static final Set> META_ANNOTATIONS = SetUtil.newHashSet(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 4061bd276..6d096cad4 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.copier.BeanCopier; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.func.Editor; import cn.hutool.core.map.CaseInsensitiveMap; @@ -574,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 = CollUtil.set(false, properties); + final Set propertiesSet = SetUtil.set(false, 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 0a484dbd6..644168d57 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 @@ -55,7 +55,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.LinkedBlockingDeque; import java.util.function.BiConsumer; import java.util.function.Function; @@ -122,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 = newHashSet(coll2); + final Set elts = SetUtil.newHashSet(coll2); elts.addAll(coll1); int m; for (final T t : elts) { @@ -239,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 = newHashSet(coll2); + final Set elts = SetUtil.newHashSet(coll2); int m; for (final T t : elts) { m = Math.min(Convert.toInt(map1.get(t), 0), Convert.toInt(map2.get(t), 0)); @@ -348,7 +347,7 @@ public class CollUtil { final List result = new ArrayList<>(); final Map map1 = countMap(coll1); final Map map2 = countMap(coll2); - final Set elts = newHashSet(coll2); + final Set elts = SetUtil.newHashSet(coll2); elts.addAll(coll1); int m; for (final T t : elts) { @@ -654,300 +653,6 @@ public class CollUtil { return currentAlaDatas; } - // ----------------------------------------------------------------------------------------------- new HashSet - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param ts 元素数组 - * @return HashSet对象 - */ - @SafeVarargs - public static HashSet newHashSet(final T... ts) { - return set(false, ts); - } - - /** - * 新建一个LinkedHashSet - * - * @param 集合元素类型 - * @param ts 元素数组 - * @return HashSet对象 - * @since 4.1.10 - */ - @SafeVarargs - public static LinkedHashSet newLinkedHashSet(final T... ts) { - return (LinkedHashSet) set(true, ts); - } - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回 {@link HashSet} - * @param ts 元素数组 - * @return HashSet对象 - */ - @SafeVarargs - public static HashSet set(final boolean isSorted, final T... ts) { - if (null == ts) { - return isSorted ? new LinkedHashSet<>() : new HashSet<>(); - } - 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); - } - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回{@link HashSet} - * @param iter {@link Iterator} - * @return HashSet对象 - * @since 3.0.8 - */ - public static HashSet newHashSet(final boolean isSorted, final Iterator iter) { - if (null == iter) { - return set(isSorted, (T[]) null); - } - final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); - while (iter.hasNext()) { - set.add(iter.next()); - } - return set; - } - - /** - * 新建一个HashSet - * - * @param 集合元素类型 - * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回{@link HashSet} - * @param enumeration {@link Enumeration} - * @return HashSet对象 - * @since 3.0.8 - */ - public static HashSet newHashSet(final boolean isSorted, final Enumeration enumeration) { - if (null == enumeration) { - return set(isSorted, (T[]) null); - } - final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); - while (enumeration.hasMoreElements()) { - set.add(enumeration.nextElement()); - } - return set; - } - - // ----------------------------------------------------------------------------------------------- List - - /** - * 新建一个空List - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @return List对象 - * @since 4.1.2 - */ - public static List list(final boolean isLinked) { - return ListUtil.list(isLinked); - } - - /** - * 新建一个List - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param values 数组 - * @return List对象 - * @since 4.1.2 - */ - @SafeVarargs - public static List list(final boolean isLinked, final T... values) { - return ListUtil.list(isLinked, values); - } - - /** - * 新建一个List - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param collection 集合 - * @return List对象 - * @since 4.1.2 - */ - public static List list(final boolean isLinked, final Collection collection) { - return ListUtil.list(isLinked, collection); - } - - /** - * 新建一个List
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param iterable {@link Iterable} - * @return List对象 - * @since 4.1.2 - */ - public static List list(final boolean isLinked, final Iterable iterable) { - return ListUtil.list(isLinked, iterable); - } - - /** - * 新建一个ArrayList
- * 提供的参数为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) { - return ListUtil.list(isLinked, iter); - } - - /** - * 新建一个List
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param isLinked 是否新建LinkedList - * @param enumeration {@link Enumeration} - * @return ArrayList对象 - * @since 3.0.8 - */ - public static List list(final boolean isLinked, final Enumeration enumeration) { - return ListUtil.list(isLinked, enumeration); - } - - /** - * 新建一个ArrayList - * - * @param 集合元素类型 - * @param values 数组 - * @return ArrayList对象 - * @see #toList(Object[]) - */ - @SafeVarargs - public static ArrayList newArrayList(final T... values) { - return ListUtil.toList(values); - } - - /** - * 数组转为ArrayList - * - * @param 集合元素类型 - * @param values 数组 - * @return ArrayList对象 - * @since 4.0.11 - */ - @SafeVarargs - public static ArrayList toList(final T... values) { - return ListUtil.toList(values); - } - - /** - * 新建一个ArrayList - * - * @param 集合元素类型 - * @param collection 集合 - * @return ArrayList对象 - */ - public static ArrayList newArrayList(final Collection collection) { - return ListUtil.toList(collection); - } - - /** - * 新建一个ArrayList
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param iterable {@link Iterable} - * @return ArrayList对象 - * @since 3.1.0 - */ - public static ArrayList newArrayList(final Iterable iterable) { - return ListUtil.toList(iterable); - } - - /** - * 新建一个ArrayList
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param iterator {@link Iterator} - * @return ArrayList对象 - * @since 3.0.8 - */ - public static ArrayList newArrayList(final Iterator iterator) { - return ListUtil.toList(iterator); - } - - /** - * 新建一个ArrayList
- * 提供的参数为null时返回空{@link ArrayList} - * - * @param 集合元素类型 - * @param enumeration {@link Enumeration} - * @return ArrayList对象 - * @since 3.0.8 - */ - public static ArrayList newArrayList(final Enumeration enumeration) { - return ListUtil.toList(enumeration); - } - - // ----------------------------------------------------------------------new LinkedList - - /** - * 新建LinkedList - * - * @param values 数组 - * @param 类型 - * @return LinkedList - * @since 4.1.2 - */ - @SafeVarargs - public static LinkedList newLinkedList(final T... values) { - return ListUtil.toLinkedList(values); - } - - /** - * 新建一个CopyOnWriteArrayList - * - * @param 集合元素类型 - * @param collection 集合 - * @return {@link CopyOnWriteArrayList} - */ - public static CopyOnWriteArrayList newCopyOnWriteArrayList(final Collection collection) { - return ListUtil.toCopyOnWriteArrayList(collection); - } - /** * 新建{@link BlockingQueue}
* 在队列为空时，获取元素的线程会等待队列变为非空。当队列满时，存储元素的线程会等待队列可用。 @@ -1222,7 +927,7 @@ public class CollUtil { */ @SuppressWarnings("unchecked") public static , E> T removeAny(final T collection, final E... elesRemoved) { - collection.removeAll(newHashSet(elesRemoved)); + collection.removeAll(SetUtil.newHashSet(elesRemoved)); return collection; } @@ -1927,7 +1632,7 @@ public class CollUtil { * @since 3.0.9 */ public static Collection toCollection(final Iterable iterable) { - return (iterable instanceof Collection) ? (Collection) iterable : newArrayList(iterable.iterator()); + return (iterable instanceof Collection) ? (Collection) iterable : ListUtil.toList(iterable.iterator()); } /** @@ -2082,7 +1787,7 @@ public class CollUtil { iter = StrUtil.splitTrim(ArrayStr, CharUtil.COMMA).iterator(); } else { // 其它类型按照单一元素处理 - iter = CollUtil.newArrayList(value).iterator(); + iter = ListUtil.toList(value).iterator(); } final ConverterRegistry convert = ConverterRegistry.getInstance(); @@ -2522,14 +2227,14 @@ public class CollUtil { // ------------------------------------------------------------------------------------------------- forEach /** - * 循环遍历 {@link Iterable}，使用{@link Consumer} 接受遍历的每条数据，并针对每条数据做处理 + * 循环遍历 {@link Iterable}，使用{@link IndexedConsumer} 接受遍历的每条数据，并针对每条数据做处理 * * @param 集合元素类型 * @param iterable {@link Iterable} - * @param consumer {@link Consumer} 遍历的每条数据处理器 + * @param consumer {@link IndexedConsumer} 遍历的每条数据处理器 * @since 5.4.7 */ - public static void forEach(final Iterable iterable, final Consumer consumer) { + public static void forEach(final Iterable iterable, final IndexedConsumer consumer) { if (iterable == null) { return; } @@ -2537,13 +2242,13 @@ public class CollUtil { } /** - * 循环遍历 {@link Iterator}，使用{@link Consumer} 接受遍历的每条数据，并针对每条数据做处理 + * 循环遍历 {@link Iterator}，使用{@link IndexedConsumer} 接受遍历的每条数据，并针对每条数据做处理 * * @param 集合元素类型 * @param iterator {@link Iterator} - * @param consumer {@link Consumer} 遍历的每条数据处理器 + * @param consumer {@link IndexedConsumer} 遍历的每条数据处理器 */ - public static void forEach(final Iterator iterator, final Consumer consumer) { + public static void forEach(final Iterator iterator, final IndexedConsumer consumer) { if (iterator == null) { return; } @@ -2555,13 +2260,13 @@ public class CollUtil { } /** - * 循环遍历 {@link Enumeration}，使用{@link Consumer} 接受遍历的每条数据，并针对每条数据做处理 + * 循环遍历 {@link Enumeration}，使用{@link IndexedConsumer} 接受遍历的每条数据，并针对每条数据做处理 * * @param 集合元素类型 * @param enumeration {@link Enumeration} - * @param consumer {@link Consumer} 遍历的每条数据处理器 + * @param consumer {@link IndexedConsumer} 遍历的每条数据处理器 */ - public static void forEach(final Enumeration enumeration, final Consumer consumer) { + public static void forEach(final Enumeration enumeration, final IndexedConsumer consumer) { if (enumeration == null) { return; } @@ -2573,15 +2278,15 @@ public class CollUtil { } /** - * 循环遍历Map，使用{@link KVConsumer} 接受遍历的每条数据，并针对每条数据做处理
+ * 循环遍历Map，使用{@link IndexedKVConsumer} 接受遍历的每条数据，并针对每条数据做处理
* 和JDK8中的map.forEach不同的是，此方法支持index * * @param Key类型 * @param Value类型 * @param map {@link Map} - * @param kvConsumer {@link KVConsumer} 遍历的每条数据处理器 + * @param kvConsumer {@link IndexedKVConsumer} 遍历的每条数据处理器 */ - public static void forEach(final Map map, final KVConsumer kvConsumer) { + public static void forEach(final Map map, final IndexedKVConsumer kvConsumer) { if (map == null) { return; } @@ -2618,11 +2323,11 @@ public class CollUtil { while (result.size() - 1 < index) { result.add(null); } - result.set(index, newArrayList(t)); + result.set(index, ListUtil.toList(t)); } else { subList = result.get(index); if (null == subList) { - result.set(index, newArrayList(t)); + result.set(index, ListUtil.toList(t)); } else { subList.add(t); } @@ -2661,30 +2366,6 @@ public class CollUtil { }); } - /** - * 反序给定List，会在原List基础上直接修改 - * - * @param 元素类型 - * @param list 被反转的List - * @return 反转后的List - * @since 4.0.6 - */ - public static List reverse(final List list) { - return ListUtil.reverse(list); - } - - /** - * 反序给定List，会创建一个新的List，原List数据不变 - * - * @param 元素类型 - * @param list 被反转的List - * @return 反转后的List - * @since 4.0.6 - */ - public static List reverseNew(final List list) { - return ListUtil.reverseNew(list); - } - /** * 设置或增加元素。当index小于List的长度时，替换指定位置的值，否则在尾部追加 * @@ -2903,7 +2584,7 @@ public class CollUtil { * @author Looly */ @FunctionalInterface - public interface Consumer extends Serializable { + public interface IndexedConsumer extends Serializable { /** * 接受并处理一个参数 * @@ -2921,7 +2602,7 @@ public class CollUtil { * @author Looly */ @FunctionalInterface - public interface KVConsumer extends Serializable { + public interface IndexedKVConsumer extends Serializable { /** * 接受并处理一对参数 * 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 new file mode 100644 index 000000000..ff9084b1a --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java @@ -0,0 +1,123 @@ +package cn.hutool.core.collection; + +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; + +/** + * 集合中的{@link java.util.Set}相关方法封装 + * + * @author looly + */ +public class SetUtil { + + /** + * 新建一个HashSet + * + * @param 集合元素类型 + * @param ts 元素数组 + * @return HashSet对象 + */ + @SafeVarargs + public static HashSet newHashSet(final T... ts) { + return set(false, ts); + } + + /** + * 新建一个LinkedHashSet + * + * @param 集合元素类型 + * @param ts 元素数组 + * @return HashSet对象 + * @since 4.1.10 + */ + @SafeVarargs + public static LinkedHashSet newLinkedHashSet(final T... ts) { + return (LinkedHashSet) set(true, ts); + } + + /** + * 新建一个HashSet + * + * @param 集合元素类型 + * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回 {@link HashSet} + * @param ts 元素数组 + * @return HashSet对象 + */ + @SafeVarargs + public static HashSet set(final boolean isSorted, final T... ts) { + if (null == ts) { + return isSorted ? new LinkedHashSet<>() : new HashSet<>(); + } + 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); + } + + /** + * 新建一个HashSet + * + * @param 集合元素类型 + * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回{@link HashSet} + * @param iter {@link Iterator} + * @return HashSet对象 + * @since 3.0.8 + */ + public static HashSet newHashSet(final boolean isSorted, final Iterator iter) { + if (null == iter) { + return set(isSorted, (T[]) null); + } + final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); + while (iter.hasNext()) { + set.add(iter.next()); + } + return set; + } + + /** + * 新建一个HashSet + * + * @param 集合元素类型 + * @param isSorted 是否有序，有序返回 {@link LinkedHashSet}，否则返回{@link HashSet} + * @param enumeration {@link Enumeration} + * @return HashSet对象 + * @since 3.0.8 + */ + public static HashSet newHashSet(final boolean isSorted, final Enumeration enumeration) { + if (null == enumeration) { + return set(isSorted, (T[]) null); + } + final HashSet set = isSorted ? new LinkedHashSet<>() : new HashSet<>(); + while (enumeration.hasMoreElements()) { + set.add(enumeration.nextElement()); + } + return set; + } +} 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 683e314de..91c82668c 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 @@ -1,17 +1,17 @@ package cn.hutool.core.date; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.date.format.DateParser; import cn.hutool.core.date.format.DatePrinter; import cn.hutool.core.date.format.FastDateFormat; import cn.hutool.core.date.format.GlobalCustomFormat; import cn.hutool.core.lang.Assert; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.util.CharUtil; import cn.hutool.core.math.NumberUtil; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.regex.ReUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.CharUtil; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -20,7 +20,14 @@ import java.time.LocalDateTime; import java.time.Year; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Function; @@ -1842,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 = CollUtil.newArrayList((Iterable) start); - final List endDateTimes = CollUtil.newArrayList((Iterable) end); + final List startDateTimes = ListUtil.toList((Iterable) start); + final List endDateTimes = ListUtil.toList((Iterable) end); return startDateTimes.stream().filter(endDateTimes::contains).collect(Collectors.toList()); } @@ -1857,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 = CollUtil.newArrayList((Iterable) start); - final List endDateTimes = CollUtil.newArrayList((Iterable) end); + final List startDateTimes = ListUtil.toList((Iterable) start); + final List endDateTimes = ListUtil.toList((Iterable) end); return endDateTimes.stream().filter(item -> !startDateTimes.contains(item)).collect(Collectors.toList()); } @@ -1909,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 CollUtil.newArrayList((Iterable) range(start, end, unit)); + return ListUtil.toList((Iterable) range(start, end, unit)); } /** @@ -1923,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 CollUtil.newArrayList((Iterable) new DateRange(start, end, unit, step)); + return ListUtil.toList((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 9a60ca009..6d69365ce 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 @@ -1,6 +1,6 @@ package cn.hutool.core.io.resource; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.IORuntimeException; import java.io.BufferedReader; @@ -32,7 +32,7 @@ public class MultiResource implements Resource, Iterable, Iterator, Iterator)resources; }else { - this.resources = CollUtil.newArrayList(resources); + this.resources = ListUtil.toList(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 b955b1185..abcd64e7c 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 @@ -1,6 +1,6 @@ package cn.hutool.core.io.watch.watchers; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.watch.Watcher; import cn.hutool.core.lang.Chain; @@ -35,7 +35,7 @@ public class WatcherChain implements Watcher, Chain{ * @param watchers 观察者列表 */ public WatcherChain(final Watcher... watchers) { - chain = CollUtil.newArrayList(watchers); + chain = ListUtil.toList(watchers); } @Override 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 77daf6244..416425636 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 @@ -2,7 +2,7 @@ package cn.hutool.core.map; import cn.hutool.core.bean.BeanPath; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; @@ -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 = CollUtil.newHashSet(withoutNames); + final HashSet withoutSet = SetUtil.newHashSet(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 115b7b45e..4c86e14a6 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 @@ -1,6 +1,7 @@ package cn.hutool.core.map; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.func.Editor; import cn.hutool.core.lang.func.Filter; @@ -408,7 +409,7 @@ public class MapUtil { key = entry.getKey(); valueList = resultMap.get(key); if (null == valueList) { - valueList = CollUtil.newArrayList(entry.getValue()); + valueList = ListUtil.toList(entry.getValue()); resultMap.put(key, valueList); } else { valueList.add(entry.getValue()); @@ -463,7 +464,7 @@ public class MapUtil { List vList; int vListSize; for (final Entry> entry : listMap.entrySet()) { - vList = CollUtil.newArrayList(entry.getValue()); + vList = ListUtil.toList(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 2e53c835a..26d51c0b8 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 = CollUtil.toList(keys); - this.values = CollUtil.toList(values); + this.keys = ListUtil.toList(keys); + this.values = ListUtil.toList(values); } @Override 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 d5dffe169..731192367 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 @@ -2,7 +2,7 @@ package cn.hutool.core.reflect; import cn.hutool.core.bean.NullWrapperBean; import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.collection.UniqueKeySet; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; @@ -90,7 +90,7 @@ public class MethodUtil { * @return 过滤后的方法列表 */ public static Method[] getPublicMethods(final Class clazz, final Method... excludeMethods) { - final HashSet excludeMethodSet = CollUtil.newHashSet(excludeMethods); + final HashSet excludeMethodSet = SetUtil.newHashSet(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 = CollUtil.newHashSet(excludeMethodNames); + final HashSet excludeMethodNameSet = SetUtil.newHashSet(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 34827b9e3..53c3d28c3 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 @@ -1,6 +1,6 @@ package cn.hutool.core.regex; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; @@ -45,7 +45,7 @@ public class ReUtil { /** * 正则中需要被转义的关键字 */ - public final static Set RE_KEYS = CollUtil.newHashSet('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'); + public final static Set RE_KEYS = SetUtil.newHashSet('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'); /** * 获得匹配的字符串，获得正则中分组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 dfe55e857..9c649f1c1 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 @@ -1,8 +1,8 @@ package cn.hutool.core.text.dfa; -import java.util.Set; +import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.collection.CollUtil; +import java.util.Set; /** * 过滤词及一些简单处理 @@ -11,7 +11,7 @@ import cn.hutool.core.collection.CollUtil; */ public class StopChar { /** 不需要处理的词，如标点符号、空格等 */ - public static final Set STOP_WORD = CollUtil.newHashSet(' ', '\'', '、', '。', // + public static final Set STOP_WORD = SetUtil.newHashSet(' ', '\'', '、', '。', // '·', 'ˉ', 'ˇ', '々', '—', '～', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', // '』', '〖', '〗', '【', '】', '±', '＋', '－', '×', '÷', '∧', '∨', '∑', '∏', '∪', '∩', '∈', '√', '⊥', '⊙', '∫', // '∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∶', '∵', '∴', '∷', '♂', '♀', '°', '′', '〃', // 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 38ade3859..eb913fec2 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 @@ -1,6 +1,7 @@ package cn.hutool.core.text.dfa; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.text.StrUtil; import java.util.ArrayList; @@ -85,7 +86,7 @@ public class WordTree extends HashMap { * @return this */ public WordTree addWords(final String... words) { - for (final String word : CollUtil.newHashSet(words)) { + for (final String word : SetUtil.newHashSet(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 6d46e5c7a..7d8c10c49 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 @@ -1,6 +1,7 @@ package cn.hutool.core.util; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.UniqueKeySet; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.exceptions.UtilException; @@ -1287,7 +1288,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @since 3.0.9 */ public static T[] toArray(final Iterator iterator, final Class componentType) { - return toArray(CollUtil.newArrayList(iterator), componentType); + return toArray(ListUtil.toList(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 2897ed1c2..a43e90a7d 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 @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.StrUtil; @@ -15,7 +15,7 @@ import java.util.Set; public class BooleanUtil { /** 表示为真的字符串 */ - private static final Set TRUE_SET = CollUtil.newHashSet("true", "yes", "y", "t", "ok", "1", "on", "是", "对", "真", "對", "√"); + private static final Set TRUE_SET = SetUtil.newHashSet("true", "yes", "y", "t", "ok", "1", "on", "是", "对", "真", "對", "√"); /** * 取相反值 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 e703451be..ce6f00df1 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 @@ -1,7 +1,7 @@ package cn.hutool.core.util; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; @@ -1109,7 +1109,7 @@ public class XmlUtil { if (value instanceof List) { ((List) value).add(newValue); } else { - result.put(childEle.getNodeName(), CollUtil.newArrayList(value, newValue)); + result.put(childEle.getNodeName(), ListUtil.toList(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 1757b179c..23e0bfd58 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 @@ -3,14 +3,14 @@ package cn.hutool.core.bean; import cn.hutool.core.annotation.Alias; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.map.MapBuilder; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.text.StrUtil; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -285,7 +285,7 @@ public class BeanUtilTest { @Test public void getPropertyDescriptorsTest() { - final HashSet set = CollUtil.newHashSet(); + final HashSet set = SetUtil.newHashSet(); final PropertyDescriptor[] propertyDescriptors = BeanUtil.getPropertyDescriptors(SubPerson.class); for (final PropertyDescriptor propertyDescriptor : propertyDescriptors) { set.add(propertyDescriptor.getName()); 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 e3b6562bd..1acf39503 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 = CollUtil.newArrayList("bbbbb", "aaaaa", "ccccc"); + final ArrayList list = ListUtil.toList("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 = CollUtil.newArrayList(1, 2, 3); - final ArrayList exceptRemovedList = CollUtil.newArrayList(2, 3); - final ArrayList exceptResultList = CollUtil.newArrayList(1); + ArrayList list = ListUtil.toList(1, 2, 3); + final ArrayList exceptRemovedList = ListUtil.toList(2, 3); + final ArrayList exceptResultList = ListUtil.toList(1); List resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele); Assert.assertEquals(list, exceptRemovedList); Assert.assertEquals(resultList, exceptResultList); - list = CollUtil.newArrayList(1, 2, 3); + list = ListUtil.toList(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 = CollUtil.newArrayList(); - List answerList = CollUtil.newArrayList("a", "b"); + List srcList = ListUtil.toList(); + List answerList = ListUtil.toList("a", "b"); CollUtil.padLeft(srcList, 1, "b"); CollUtil.padLeft(srcList, 2, "a"); Assert.assertEquals(srcList, answerList); - srcList = CollUtil.newArrayList("a", "b"); - answerList = CollUtil.newArrayList("a", "b"); + srcList = ListUtil.toList("a", "b"); + answerList = ListUtil.toList("a", "b"); CollUtil.padLeft(srcList, 2, "a"); Assert.assertEquals(srcList, answerList); - srcList = CollUtil.newArrayList("c"); - answerList = CollUtil.newArrayList("a", "a", "c"); + srcList = ListUtil.toList("c"); + answerList = ListUtil.toList("a", "a", "c"); CollUtil.padLeft(srcList, 3, "a"); Assert.assertEquals(srcList, answerList); } @Test public void testPadRight() { - final List srcList = CollUtil.newArrayList("a"); - final List answerList = CollUtil.newArrayList("a", "b", "b", "b", "b"); + final List srcList = ListUtil.toList("a"); + final List answerList = ListUtil.toList("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 = CollUtil.newHashSet((String[]) null); + final Set set = SetUtil.newHashSet((String[]) null); Assert.assertNotNull(set); } @@ -114,8 +114,8 @@ public class CollUtilTest { @Test public void unionTest() { - final ArrayList list1 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d"); + final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d"); + final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d"); - final ArrayList list3 = CollUtil.newArrayList(); + 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 Collection intersectionDistinct = CollUtil.intersectionDistinct(list1, list2); - Assert.assertEquals(CollUtil.newLinkedHashSet("a", "b", "c", "d"), intersectionDistinct); + Assert.assertEquals(SetUtil.newLinkedHashSet("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 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x"); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2"); + final ArrayList list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList(); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2"); + final ArrayList list1 = ListUtil.toList(); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList("1", "2", "3"); - final ArrayList list2 = CollUtil.newArrayList("a", "b", "c"); + final ArrayList list1 = ListUtil.toList("1", "2", "3"); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x"); - final List list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2"); + final List list1 = ListUtil.toList("a", "b", "b", "c", "d", "x"); + final List list2 = ListUtil.toList("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 = CollUtil.newArrayList(map1, map2); + final ArrayList> list = ListUtil.toList(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 = CollUtil.newArrayList(v1, v2); + final ArrayList list = ListUtil.toList(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 = CollUtil.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9); + final ArrayList list = ListUtil.toList(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 = CollUtil.newArrayList("a", "b", "c"); + final ArrayList list = ListUtil.toList("a", "b", "c"); final Collection filtered = CollUtil.edit(list, t -> t + 1); - Assert.assertEquals(CollUtil.newArrayList("a1", "b1", "c1"), filtered); + Assert.assertEquals(ListUtil.toList("a1", "b1", "c1"), filtered); } @Test public void filterTest2() { - final ArrayList list = CollUtil.newArrayList("a", "b", "c"); + final ArrayList list = ListUtil.toList("a", "b", "c"); final ArrayList filtered = CollUtil.filter(list, t -> false == "a".equals(t)); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(CollUtil.newArrayList("b", "c"), filtered); + Assert.assertEquals(ListUtil.toList("b", "c"), filtered); } @Test public void filterSetTest() { - final Set set = CollUtil.newLinkedHashSet("a", "b", "", " ", "c"); + final Set set = SetUtil.newLinkedHashSet("a", "b", "", " ", "c"); final Set filtered = CollUtil.filter(set, StrUtil::isNotBlank); - Assert.assertEquals(CollUtil.newLinkedHashSet("a", "b", "c"), filtered); + Assert.assertEquals(SetUtil.newLinkedHashSet("a", "b", "c"), filtered); } @Test public void filterRemoveTest() { - final ArrayList list = CollUtil.newArrayList("a", "b", "c"); + final ArrayList list = ListUtil.toList("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(CollUtil.newArrayList("b", "c"), filtered); + Assert.assertEquals(ListUtil.toList("b", "c"), filtered); } @Test public void removeNullTest() { - final ArrayList list = CollUtil.newArrayList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeNull(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(CollUtil.newArrayList("a", "b", "c", "", " "), filtered); + Assert.assertEquals(ListUtil.toList("a", "b", "c", "", " "), filtered); } @Test public void removeEmptyTest() { - final ArrayList list = CollUtil.newArrayList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeEmpty(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(CollUtil.newArrayList("a", "b", "c", " "), filtered); + Assert.assertEquals(ListUtil.toList("a", "b", "c", " "), filtered); } @Test public void removeBlankTest() { - final ArrayList list = CollUtil.newArrayList("a", "b", "c", null, "", " "); + final ArrayList list = ListUtil.toList("a", "b", "c", null, "", " "); final ArrayList filtered = CollUtil.removeBlank(list); // 原地过滤 Assert.assertSame(list, filtered); - Assert.assertEquals(CollUtil.newArrayList("a", "b", "c"), filtered); + Assert.assertEquals(ListUtil.toList("a", "b", "c"), filtered); } @Test public void groupTest() { - final List list = CollUtil.newArrayList("1", "2", "3", "4", "5", "6"); + final List list = ListUtil.toList("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(CollUtil.newArrayList("2", "4", "6"), group2.get(0)); - Assert.assertEquals(CollUtil.newArrayList("1", "3", "5"), group2.get(1)); + Assert.assertEquals(ListUtil.toList("2", "4", "6"), group2.get(0)); + Assert.assertEquals(ListUtil.toList("1", "3", "5"), group2.get(1)); } @Test public void groupByFieldTest() { - final List list = CollUtil.newArrayList(new TestBean("张三", 12), new TestBean("李四", 13), new TestBean("王五", 12)); + final List list = ListUtil.toList(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 = CollUtil.newArrayList( + final List list = ListUtil.toList( 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 = CollUtil.newArrayList( + final List list = ListUtil.toList( 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 = CollUtil.newArrayList(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // + final List list = ListUtil.toList(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 = CollUtil.newArrayList(new TestBean("张三", 12, DateUtil.parse("2018-05-01")), // + final List list = ListUtil.toList(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 = CollUtil.list(false); - final List list2 = CollUtil.list(true); + final List list1 = ListUtil.list(false); + final List list2 = ListUtil.list(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 = CollUtil.list(false, "a", "b", "c"); - final List list2 = CollUtil.list(true, "a", "b", "c"); + final List list1 = ListUtil.list(false, "a", "b", "c"); + final List list2 = ListUtil.list(true, "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 = CollUtil.list(false, set); - final List list2 = CollUtil.list(true, set); + final List list1 = ListUtil.list(false, set); + final List list2 = ListUtil.list(true, set); Assert.assertEquals("[a, b, c]", list1.toString()); Assert.assertEquals("[a, b, c]", list2.toString()); } @Test public void getTest() { - final HashSet set = CollUtil.set(true, "A", "B", "C", "D"); + final HashSet set = SetUtil.set(true, "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 = CollUtil.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9); + final List list = ListUtil.toList(1, 2, 3, 4, 5, 6, 7, 8, 9); final List sortPageAll = CollUtil.sortPageAll(1, 5, Comparator.reverseOrder(), list); - Assert.assertEquals(CollUtil.newArrayList(4, 3, 2, 1), sortPageAll); + Assert.assertEquals(ListUtil.toList(4, 3, 2, 1), sortPageAll); } @Test public void containsAnyTest() { - final ArrayList list1 = CollUtil.newArrayList(1, 2, 3, 4, 5); - final ArrayList list2 = CollUtil.newArrayList(5, 3, 1, 9, 11); + final ArrayList list1 = ListUtil.toList(1, 2, 3, 4, 5); + final ArrayList list2 = ListUtil.toList(5, 3, 1, 9, 11); Assert.assertTrue(CollUtil.containsAny(list1, list2)); } @Test public void containsAllTest() { - final ArrayList list1 = CollUtil.newArrayList(1, 2, 3, 4, 5); - final ArrayList list2 = CollUtil.newArrayList(5, 3, 1); + final ArrayList list1 = ListUtil.toList(1, 2, 3, 4, 5); + final ArrayList list2 = ListUtil.toList(5, 3, 1); Assert.assertTrue(CollUtil.containsAll(list1, list2)); - final ArrayList list3 = CollUtil.newArrayList(1); - final ArrayList list4 = CollUtil.newArrayList(); + final ArrayList list3 = ListUtil.toList(1); + final ArrayList list4 = ListUtil.toList(); Assert.assertTrue(CollUtil.containsAll(list3, list4)); } @Test public void getLastTest() { // 测试：空数组返回null而不是报错 - final List test = CollUtil.newArrayList(); + final List test = ListUtil.toList(); final String last = CollUtil.getLast(test); Assert.assertNull(last); } @Test public void zipTest() { - final Collection keys = CollUtil.newArrayList("a", "b", "c", "d"); - final Collection values = CollUtil.newArrayList(1, 2, 3, 4); + final Collection keys = ListUtil.toList("a", "b", "c", "d"); + final Collection values = ListUtil.toList(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 = CollUtil.newArrayList("a", "b", "c", "d"); + final Collection keys = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.toList("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 = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d"); + final ArrayList list = ListUtil.toList("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 = CollUtil.set(true, "a", "b", "c", "c", "a", "b", "d"); + final Set list = SetUtil.set(true, "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 = CollUtil.newArrayList(); + final List objects = ListUtil.toList(); for (int i = 0; i < 10; i++) { objects.add(Dict.create().set("name", "姓名：" + i)); } 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 f642764c9..cb1cf162e 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 @@ -24,13 +24,13 @@ public class IterUtilTest { @Test public void getFirstNonNullTest(){ - final ArrayList strings = CollUtil.newArrayList(null, null, "123", "456", null); + final ArrayList strings = ListUtil.toList(null, null, "123", "456", null); Assert.assertEquals("123", IterUtil.getFirstNoneNull(strings)); } @Test public void fieldValueMapTest() { - final ArrayList carList = CollUtil.newArrayList(new Car("123", "大众"), new Car("345", "奔驰"), new Car("567", "路虎")); + final ArrayList carList = ListUtil.toList(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 = CollUtil.newArrayList("1", "2", "3", "4"); + final ArrayList list = ListUtil.toList("1", "2", "3", "4"); final String join = IterUtil.join(list.iterator(), ":"); Assert.assertEquals("1:2:3:4", join); - final ArrayList list1 = CollUtil.newArrayList(1, 2, 3, 4); + final ArrayList list1 = ListUtil.toList(1, 2, 3, 4); final String join1 = IterUtil.join(list1.iterator(), ":"); Assert.assertEquals("1:2:3:4", join1); // 包装每个节点 - final ArrayList list2 = CollUtil.newArrayList("1", "2", "3", "4"); + final ArrayList list2 = ListUtil.toList("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 = CollUtil.newArrayList("1", "2", "3", "4"); + final ArrayList list = ListUtil.toList("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 = CollUtil.newArrayList("1", null, "3", "4"); + final ArrayList list = ListUtil.toList("1", null, "3", "4"); final String join = IterUtil.join(list.iterator(), ":", String::valueOf); Assert.assertEquals("1:null:3:4", join); } @@ -142,7 +142,7 @@ public class IterUtilTest { @Test public void getTest() { - final HashSet set = CollUtil.set(true, "A", "B", "C", "D"); + final HashSet set = SetUtil.set(true, "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/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java index 67c7999d7..cef9e3343 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 @@ -1,12 +1,12 @@ package cn.hutool.core.convert; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.codec.HexUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.date.DateException; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.codec.HexUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -293,7 +293,7 @@ public class ConvertTest { public void toSetTest(){ final Set result = Convert.convert(new TypeReference>() { }, "1,2,3"); - Assert.assertEquals(CollUtil.set(false, 1,2,3), result); + Assert.assertEquals(SetUtil.set(false, 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 570c913af..487f1995a 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 @@ -1,6 +1,6 @@ package cn.hutool.core.convert; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.reflect.TypeReference; import org.junit.Assert; import org.junit.Test; @@ -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 = CollUtil.newArrayList(set); + final ArrayList list = ListUtil.toList(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 9537b1a44..f64bc7072 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 @@ -1,6 +1,6 @@ package cn.hutool.core.date; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.BetweenFormatter.Level; import cn.hutool.core.date.format.FastDateFormat; import cn.hutool.core.lang.Console; @@ -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 = CollUtil.list(false, yearAndQuarters); + final List list = ListUtil.list(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 = CollUtil.list(false, yearAndQuarters2); + final List list2 = ListUtil.list(false, yearAndQuarters2); Assert.assertEquals(1, list2.size()); Assert.assertEquals("20184", list2.get(0)); } 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 7b0c055f6..51c84388e 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 @@ -1,10 +1,9 @@ package cn.hutool.core.lang; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; -import cn.hutool.core.collection.CollUtil; - public class WeightRandomTest { @Test @@ -15,6 +14,6 @@ public class WeightRandomTest { random.add("C", 100); final String result = random.next(); - Assert.assertTrue(CollUtil.newArrayList("A", "B", "C").contains(result)); + Assert.assertTrue(ListUtil.toList("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 5de08352c..ce405d440 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 @@ -1,7 +1,7 @@ package cn.hutool.core.text; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.collection.SetUtil; import org.junit.Assert; import org.junit.Test; @@ -34,7 +34,7 @@ public class StrJoinerTest { public void joinMultiArrayTest(){ final StrJoiner append = StrJoiner.of(","); append.append(new Object[]{ListUtil.of("1", "2"), - CollUtil.newLinkedHashSet("3", "4") + SetUtil.newLinkedHashSet("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 c1b076a2b..c1050d456 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 @@ -1,6 +1,6 @@ package cn.hutool.core.text.dfa; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; @@ -27,7 +27,7 @@ public class DfaTest { // 匹配到【大】，就不再继续匹配了，因此【大土豆】不匹配 // 匹配到【刚出锅】，就跳过这三个字了，因此【出锅】不匹配（由于刚首先被匹配，因此长的被匹配，最短匹配只针对第一个字相同选最短） final List matchAll = tree.matchAll(text, -1, false, false); - Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅")); + Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅")); } /** @@ -43,7 +43,7 @@ public class DfaTest { // 【大】被匹配，最短匹配原则【大土豆】被跳过，【土豆继续被匹配】 // 【刚出锅】被匹配，由于不跳过已经匹配的词，【出锅】被匹配 final List matchAll = tree.matchAll(text, -1, true, false); - Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅", "出锅")); + Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅", "出锅")); } /** @@ -59,7 +59,7 @@ public class DfaTest { // 匹配到【大】，由于非密集匹配，因此从下一个字符开始查找，匹配到【土豆】接着被匹配 // 由于【刚出锅】被匹配，由于非密集匹配，【出锅】被跳过 final List matchAll = tree.matchAll(text, -1, false, true); - Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅")); + Assert.assertEquals(matchAll, ListUtil.toList("大", "土^豆", "刚出锅")); } @@ -76,7 +76,7 @@ public class DfaTest { // 匹配到【大】，由于到最长匹配，因此【大土豆】接着被匹配，由于不跳过已经匹配的关键词，土豆继续被匹配 // 【刚出锅】被匹配，由于不跳过已经匹配的词，【出锅】被匹配 final List matchAll = tree.matchAll(text, -1, true, true); - Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "大土^豆", "土^豆", "刚出锅", "出锅")); + Assert.assertEquals(matchAll, ListUtil.toList("大", "大土^豆", "土^豆", "刚出锅", "出锅")); } @@ -112,7 +112,7 @@ public class DfaTest { tree.addWord("tio"); final List all = tree.matchAll("AAAAAAAt-ioBBBBBBB"); - Assert.assertEquals(all, CollUtil.newArrayList("t-io")); + Assert.assertEquals(all, ListUtil.toList("t-io")); } @Test 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 cccccbaa2..c71079a38 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 @@ -1,10 +1,6 @@ package cn.hutool.core.tree; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.tree.Tree; -import cn.hutool.core.tree.TreeNode; -import cn.hutool.core.tree.TreeNodeConfig; -import cn.hutool.core.tree.TreeUtil; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; @@ -18,7 +14,7 @@ import java.util.List; */ public class TreeTest { // 模拟数据 - static List> nodeList = CollUtil.newArrayList(); + static List> nodeList = ListUtil.toList(); 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 a4581125d..89b1d6cc0 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 @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; @@ -323,7 +323,7 @@ public class ArrayUtilTest { @Test public void toArrayTest() { - final ArrayList list = CollUtil.newArrayList("A", "B", "C", "D"); + final ArrayList list = ListUtil.toList("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 9ae8e61e9..51cca053f 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 @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; @@ -18,13 +18,13 @@ public class EnumUtilTest { @Test public void getNamesTest() { final List names = EnumUtil.getNames(TestEnum.class); - Assert.assertEquals(CollUtil.newArrayList("TEST1", "TEST2", "TEST3"), names); + Assert.assertEquals(ListUtil.toList("TEST1", "TEST2", "TEST3"), names); } @Test public void getFieldValuesTest() { final List types = EnumUtil.getFieldValues(TestEnum.class, "type"); - Assert.assertEquals(CollUtil.newArrayList("type1", "type2", "type3"), types); + Assert.assertEquals(ListUtil.toList("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 469cff57b..dbea03acd 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 @@ -1,7 +1,7 @@ package cn.hutool.core.util; import cn.hutool.core.clone.CloneSupport; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import org.junit.Assert; @@ -58,7 +58,7 @@ public class ObjectUtilTest { @Test public void toStringTest() { - final ArrayList strings = CollUtil.newArrayList("1", "2"); + final ArrayList strings = ListUtil.toList("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 b4c8ad6cd..a7747b6c0 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 @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Console; import org.junit.Assert; import org.junit.Ignore; @@ -15,13 +15,13 @@ public class RandomUtilTest { @Test public void randomEleSetTest(){ - final Set set = RandomUtil.randomEleSet(CollUtil.newArrayList(1, 2, 3, 4, 5, 6), 2); + final Set set = RandomUtil.randomEleSet(ListUtil.toList(1, 2, 3, 4, 5, 6), 2); Assert.assertEquals(set.size(), 2); } @Test public void randomElesTest(){ - final List result = RandomUtil.randomEles(CollUtil.newArrayList(1, 2, 3, 4, 5, 6), 2); + final List result = RandomUtil.randomEles(ListUtil.toList(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 0ea0c8ee2..51657f172 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 @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.regex.PatternPool; import cn.hutool.core.regex.ReUtil; @@ -82,7 +82,7 @@ public class ReUtilTest { public void findAllTest() { // 查找所有匹配文本 final List resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<>()); - final ArrayList expected = CollUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34"); + final ArrayList expected = ListUtil.toList("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 b9c6eb0fe..707d4570e 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 @@ -1,7 +1,8 @@ package cn.hutool.core.util; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapBuilder; @@ -109,7 +110,7 @@ public class XmlUtilTest { final Map map = XmlUtil.xmlToMap(xml); Assert.assertEquals(1, map.size()); - Assert.assertEquals(CollUtil.newArrayList("张三", "李四"), map.get("name")); + Assert.assertEquals(ListUtil.toList("张三", "李四"), map.get("name")); } @Test @@ -137,7 +138,7 @@ public class XmlUtilTest { public void mapToXmlTest2() { // 测试List final Map map = MapBuilder.create(new LinkedHashMap()) - .put("Town", CollUtil.newArrayList("town1", "town2")) + .put("Town", ListUtil.toList("town1", "town2")) .build(); final Document doc = XmlUtil.mapToXml(map, "City"); @@ -157,7 +158,7 @@ public class XmlUtilTest { @Test public void readBySaxTest(){ - final Set eles = CollUtil.newHashSet( + final Set eles = SetUtil.newHashSet( "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 72f83bcb3..17abb34f8 100755 --- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java @@ -1,6 +1,6 @@ package cn.hutool.db; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.func.Func1; import cn.hutool.db.dialect.Dialect; import cn.hutool.db.handler.BeanListHandler; @@ -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(CollUtil.newArrayList(fields), where, rsh); + return find(ListUtil.toList(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 5f39e70cc..2a1c7e95f 100755 --- a/hutool-db/src/main/java/cn/hutool/db/Entity.java +++ b/hutool-db/src/main/java/cn/hutool/db/Entity.java @@ -1,6 +1,7 @@ package cn.hutool.db; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.map.Dict; import cn.hutool.core.reflect.MethodUtil; @@ -155,7 +156,7 @@ public class Entity extends Dict { */ public Entity setFieldNames(final Collection fieldNames) { if (CollUtil.isNotEmpty(fieldNames)) { - this.fieldNames = CollUtil.newHashSet(true, fieldNames); + this.fieldNames = SetUtil.newHashSet(true, fieldNames); } return this; } @@ -168,7 +169,7 @@ public class Entity extends Dict { */ public Entity setFieldNames(final String... fieldNames) { if (ArrayUtil.isNotEmpty(fieldNames)) { - this.fieldNames = CollUtil.newLinkedHashSet(fieldNames); + this.fieldNames = SetUtil.newLinkedHashSet(fieldNames); } return this; } 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 966984027..05eea5691 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 @@ -1,6 +1,6 @@ package cn.hutool.db.sql; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.DbRuntimeException; import cn.hutool.db.Entity; @@ -113,7 +113,7 @@ public class Query implements Cloneable { * @return this */ public Query setFields(final String... fields) { - this.fields = CollUtil.newArrayList(fields); + this.fields = ListUtil.toList(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 b511bd1a7..2ab2a228f 100644 --- a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java @@ -1,6 +1,6 @@ package cn.hutool.db; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; import cn.hutool.db.handler.EntityListHandler; @@ -107,7 +107,7 @@ public class CRUDTest { @Test public void findTest() { - final List find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler()); + final List find = db.find(ListUtil.toList("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(CollUtil.newArrayList(data1, data2)); + final int[] result = db.insert(ListUtil.toList(data1, data2)); Console.log(result); } @@ -185,7 +185,7 @@ public class CRUDTest { Console.log(data1); - final int[] result = db.insert(CollUtil.newArrayList(data1)); + final int[] result = db.insert(ListUtil.toList(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 bd00ee57d..df07ed8e0 100755 --- a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java @@ -1,6 +1,6 @@ package cn.hutool.db; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.db.handler.EntityListHandler; @@ -31,7 +31,7 @@ public class ConcurentTest { for(int i = 0; i < 10000; i++) { ThreadUtil.execute(() -> { final List find; - find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler()); + find = db.find(ListUtil.toList("name AS name2"), Entity.create("user"), new EntityListHandler()); Console.log(find); }); } 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 5780f2386..d43ca226c 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 @@ -1,6 +1,6 @@ package cn.hutool.db.meta; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.SetUtil; import cn.hutool.core.text.StrUtil; import cn.hutool.db.ds.DSFactory; import org.junit.Assert; @@ -27,7 +27,7 @@ public class MetaUtilTest { @Test public void getTableMetaTest() { final Table table = MetaUtil.getTableMeta(ds, "user"); - Assert.assertEquals(CollUtil.newHashSet("id"), table.getPkNames()); + Assert.assertEquals(SetUtil.newHashSet("id"), table.getPkNames()); } @Test 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 a2c64eb15..1a217f9d5 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 @@ -1,6 +1,7 @@ package cn.hutool.extra.mail; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharUtil; @@ -433,7 +434,7 @@ public class MailUtil { } else if (StrUtil.contains(addresses, ';')) { result = StrUtil.splitTrim(addresses, ';'); } else { - result = CollUtil.newArrayList(addresses); + result = ListUtil.toList(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 b12fe9acc..5fa7fe886 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 @@ -1,6 +1,6 @@ package cn.hutool.http.server.action; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.http.server.HttpServerRequest; import cn.hutool.http.server.HttpServerResponse; @@ -58,7 +58,7 @@ public class RootAction implements Action { */ public RootAction(final File rootDir, final String... indexFileNames) { this.rootDir = rootDir; - this.indexFileNames = CollUtil.toList(indexFileNames); + this.indexFileNames = ListUtil.toList(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 d4f0f8265..5f766525f 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 @@ -1,6 +1,6 @@ package cn.hutool.http.useragent; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.regex.ReUtil; import java.util.List; @@ -27,7 +27,7 @@ public class Browser extends UserAgentInfo { /** * 支持的浏览器类型 */ - public static final List browers = CollUtil.newArrayList( + public static final List browers = ListUtil.toList( // 部分特殊浏览器是基于安卓、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 3fde6e7f7..eb2703647 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 @@ -1,6 +1,6 @@ package cn.hutool.http.useragent; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.regex.ReUtil; import java.util.List; @@ -21,7 +21,7 @@ public class Engine extends UserAgentInfo { /** * 支持的引擎类型 */ - public static final List engines = CollUtil.newArrayList( + public static final List engines = ListUtil.of( 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 23e1b50c7..47bb27806 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 @@ -1,6 +1,6 @@ package cn.hutool.http.useragent; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.regex.ReUtil; import java.util.List; @@ -23,7 +23,7 @@ public class OS extends UserAgentInfo { /** * 支持的引擎类型 */ - public static final List oses = CollUtil.newArrayList(// + public static final List oses = ListUtil.of(// 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 f4980470f..d329325a7 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 @@ -1,6 +1,6 @@ package cn.hutool.http.useragent; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import java.util.ArrayList; import java.util.List; @@ -49,7 +49,7 @@ public class Platform extends UserAgentInfo { /** * 支持的移动平台类型 */ - public static final List mobilePlatforms = CollUtil.newArrayList(// + public static final List mobilePlatforms = ListUtil.of(// WINDOWS_PHONE, // IPAD, // IPOD, // @@ -65,7 +65,7 @@ public class Platform extends UserAgentInfo { /** * 支持的桌面平台类型 */ - public static final List desktopPlatforms = CollUtil.newArrayList(// + public static final List desktopPlatforms = ListUtil.of(// new Platform("Windows", "windows"), // new Platform("Mac", "(macintosh|darwin)"), // new Platform("Linux", "linux"), // 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 c9a2a3e57..b76e818aa 100644 --- a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java @@ -1,6 +1,6 @@ package cn.hutool.json; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import lombok.Data; import org.junit.Assert; import org.junit.Test; @@ -19,7 +19,7 @@ public class IssueI1AU86Test { @Test public void toListTest() { - final List redisList = CollUtil.newArrayList( + final List redisList = ListUtil.toList( "{\"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 e5700c150..b2d4a8a23 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -1,6 +1,5 @@ package cn.hutool.json; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.io.FileUtil; @@ -98,7 +97,7 @@ public class JSONArrayTest { b2.setAkey("aValue2"); b2.setBkey("bValue2"); - final ArrayList list = CollUtil.newArrayList(b1, b2); + final ArrayList list = ListUtil.toList(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 48f074762..362e4b7c7 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.annotation.Alias; import cn.hutool.core.annotation.PropIgnore; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -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(CollUtil.newArrayList(new Seq("seq1"), new Seq("seq2"))); + userA.setSqs(ListUtil.toList(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(CollUtil.newArrayList(new Seq(null), new Seq("seq2"))); + userA.setSqs(ListUtil.toList(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(CollUtil.newArrayList("a", "b", "c")); + bean.setList(ListUtil.toList("a", "b", "c")); bean.setStrValue("strTest"); bean.setTestEnum(TestEnum.TYPE_B); @@ -565,7 +565,7 @@ public class JSONObjectTest { * * @author Looly */ - @SuppressWarnings("FieldCanBeLocal") + @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeStatic"}) public static class SameNameBean { private final String username = "123"; private final String userName = "abc"; 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 56d64b38d..266fda729 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java @@ -1,6 +1,5 @@ package cn.hutool.json; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Console; @@ -59,7 +58,7 @@ public class JSONUtilTest { a2.setDate(DateUtil.date()); a2.setName("AAAA222Name"); - final ArrayList list = CollUtil.newArrayList(a1, a2); + final ArrayList list = ListUtil.toList(a1, a2); final HashMap map = MapUtil.newHashMap(); map.put("total", 13); map.put("rows", list); 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 4b32997d1..9f8621c60 100644 --- a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java @@ -1,6 +1,6 @@ package cn.hutool.json; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import org.junit.Assert; import org.junit.Test; @@ -24,12 +24,12 @@ public class ParseBeanTest { c2.setTest("test2"); final B b1 = new B(); - b1.setCs(CollUtil.newArrayList(c1, c2)); + b1.setCs(ListUtil.toList(c1, c2)); final B b2 = new B(); - b2.setCs(CollUtil.newArrayList(c1, c2)); + b2.setCs(ListUtil.toList(c1, c2)); final A a = new A(); - a.setBs(CollUtil.newArrayList(b1, b2)); + a.setBs(ListUtil.toList(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 d3ad06d39..c406301bf 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 @@ -1,7 +1,7 @@ package cn.hutool.poi.excel; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.comparator.IndexedComparator; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; @@ -13,8 +13,8 @@ import cn.hutool.core.map.TableMap; import cn.hutool.core.map.multi.RowKeyTable; import cn.hutool.core.map.multi.Table; import cn.hutool.core.net.URLEncoder; -import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.CharsetUtil; import cn.hutool.poi.excel.cell.CellLocation; import cn.hutool.poi.excel.cell.CellUtil; import cn.hutool.poi.excel.style.Align; @@ -1017,7 +1017,7 @@ public class ExcelWriter extends ExcelBase { } } else if (rowBean instanceof Hyperlink) { // Hyperlink当成一个值 - return writeRow(CollUtil.newArrayList(rowBean), isWriteKeyAsHead); + return writeRow(ListUtil.toList(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(CollUtil.newArrayList(rowBean), isWriteKeyAsHead); + return writeRow(ListUtil.toList(rowBean), isWriteKeyAsHead); } return writeRow(rowMap, isWriteKeyAsHead); } 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 760f1c9b1..e8eafcde9 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 @@ -1,7 +1,7 @@ package cn.hutool.poi.word; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; @@ -94,7 +94,7 @@ public class TableUtil { rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false); } else { // 其它转为字符串默认输出 - writeRow(row, CollUtil.newArrayList(rowBean), isWriteKeyAsHead); + writeRow(row, ListUtil.toList(rowBean), isWriteKeyAsHead); return; } 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 1b3216aab..17d388a7a 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 @@ -1,6 +1,6 @@ package cn.hutool.poi.excel; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.map.MapUtil; @@ -30,7 +30,7 @@ public class BigExcelWriteTest { @Test @Ignore public void writeTest2() { - final List row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); 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 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + 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 = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(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 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + 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> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(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 = CollUtil.newArrayList(row1, row2); + final ArrayList> rows = ListUtil.toList(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 = CollUtil.newArrayList(bean1, bean2); + final List rows = ListUtil.toList(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 1f6c718a0..7c2f420b1 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 @@ -1,13 +1,12 @@ package cn.hutool.poi.excel; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Console; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.poi.excel.cell.setters.EscapeStrCellSetter; import cn.hutool.poi.excel.style.StyleUtil; @@ -47,12 +46,12 @@ public class ExcelWriteTest { @Test public void writeNoFlushTest(){ - final List row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); - final List> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5); + 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 ExcelWriter writer = ExcelUtil.getWriter(); writer.write(rows); @@ -62,13 +61,13 @@ public class ExcelWriteTest { @Test @Ignore public void testRowOrColumnCellStyle() { - final List row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + 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 = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("d:/test/style_line.xlsx"); overtimeWriter.write(rows, true); @@ -106,7 +105,7 @@ public class ExcelWriteTest { @Test @Ignore public void writeTest2() { - final List row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); final ExcelWriter overtimeWriter = ExcelUtil.getWriter("e:/excel/single_line.xlsx"); overtimeWriter.writeRow(row); overtimeWriter.close(); @@ -118,12 +117,12 @@ public class ExcelWriteTest { final ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1"); // 写出第一张表 - final List row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); writer.writeRow(row); // 写出第二张表 writer.setSheet("表格2"); - final List row2 = CollUtil.newArrayList("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2"); + final List row2 = ListUtil.toList("姓名2", "加班日期2", "下班时间2", "加班时长2", "餐补2", "车补次数2", "车补2", "总计2"); writer.writeRow(row2); // 生成文件或导出Excel @@ -135,13 +134,13 @@ public class ExcelWriteTest { @Test @Ignore public void writeTest() { - final List row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + 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 = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); for (int i = 0; i < 400; i++) { // 超大列表写出测试 rows.add(ObjUtil.clone(row1)); @@ -170,13 +169,13 @@ public class ExcelWriteTest { @Test @Ignore public void mergeTest() { - final List row1 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765); - final List row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676); - final List row3 = CollUtil.newArrayList("aa2", "bb2", "cc2", "dd2", DateUtil.date(), 0.111); - final List row4 = CollUtil.newArrayList("aa3", "bb3", "cc3", "dd3", DateUtil.date(), 35); - final List row5 = CollUtil.newArrayList("aa4", "bb4", "cc4", "dd4", DateUtil.date(), 28.00); + 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> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/mergeTest.xlsx"); @@ -214,7 +213,7 @@ public class ExcelWriteTest { row2.put("是否合格", false); row2.put("考试日期", DateUtil.date()); - final ArrayList> rows = CollUtil.newArrayList(row1, row2); + final ArrayList> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeMapTest.xlsx"); @@ -244,7 +243,7 @@ public class ExcelWriteTest { row2.put("是否合格", false); row2.put("考试日期", DateUtil.date()); - final ArrayList> rows = CollUtil.newArrayList(row1, row2); + final ArrayList> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("e:/excel/writeMapTest.xlsx"); @@ -326,7 +325,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = CollUtil.newArrayList(row1, row2); + final List> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final String file = "d:/test/writeMapAlias.xlsx"; FileUtil.del(file); @@ -361,7 +360,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = CollUtil.newArrayList(row1, row2); + final List> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final String file = "f:/test/test_alias.xlsx"; FileUtil.del(file); @@ -394,7 +393,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = CollUtil.newArrayList(row1, row2); + final List> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final String file = "d:/test/test_alias.xls"; final ExcelWriter writer = ExcelUtil.getWriter(file, "test1"); @@ -425,7 +424,7 @@ public class ExcelWriteTest { row2.put("score", 32.30); row2.put("examDate", DateUtil.date()); - final List> rows = CollUtil.newArrayList(row1, row2); + final List> rows = ListUtil.toList(row1, row2); // 通过工具类创建writer final String file = "d:/test/test_alias.xls"; final ExcelWriter writer = ExcelUtil.getWriter(file, "test1"); @@ -459,7 +458,7 @@ public class ExcelWriteTest { bean2.setScore(38.50); bean2.setExamDate(DateUtil.date()); - final List rows = CollUtil.newArrayList(bean1, bean2); + final List rows = ListUtil.toList(bean1, bean2); // 通过工具类创建writer final String file = "e:/writeBeanTest.xlsx"; FileUtil.del(file); @@ -491,7 +490,7 @@ public class ExcelWriteTest { order1.setNum("456"); order1.setBody("body2"); - final List rows = CollUtil.newArrayList(order1, order2); + final List rows = ListUtil.toList(order1, order2); // 通过工具类创建writer final String file = "f:/test/writeBeanTest2.xlsx"; FileUtil.del(file); @@ -518,7 +517,7 @@ public class ExcelWriteTest { @Test @Ignore public void addSelectTest() { - final List row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); + final List row = ListUtil.toList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计"); final ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx"); overtimeWriter.writeCellValue(3, 4, "AAAA"); overtimeWriter.addSelect(3, 4, row.toArray(new String[0])); @@ -684,13 +683,13 @@ public class ExcelWriteTest { @Test @Ignore public void writeSecHeadRowTest() { - final List row1 = CollUtil.newArrayList(1, "aa", "bb", "cc", "dd", "ee"); - final List row2 = CollUtil.newArrayList(2, "aa1", "bb1", "cc1", "dd1", "ee1"); - final List row3 = CollUtil.newArrayList(3, "aa2", "bb2", "cc2", "dd2", "ee2"); - final List row4 = CollUtil.newArrayList(4, "aa3", "bb3", "cc3", "dd3", "ee3"); - final List row5 = CollUtil.newArrayList(5, "aa4", "bb4", "cc4", "dd4", "ee4"); + 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> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5); + final List> rows = ListUtil.toList(row1, row2, row3, row4, row5); // 通过工具类创建writer final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeSecHeadRowTest.xlsx"); @@ -719,7 +718,7 @@ public class ExcelWriteTest { writer.merge(2, 2, 4, 5, "DDEE", true); writer.setCurrentRow(3); - final List sechead = CollUtil.newArrayList("AA", "BB", "DD", "EE"); + final List sechead = ListUtil.toList("AA", "BB", "DD", "EE"); writer.writeSecHeadRow(sechead); // 一次性写出内容，使用默认样式 writer.write(rows); 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 895a94749..a0dd7bbdd 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 @@ -1,6 +1,5 @@ package cn.hutool.poi.word; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -49,7 +48,7 @@ public class WordWriterTest { map.put("成绩", 88.32); map.put("是否合格", true); - writer.addTable(CollUtil.newArrayList(map)); + writer.addTable(ListUtil.toList(map)); writer.flush(FileUtil.file("d:/test/test.docx")); } @@ -72,7 +71,7 @@ public class WordWriterTest { data2.put("是否合格", false); data2.put("考试日期", DateUtil.date()); - final ArrayList> mapArrayList = CollUtil.newArrayList(data, data2); + final ArrayList> mapArrayList = ListUtil.toList(data, data2); // 添加段落（标题） writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分"); 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 d201f1c8f..89247575f 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java @@ -1,6 +1,6 @@ package cn.hutool.setting; -import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; @@ -13,9 +13,9 @@ import cn.hutool.core.io.watch.SimpleWatcher; import cn.hutool.core.io.watch.WatchMonitor; import cn.hutool.core.io.watch.WatchUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; import cn.hutool.log.StaticLog; import cn.hutool.setting.dialect.Props; @@ -437,7 +437,7 @@ public class Setting extends AbsSetting implements Map { * @return 获得所有分组名 */ public List getGroups() { - return CollUtil.newArrayList(this.groupedMap.keySet()); + return ListUtil.toList(this.groupedMap.keySet()); } /**