diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java index b1f29de28..f312497a5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java @@ -1,6 +1,6 @@ package cn.hutool.core.cache; -import cn.hutool.core.collection.TransIter; +import cn.hutool.core.collection.iter.TransIter; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutableObj; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java b/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java index 62337f8ef..cbfb6c9a3 100755 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java @@ -1,6 +1,6 @@ package cn.hutool.core.cache.impl; -import cn.hutool.core.collection.CopiedIter; +import cn.hutool.core.collection.iter.CopiedIter; import java.util.Iterator; import java.util.concurrent.locks.ReentrantLock; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java b/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java index 590a6cdd0..6a3777b9b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java @@ -1,6 +1,6 @@ package cn.hutool.core.cache.impl; -import cn.hutool.core.collection.CopiedIter; +import cn.hutool.core.collection.iter.CopiedIter; import java.util.Iterator; import java.util.concurrent.locks.StampedLock; 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 21a69adfb..16475580e 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 @@ -1,6 +1,10 @@ package cn.hutool.core.collection; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.iter.ArrayIter; +import cn.hutool.core.collection.iter.EnumerationIter; +import cn.hutool.core.collection.iter.IterUtil; +import cn.hutool.core.collection.iter.IteratorEnumeration; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.comparator.PinyinComparator; import cn.hutool.core.comparator.PropertyComparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java deleted file mode 100644 index 66d89dc9b..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.hutool.core.collection; - -/** - * 集合相关工具类，包括数组，是 {@link CollUtil} 的别名工具类 - * - * @author xiaoleilu - * @see CollUtil - */ -public class CollectionUtil extends CollUtil{ -} diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java index 17800157f..e1805b257 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java @@ -1,5 +1,9 @@ package cn.hutool.core.collection; +import cn.hutool.core.collection.partition.AvgPartition; +import cn.hutool.core.collection.partition.Partition; +import cn.hutool.core.collection.partition.RandomAccessAvgPartition; +import cn.hutool.core.collection.partition.RandomAccessPartition; import cn.hutool.core.comparator.PinyinComparator; import cn.hutool.core.comparator.PropertyComparator; import cn.hutool.core.lang.func.Matcher; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java b/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java index 5408483ac..ca5763f7d 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java @@ -1,5 +1,6 @@ package cn.hutool.core.collection; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.lang.Assert; import java.util.AbstractCollection; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java index 94db0ef6d..7307dbbb9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ComputeIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/ComputeIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java index 86de3a064..9c0cb663e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ComputeIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java index 568f34494..46537fcdd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java @@ -1,4 +1,6 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; + +import cn.hutool.core.collection.ListUtil; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/EnumerationIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/collection/EnumerationIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java index 3974a1bee..cde475c74 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/EnumerationIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java @@ -1,4 +1,6 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; + +import cn.hutool.core.collection.iter.IterableIter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java index 1d469f2c1..6ace3bbc7 --- a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import cn.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterChain.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/IterChain.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java index 7d4b93932..712e66efc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterChain.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import cn.hutool.core.lang.Chain; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java index ba5006dbc..c793c6424 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java @@ -1,5 +1,6 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.func.Editor; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterableIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/collection/IterableIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java index e5e91e5db..d09f337a1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterableIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IteratorEnumeration.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/IteratorEnumeration.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java index 9beea2ca7..3d6b0d4be 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IteratorEnumeration.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/LineIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/LineIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java index e6bf99c42..aa53e4a50 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/LineIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java @@ -1,5 +1,7 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; +import cn.hutool.core.collection.iter.ComputeIter; +import cn.hutool.core.collection.iter.IterableIter; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/NodeListIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/NodeListIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java index e12925542..b7e6c3edd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/NodeListIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import cn.hutool.core.lang.Assert; import org.w3c.dom.Node; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/PartitionIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/collection/PartitionIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java index ab8240c27..9c42bded5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/PartitionIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java @@ -1,4 +1,6 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; + +import cn.hutool.core.collection.iter.IterableIter; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ResettableIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/collection/ResettableIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java index 837c7dcda..ef4b111bd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ResettableIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/TransIter.java rename to hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java index 116fd697a..dae8998c1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/TransIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.iter; import cn.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java new file mode 100644 index 000000000..de1c738ca --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java @@ -0,0 +1,7 @@ +/** + * {@link java.util.Iterator}和{@link java.lang.Iterable}相关封装 + * + * @author looly + * + */ +package cn.hutool.core.collection.iter; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/AvgPartition.java b/hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/AvgPartition.java rename to hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java index d7ab3b5f7..aff021887 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/AvgPartition.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java @@ -1,5 +1,6 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.partition; +import cn.hutool.core.collection.partition.Partition; import cn.hutool.core.lang.Assert; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/Partition.java b/hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/Partition.java rename to hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java index fa555b974..6c3dc374f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/Partition.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.partition; import java.util.AbstractList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessAvgPartition.java b/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessAvgPartition.java rename to hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java index fce4c8b17..6b34c31d3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessAvgPartition.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessPartition.java b/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessPartition.java rename to hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java index d6cb3aad2..4d7983213 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessPartition.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package cn.hutool.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java index 038bd7c7a..088aac50e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.compress; -import cn.hutool.core.collection.EnumerationIter; +import cn.hutool.core.collection.iter.EnumerationIter; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FastByteArrayOutputStream; import cn.hutool.core.io.FileUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java index 38cfbd9b3..56819c17b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java @@ -1,6 +1,6 @@ package cn.hutool.core.convert.impl; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ArrayUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java index cb8e3a5f5..d38d40d0e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.io; -import cn.hutool.core.collection.LineIter; +import cn.hutool.core.collection.iter.LineIter; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.copy.ReaderWriterCopier; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java index 6a047f936..33a95d23b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.resource; -import cn.hutool.core.collection.EnumerationIter; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.EnumerationIter; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.util.CharsetUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java index 011c06bf4..8a3baa2e6 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.classloader.ClassLoaderUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.EnumerationIter; +import cn.hutool.core.collection.iter.EnumerationIter; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.resource.ResourceUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 5a67ced80..56f6a7526 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -24,7 +24,7 @@ */ package cn.hutool.core.lang; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.func.VoidFunc0; import cn.hutool.core.text.StrUtil; @@ -110,7 +110,7 @@ public class Opt { * @since 5.7.17 */ public static > Opt ofEmptyAble(R value) { - return CollectionUtil.isEmpty(value) ? empty() : new Opt<>(value); + return CollUtil.isEmpty(value) ? empty() : new Opt<>(value); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java b/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java index c845e9b3a..f15c105c2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang; import cn.hutool.core.clone.CloneSupport; -import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.collection.iter.ArrayIter; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java b/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java index bb62ddd59..ac040164f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java @@ -1,7 +1,7 @@ package cn.hutool.core.map.multi; -import cn.hutool.core.collection.IterUtil; -import cn.hutool.core.collection.TransIter; +import cn.hutool.core.collection.iter.IterUtil; +import cn.hutool.core.collection.iter.TransIter; import cn.hutool.core.util.ObjUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java b/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java index 0b4bdda7e..201b7c6d0 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java @@ -1,9 +1,9 @@ package cn.hutool.core.map.multi; import cn.hutool.core.builder.Builder; -import cn.hutool.core.collection.ComputeIter; -import cn.hutool.core.collection.IterUtil; -import cn.hutool.core.collection.TransIter; +import cn.hutool.core.collection.iter.ComputeIter; +import cn.hutool.core.collection.iter.IterUtil; +import cn.hutool.core.collection.iter.TransIter; import cn.hutool.core.map.AbsEntry; import cn.hutool.core.map.MapUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java index 43a93bba0..ebb81138b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.net; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.EnumerationIter; +import cn.hutool.core.collection.iter.EnumerationIter; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java index ae4bd5892..6ca4f9dd0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java @@ -2,7 +2,7 @@ package cn.hutool.core.net.url; import cn.hutool.core.codec.PercentCodec; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.TableMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java index 3459bc509..dd83f8fed 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java @@ -1,7 +1,7 @@ package cn.hutool.core.text; -import cn.hutool.core.collection.ArrayIter; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.ArrayIter; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java index d4469964b..4c290e0fd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.split; -import cn.hutool.core.collection.ComputeIter; +import cn.hutool.core.collection.iter.ComputeIter; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.finder.TextFinder; import cn.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java index 5ff1d65be..855f31e11 100755 --- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.tree; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.tree.parser.DefaultNodeParser; import cn.hutool.core.tree.parser.NodeParser; import cn.hutool.core.util.ObjUtil; 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 d9c6b45bb..bac2f08d9 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,7 +1,6 @@ package cn.hutool.core.util; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.UniqueKeySet; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.exceptions.UtilException; @@ -1301,7 +1300,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @since 3.0.9 */ public static T[] toArray(Iterable iterable, Class componentType) { - return toArray(CollectionUtil.toCollection(iterable), componentType); + return toArray(CollUtil.toCollection(iterable), componentType); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java index 14d67e3d2..fa6b117a2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; 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 f9cfb17e9..ede593e13 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 @@ -1,5 +1,7 @@ package cn.hutool.core.collection; +import cn.hutool.core.collection.iter.FilterIter; +import cn.hutool.core.collection.iter.IterUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.Assert; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java index e1b69b1f6..27371a88d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java @@ -1,5 +1,7 @@ package cn.hutool.core.collection; +import cn.hutool.core.collection.iter.LineIter; +import cn.hutool.core.collection.iter.PartitionIter; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.NumberUtil; import org.junit.Assert; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java index 41d2d19c3..8173bfa4c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java @@ -1,6 +1,6 @@ package cn.hutool.core.lang; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -151,7 +151,7 @@ public class OptTest { public void ofEmptyAbleTest() { // 以前，输入一个CollectionUtil感觉要命，类似前缀的类一大堆，代码补全形同虚设(在项目中起码要输入完CollectionUtil才能在第一个调出这个函数) // 关键它还很常用，判空和判空集合真的太常用了... - List past = Opt.ofNullable(Collections.emptyList()).filter(CollectionUtil::isNotEmpty).orElseGet(() -> Collections.singletonList("hutool")); + List past = Opt.ofNullable(Collections.emptyList()).filter(CollUtil::isNotEmpty).orElseGet(() -> Collections.singletonList("hutool")); // 现在，一个ofEmptyAble搞定 List hutool = Opt.ofEmptyAble(Collections.emptyList()).orElseGet(() -> Collections.singletonList("hutool")); Assert.assertEquals(past, hutool); diff --git a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java index 232492f10..bd9a2878e 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.collection.EnumerationIter; +import cn.hutool.core.collection.iter.EnumerationIter; import cn.hutool.core.lang.Console; import org.junit.Ignore; import org.junit.Test; 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 327a628f9..01703a311 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.CollectionUtil; +import cn.hutool.core.collection.CollUtil; 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() { // 查找所有匹配文本 List resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<>()); - ArrayList expected = CollectionUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34"); + ArrayList expected = CollUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34"); Assert.assertEquals(expected, resultFindAll); } 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 988fcf737..87e324abf 100755 --- a/hutool-db/src/main/java/cn/hutool/db/Entity.java +++ b/hutool-db/src/main/java/cn/hutool/db/Entity.java @@ -1,12 +1,12 @@ package cn.hutool.db; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.map.Dict; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Func0; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.map.Dict; import cn.hutool.core.reflect.ReflectUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.CharsetUtil; import cn.hutool.db.sql.SqlUtil; import java.nio.charset.Charset; @@ -154,8 +154,8 @@ public class Entity extends Dict { * @return 自身 */ public Entity setFieldNames(Collection fieldNames) { - if (CollectionUtil.isNotEmpty(fieldNames)) { - this.fieldNames = CollectionUtil.newHashSet(true, fieldNames); + if (CollUtil.isNotEmpty(fieldNames)) { + this.fieldNames = CollUtil.newHashSet(true, fieldNames); } return this; } @@ -168,7 +168,7 @@ public class Entity extends Dict { */ public Entity setFieldNames(String... fieldNames) { if (ArrayUtil.isNotEmpty(fieldNames)) { - this.fieldNames = CollectionUtil.newLinkedHashSet(fieldNames); + this.fieldNames = CollUtil.newLinkedHashSet(fieldNames); } return this; } diff --git a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java b/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java index 915d5d2e0..29aea1380 100644 --- a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java @@ -1,6 +1,6 @@ package cn.hutool.db; -import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.collection.iter.ArrayIter; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java index bf720deca..f0a8af498 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java @@ -1,9 +1,9 @@ package cn.hutool.db.ds.pooled; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.db.DbRuntimeException; import cn.hutool.db.ds.simple.AbstractDataSource; @@ -146,7 +146,7 @@ public class PooledDataSource extends AbstractDataSource { @Override synchronized public void close() { - if (CollectionUtil.isNotEmpty(this.freePool)) { + if (CollUtil.isNotEmpty(this.freePool)) { this.freePool.forEach(PooledConnection::release); this.freePool.clear(); this.freePool = null; 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 3ad95f9c9..c11514263 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.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.DbRuntimeException; import cn.hutool.db.Entity; @@ -12,7 +12,7 @@ import java.util.Collection; * 查询对象，用于传递查询所需的字段值
* 查询对象根据表名（可以多个），多个条件 {@link Condition} 构建查询对象完成查询。
* 如果想自定义返回结果，则可在查询对象中自定义要查询的字段名，分页{@link Page}信息来自定义结果。 - * + * * @author Looly * */ @@ -40,7 +40,7 @@ public class Query { // --------------------------------------------------------------- Constructor start /** * 构造 - * + * * @param tableNames 表名 */ public Query(String... tableNames) { @@ -50,7 +50,7 @@ public class Query { /** * 构造 - * + * * @param where 条件语句 * @param tableNames 表名 */ @@ -60,7 +60,7 @@ public class Query { /** * 构造 - * + * * @param where 条件语句 * @param page 分页 * @param tableNames 表名 @@ -71,7 +71,7 @@ public class Query { /** * 构造 - * + * * @param fields 字段 * @param tableNames 表名 * @param where 条件 @@ -88,7 +88,7 @@ public class Query { // --------------------------------------------------------------- Getters and Setters start /** * 获得查询的字段名列表 - * + * * @return 查询的字段名列表 */ public Collection getFields() { @@ -97,7 +97,7 @@ public class Query { /** * 设置查询的字段名列表 - * + * * @param fields 查询的字段名列表 * @return this */ @@ -108,18 +108,18 @@ public class Query { /** * 设置查询的字段名列表 - * + * * @param fields 查询的字段名列表 * @return this */ public Query setFields(String... fields) { - this.fields = CollectionUtil.newArrayList(fields); + this.fields = CollUtil.newArrayList(fields); return this; } /** * 获得表名数组 - * + * * @return 表名数组 */ public String[] getTableNames() { @@ -128,7 +128,7 @@ public class Query { /** * 设置表名 - * + * * @param tableNames 表名 * @return this */ @@ -139,7 +139,7 @@ public class Query { /** * 获得条件语句 - * + * * @return 条件语句 */ public Condition[] getWhere() { @@ -148,7 +148,7 @@ public class Query { /** * 设置条件语句 - * + * * @param where 条件语句 * @return this */ @@ -159,7 +159,7 @@ public class Query { /** * 获得分页对象，无分页返回{@code null} - * + * * @return 分页对象 or {@code null} */ public Page getPage() { @@ -168,7 +168,7 @@ public class Query { /** * 设置分页对象 - * + * * @param page 分页对象 * @return this */ @@ -180,7 +180,7 @@ public class Query { /** * 获得第一个表名 - * + * * @return 表名 * @throws DbRuntimeException 没有表 */ diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java index de04e7084..9fa192ef1 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java @@ -1,9 +1,9 @@ package cn.hutool.db.sql; import cn.hutool.core.builder.Builder; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.DbRuntimeException; import cn.hutool.db.Entity; import cn.hutool.db.dialect.DialectName; @@ -277,14 +277,14 @@ public class SqlBuilder implements Builder { sql.append("DISTINCT "); } - if (CollectionUtil.isEmpty(fields)) { + if (CollUtil.isEmpty(fields)) { sql.append("*"); } else { if (null != wrapper) { // 包装字段名 fields = wrapper.wrap(fields); } - sql.append(CollectionUtil.join(fields, StrUtil.COMMA)); + sql.append(CollUtil.join(fields, StrUtil.COMMA)); } return this; diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java index 4b5bbef47..405ab9dee 100755 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java @@ -1,6 +1,6 @@ package cn.hutool.db.sql; -import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.collection.iter.ArrayIter; import cn.hutool.core.lang.func.Func1; import cn.hutool.db.DbUtil; import cn.hutool.db.StatementUtil; diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java index 14da8f2b4..702875a23 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java @@ -1,10 +1,9 @@ package cn.hutool.db.sql; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.text.StrUtil; import cn.hutool.db.Entity; import java.io.Serializable; @@ -114,7 +113,7 @@ public class Wrapper implements Serializable { //对于Oracle这类数据库，表名中包含用户名需要单独拆分包装 if (field.contains(StrUtil.DOT)) { final Collection target = CollUtil.edit(StrUtil.split(field, CharUtil.DOT, 2), t -> StrUtil.format("{}{}{}", preWrapQuote, t, sufWrapQuote)); - return CollectionUtil.join(target, StrUtil.DOT); + return CollUtil.join(target, StrUtil.DOT); } return StrUtil.format("{}{}{}", preWrapQuote, field, sufWrapQuote); @@ -148,7 +147,7 @@ public class Wrapper implements Serializable { * @return 包装后的字段名 */ public Collection wrap(Collection fields) { - if (CollectionUtil.isEmpty(fields)) { + if (CollUtil.isEmpty(fields)) { return fields; } 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 348dde92e..3cb6210be 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.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.db.handler.EntityListHandler; @@ -33,7 +33,7 @@ public class ConcurentTest { ThreadUtil.execute(() -> { List find; try { - find = db.find(CollectionUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler()); + find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), new EntityListHandler()); } catch (SQLException e) { throw new DbRuntimeException(e); } 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 9345864ad..964c7863d 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.CollectionUtil; +import cn.hutool.core.collection.CollUtil; 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() { Table table = MetaUtil.getTableMeta(ds, "user"); - Assert.assertEquals(CollectionUtil.newHashSet("id"), table.getPkNames()); + Assert.assertEquals(CollUtil.newHashSet("id"), table.getPkNames()); } @Test diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java index 8461fee5e..27d29aa0d 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java @@ -3,8 +3,8 @@ package cn.hutool.extra.servlet; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.collection.ArrayIter; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.ArrayIter; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java index 9eb1000ab..899b1e212 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java @@ -3,8 +3,8 @@ package cn.hutool.extra.servlet; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.collection.ArrayIter; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.ArrayIter; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java index ed4dc2963..0303a6b74 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java @@ -1,6 +1,6 @@ package cn.hutool.extra.tokenizer; -import cn.hutool.core.collection.ComputeIter; +import cn.hutool.core.collection.iter.ComputeIter; import java.util.Iterator; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java index 7fb11f873..a9a9bf190 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java @@ -1,6 +1,6 @@ package cn.hutool.extra.tokenizer; -import cn.hutool.core.collection.IterableIter; +import cn.hutool.core.collection.iter.IterableIter; /** * 分词结果接口定义
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java index 875d8880f..870ca1617 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.tokenizer; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.extra.tokenizer.engine.analysis.SmartcnEngine; import cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine; import cn.hutool.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine; diff --git a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java b/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java index cd3d0ee44..841ca1fa0 100644 --- a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java +++ b/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java @@ -1,6 +1,6 @@ package cn.hutool.http; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrUtil; @@ -70,7 +70,7 @@ public enum GlobalHeaders { */ public String header(String name) { final List values = headerList(name); - if (CollectionUtil.isEmpty(values)) { + if (CollUtil.isEmpty(values)) { return null; } return values.get(0); @@ -116,7 +116,7 @@ public enum GlobalHeaders { synchronized public GlobalHeaders header(String name, String value, boolean isOverride) { if (null != name && null != value) { final List values = headers.get(name.trim()); - if (isOverride || CollectionUtil.isEmpty(values)) { + if (isOverride || CollUtil.isEmpty(values)) { final ArrayList valueList = new ArrayList<>(); valueList.add(value); headers.put(name.trim(), valueList); diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpBase.java b/hutool-http/src/main/java/cn/hutool/http/HttpBase.java index 3bca14e82..50622c265 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpBase.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpBase.java @@ -1,11 +1,10 @@ package cn.hutool.http; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; import java.util.ArrayList; @@ -66,7 +65,7 @@ public abstract class HttpBase { */ public String header(String name) { final List values = headerList(name); - if (CollectionUtil.isEmpty(values)) { + if (CollUtil.isEmpty(values)) { return null; } return values.get(0); @@ -113,7 +112,7 @@ public abstract class HttpBase { public T header(String name, String value, boolean isOverride) { if (null != name && null != value) { final List values = headers.get(name.trim()); - if (isOverride || CollectionUtil.isEmpty(values)) { + if (isOverride || CollUtil.isEmpty(values)) { final ArrayList valueList = new ArrayList<>(); valueList.add(value); headers.put(name.trim(), valueList); diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java index 5180224ae..2e93bc12d 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java @@ -1,7 +1,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanPath; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.MutablePair; import cn.hutool.core.map.MapUtil; @@ -163,7 +163,7 @@ public class JSONObject extends MapWrapper implements JSON, JSON * @throws JSONException If any of the values are non-finite numbers. */ public JSONArray toJSONArray(Collection names) throws JSONException { - if (CollectionUtil.isEmpty(names)) { + if (CollUtil.isEmpty(names)) { return null; } final JSONArray ja = new JSONArray(this.config); diff --git a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java index 3f7165468..1b06d2172 100755 --- a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java +++ b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java @@ -1,7 +1,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.collection.iter.ArrayIter; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.func.Filter; 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 87e9e608c..45c2c578a 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java @@ -3,15 +3,14 @@ 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.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.json.test.bean.JSONBean; import cn.hutool.json.test.bean.ResultDto; import cn.hutool.json.test.bean.Seq; @@ -239,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(CollectionUtil.newArrayList(new Seq("seq1"), new Seq("seq2"))); + userA.setSqs(CollUtil.newArrayList(new Seq("seq1"), new Seq("seq2"))); JSONObject json = JSONUtil.parseObj(userA); UserA userA2 = json.toBean(UserA.class); @@ -321,7 +320,7 @@ public class JSONObjectTest { UserA userA = new UserA(); userA.setName("nameTest"); userA.setDate(new Date()); - userA.setSqs(CollectionUtil.newArrayList(new Seq(null), new Seq("seq2"))); + userA.setSqs(CollUtil.newArrayList(new Seq(null), new Seq("seq2"))); JSONObject json = JSONUtil.parseObj(userA, false); 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 3be9a3fbb..2549da64b 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,6 @@ package cn.hutool.json; -import cn.hutool.core.collection.CollectionUtil; +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 +59,7 @@ public class JSONUtilTest { a2.setDate(DateUtil.date()); a2.setName("AAAA222Name"); - ArrayList list = CollectionUtil.newArrayList(a1, a2); + ArrayList list = CollUtil.newArrayList(a1, a2); HashMap map = MapUtil.newHashMap(); map.put("total", 13); map.put("rows", list); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java index e76068cd6..0b16b0ddb 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java @@ -1,6 +1,6 @@ package cn.hutool.poi.csv; -import cn.hutool.core.collection.ComputeIter; +import cn.hutool.core.collection.iter.ComputeIter; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java index 9c14cf7cd..7d6e65fe6 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java @@ -1,7 +1,7 @@ package cn.hutool.poi.csv; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.collection.iter.ArrayIter; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java index dc904d937..42827eb38 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java @@ -1,6 +1,6 @@ package cn.hutool.poi.excel; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrUtil; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; @@ -63,7 +63,7 @@ public class ExcelPicUtil { private static Map getPicMapXls(HSSFWorkbook workbook, int sheetIndex) { final Map picMap = new HashMap<>(); final List pictures = workbook.getAllPictures(); - if (CollectionUtil.isNotEmpty(pictures)) { + if (CollUtil.isNotEmpty(pictures)) { final HSSFSheet sheet = workbook.getSheetAt(sheetIndex); HSSFClientAnchor anchor; int pictureIndex; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java index 30c590ad8..ad306377d 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java @@ -1,7 +1,7 @@ package cn.hutool.poi.excel.reader; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.text.StrUtil; import org.apache.poi.ss.usermodel.Sheet; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java index 60d888ebc..4bcf3c9b9 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java @@ -1,7 +1,7 @@ package cn.hutool.poi.excel.sax.handler; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java index a4c53dc0f..f18abd342 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java @@ -1,6 +1,6 @@ package cn.hutool.poi.excel.sax.handler; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; 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 4d27b5294..a984c5138 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 @@ -2,7 +2,7 @@ package cn.hutool.poi.word; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; diff --git a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java index c6f68c43d..6bf87d984 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java @@ -1,12 +1,12 @@ package cn.hutool.setting; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.IoUtil; +import cn.hutool.core.net.URLUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.net.URLUtil; import java.io.BufferedReader; import java.io.File; @@ -285,7 +285,7 @@ public class GroupedSet extends HashMap> { } else { // 测试单个值 final LinkedHashSet valueSet = getValues(group); - if (CollectionUtil.isEmpty(valueSet)) { + if (CollUtil.isEmpty(valueSet)) { return false; } @@ -303,7 +303,7 @@ public class GroupedSet extends HashMap> { */ public boolean contains(String group, Collection values) { final LinkedHashSet valueSet = getValues(group); - if (CollectionUtil.isEmpty(values) || CollectionUtil.isEmpty(valueSet)) { + if (CollUtil.isEmpty(values) || CollUtil.isEmpty(valueSet)) { return false; }