ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-04-03 13:41:22 +08:00
parent c93c6a2b77
commit 85488f8317
32 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java
View File

@ -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;

4
hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java
View File

@ -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;

1
hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java
View File

@ -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;

1
hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java
View File

@ -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;

1
hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java
View File

@ -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;

6
hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java
View File

@ -28,6 +28,12 @@ public class TransSpliterator<F, T> implements Spliterator<T> {
private final Spliterator<F> fromSpliterator;
private final Function<? super F, ? extends T> function;
/**
* 构造
*
* @param fromSpliterator 源iterator
* @param function 函数
*/
public TransSpliterator(final Spliterator<F> fromSpliterator, final Function<? super F, ? extends T> function) {
this.fromSpliterator = fromSpliterator;
this.function = function;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java → hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java → hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java → hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java → hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java
View File

@ -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;

4
hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java
View File

@ -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;

2
hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java
View File

@ -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;

1
hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java
View File

@ -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;

1
hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java
View File

@ -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;

1
hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java
View File

@ -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;

1
hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java
View File

@ -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;

2
hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java
View File

@ -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;

2
hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
View File

@ -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;

2
hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
View File

@ -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;