From 85488f8317ab1432f550fcf1459a1d7b041889b9 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 3 Apr 2023 13:41:22 +0800 Subject: [PATCH] fix code --- .../core/annotation/CombinationAnnotationElement.java | 2 +- .../main/java/org/dromara/hutool/core/array/ArrayUtil.java | 4 ++-- .../main/java/org/dromara/hutool/core/bean/BeanUtil.java | 2 +- .../org/dromara/hutool/core/collection/CollStreamUtil.java | 1 + .../java/org/dromara/hutool/core/collection/CollUtil.java | 2 ++ .../dromara/hutool/core/collection/CollectionOperation.java | 1 + .../dromara/hutool/core/collection/ConcurrentHashSet.java | 1 + .../dromara/hutool/core/collection/TransSpliterator.java | 6 ++++++ .../{ => queue}/MemorySafeLinkedBlockingQueue.java | 2 +- .../hutool/core/collection/{ => set}/SetFromMap.java | 2 +- .../dromara/hutool/core/collection/{ => set}/SetUtil.java | 2 +- .../hutool/core/collection/{ => set}/UniqueKeySet.java | 2 +- .../src/main/java/org/dromara/hutool/core/map/Dict.java | 2 +- .../main/java/org/dromara/hutool/core/map/ForestMap.java | 2 +- .../java/org/dromara/hutool/core/reflect/MethodUtil.java | 4 ++-- .../src/main/java/org/dromara/hutool/core/regex/ReUtil.java | 2 +- .../java/org/dromara/hutool/core/text/dfa/StopChar.java | 2 +- .../java/org/dromara/hutool/core/text/dfa/WordTree.java | 2 +- .../main/java/org/dromara/hutool/core/util/BooleanUtil.java | 2 +- .../java/org/dromara/hutool/core/bean/BeanUtilTest.java | 2 +- .../org/dromara/hutool/core/collection/CollUtilTest.java | 1 + .../org/dromara/hutool/core/collection/IterUtilTest.java | 1 + .../core/collection/MemorySafeLinkedBlockingQueueTest.java | 1 + .../dromara/hutool/core/collection/UniqueKeySetTest.java | 1 + .../java/org/dromara/hutool/core/convert/CastUtilTest.java | 2 +- .../java/org/dromara/hutool/core/convert/ConvertTest.java | 2 +- .../dromara/hutool/core/lang/func/PredicateUtilTest.java | 2 +- .../java/org/dromara/hutool/core/stream/StreamUtilTest.java | 2 +- .../java/org/dromara/hutool/core/text/StrJoinerTest.java | 2 +- .../test/java/org/dromara/hutool/core/util/XmlUtilTest.java | 2 +- hutool-db/src/main/java/org/dromara/hutool/db/Entity.java | 2 +- .../test/java/org/dromara/hutool/db/meta/MetaUtilTest.java | 2 +- 32 files changed, 40 insertions(+), 25 deletions(-) rename hutool-core/src/main/java/org/dromara/hutool/core/collection/{ => queue}/MemorySafeLinkedBlockingQueue.java (98%) rename hutool-core/src/main/java/org/dromara/hutool/core/collection/{ => set}/SetFromMap.java (98%) rename hutool-core/src/main/java/org/dromara/hutool/core/collection/{ => set}/SetUtil.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/collection/{ => set}/UniqueKeySet.java (99%) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java index 4f3d14402..58aa72652 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.annotation; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.map.TableMap; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java index 9f18f61ce..dc3ebac5c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java @@ -13,8 +13,8 @@ package org.dromara.hutool.core.array; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; -import org.dromara.hutool.core.collection.UniqueKeySet; +import org.dromara.hutool.core.collection.set.SetUtil; +import org.dromara.hutool.core.collection.set.UniqueKeySet; import org.dromara.hutool.core.collection.iter.IterUtil; import org.dromara.hutool.core.comparator.CompareUtil; import org.dromara.hutool.core.convert.Convert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java index eec392df1..08e8f1aff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.copier.CopyOptions; import org.dromara.hutool.core.bean.copier.ValueProvider; import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.lang.mutable.MutableEntry; import org.dromara.hutool.core.map.CaseInsensitiveMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java index 183e17280..e8285d574 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java @@ -13,6 +13,7 @@ package org.dromara.hutool.core.collection; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.lang.Opt; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.stream.CollectorUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java index 6351d9f7b..c10f10b92 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java @@ -17,6 +17,8 @@ import org.dromara.hutool.core.codec.hash.Hash32; import org.dromara.hutool.core.collection.iter.IterUtil; import org.dromara.hutool.core.collection.iter.IteratorEnumeration; import org.dromara.hutool.core.collection.queue.BoundedPriorityQueue; +import org.dromara.hutool.core.collection.set.SetUtil; +import org.dromara.hutool.core.collection.set.UniqueKeySet; import org.dromara.hutool.core.comparator.CompareUtil; import org.dromara.hutool.core.comparator.PinyinComparator; import org.dromara.hutool.core.comparator.PropertyComparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java index 340421e69..bb700e0f4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java @@ -13,6 +13,7 @@ package org.dromara.hutool.core.collection; import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java index 4796cb489..f5dddcbe4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java @@ -12,6 +12,7 @@ package org.dromara.hutool.core.collection; +import org.dromara.hutool.core.collection.set.SetFromMap; import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java index 8615fff14..14cdd114d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java @@ -28,6 +28,12 @@ public class TransSpliterator implements Spliterator { private final Spliterator fromSpliterator; private final Function function; + /** + * 构造 + * + * @param fromSpliterator 源iterator + * @param function 函数 + */ public TransSpliterator(final Spliterator fromSpliterator, final Function function) { this.fromSpliterator = fromSpliterator; this.function = function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java index 9386ca924..d37012e69 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java @@ -9,7 +9,7 @@ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.collection; +package org.dromara.hutool.core.collection.queue; import org.dromara.hutool.core.collection.queue.CheckedLinkedBlockingQueue; import org.dromara.hutool.core.thread.SimpleScheduler; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java index c47845698..ba68ddcdb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.collection; +package org.dromara.hutool.core.collection.set; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java index a7e9c73cd..2db632b4d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.collection; +package org.dromara.hutool.core.collection.set; import org.dromara.hutool.core.array.ArrayUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java index a2a0c7a4c..0c957fd9f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.collection; +package org.dromara.hutool.core.collection.set; import org.dromara.hutool.core.map.MapBuilder; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java index 8c3f0319d..f807710a2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java @@ -15,7 +15,7 @@ package org.dromara.hutool.core.map; import org.dromara.hutool.core.bean.BeanPath; import org.dromara.hutool.core.bean.BeanUtil; import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.exceptions.CloneRuntimeException; import org.dromara.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java index b618f0892..b9270bfaf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.map; import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.lang.Opt; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java index 7af37776f..952979dab 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java @@ -14,8 +14,8 @@ package org.dromara.hutool.core.reflect; import org.dromara.hutool.core.bean.NullWrapperBean; import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.collection.SetUtil; -import org.dromara.hutool.core.collection.UniqueKeySet; +import org.dromara.hutool.core.collection.set.SetUtil; +import org.dromara.hutool.core.collection.set.UniqueKeySet; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.exceptions.InvocationTargetRuntimeException; import org.dromara.hutool.core.exceptions.UtilException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java index bfff66ab3..220703125 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.regex; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.comparator.CompareUtil; import org.dromara.hutool.core.comparator.StrLengthComparator; import org.dromara.hutool.core.convert.Convert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java index 7b4b55150..f9f282d45 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.text.dfa; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import java.util.Set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java index de4b204ec..c68123b05 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.text.dfa; import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java index c126a2872..28568de8e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.util; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.text.StrUtil; import java.util.Set; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java index 5092fc045..fab512fc5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java @@ -5,7 +5,7 @@ import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.bean.copier.CopyOptions; import org.dromara.hutool.core.bean.copier.ValueProvider; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.map.MapBuilder; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java index 66dfd9f2f..8ef881190 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java @@ -1,6 +1,7 @@ package org.dromara.hutool.core.collection; import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.comparator.CompareUtil; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.lang.Console; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java index 2594712b6..a66225157 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java @@ -4,6 +4,7 @@ import org.dromara.hutool.core.collection.iter.FilterIter; import org.dromara.hutool.core.collection.iter.IterUtil; import lombok.AllArgsConstructor; import lombok.Data; +import org.dromara.hutool.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java index ff3961788..2e19f3966 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java @@ -1,5 +1,6 @@ package org.dromara.hutool.core.collection; +import org.dromara.hutool.core.collection.queue.MemorySafeLinkedBlockingQueue; import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java index d0b70d915..35b3bf7c1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java @@ -2,6 +2,7 @@ package org.dromara.hutool.core.collection; import lombok.AllArgsConstructor; import lombok.Data; +import org.dromara.hutool.core.collection.set.UniqueKeySet; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java index 46076c14a..9d8c88dcb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.core.convert; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java index 100a4f738..0f5a9f81d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.core.convert; import org.dromara.hutool.core.codec.HexUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.date.DateException; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.map.MapUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java index d27c70999..9445ee61d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java @@ -1,6 +1,6 @@ package org.dromara.hutool.core.lang.func; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java index c3cb57b58..354f2ec80 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.core.stream; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java index 246166737..31b25cfcc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.core.text; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java index ae25462f1..38ad38e27 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java @@ -2,7 +2,7 @@ package org.dromara.hutool.core.util; import org.dromara.hutool.core.bean.BeanUtil; import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.io.resource.ResourceUtil; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.map.MapBuilder; diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java b/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java index 8e029b8a5..f98b02d7b 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java @@ -13,7 +13,7 @@ package org.dromara.hutool.db; import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.lang.func.SerSupplier; import org.dromara.hutool.core.map.Dict; import org.dromara.hutool.core.reflect.MethodUtil; diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java index 1b30ec753..85f944093 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java @@ -1,6 +1,6 @@ package org.dromara.hutool.db.meta; -import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.set.SetUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.db.ds.DSUtil;