zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-04-29 02:09:18 +08:00
parent 67a0f31dd9
commit 216c1966b7
75 changed files with 152 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java vendored
View File

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

2
hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java vendored
View File

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

2
hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java vendored
View File

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

4
hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
View File

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

10
hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java
View File

@@ -1,10 +0,0 @@
package cn.hutool.core.collection;
/**
* 集合相关工具类，包括数组，是 {@link CollUtil} 的别名工具类
*
* @author xiaoleilu
* @see CollUtil
*/
public class CollectionUtil extends CollUtil{
}

4
hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java
View File

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

1
hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import java.io.Serializable;
import java.lang.reflect.Array;

2
hutool-core/src/main/java/cn/hutool/core/collection/ComputeIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import java.util.Iterator;
import java.util.NoSuchElementException;

4
hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/collection/EnumerationIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import cn.hutool.core.lang.Assert;

2
hutool-core/src/main/java/cn/hutool/core/collection/IterChain.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import cn.hutool.core.lang.Chain;

3
hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java Executable file → Normal file
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/IterableIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import java.util.Iterator;

2
hutool-core/src/main/java/cn/hutool/core/collection/IteratorEnumeration.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import java.io.Serializable;
import java.util.Enumeration;

4
hutool-core/src/main/java/cn/hutool/core/collection/LineIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/NodeListIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/collection/PartitionIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/ResettableIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import java.util.Iterator;

2
hutool-core/src/main/java/cn/hutool/core/collection/TransIter.java → hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.iter;
import cn.hutool.core.lang.Assert;

7
hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java Normal file
View File

@@ -0,0 +1,7 @@
/**
* {@link java.util.Iterator}和{@link java.lang.Iterable}相关封装
*
* @author looly
*
*/
package cn.hutool.core.collection.iter;

3
hutool-core/src/main/java/cn/hutool/core/collection/AvgPartition.java → hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/collection/Partition.java → hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.partition;
import java.util.AbstractList;
import java.util.List;

2
hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessAvgPartition.java → hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.partition;
import java.util.List;
import java.util.RandomAccess;

2
hutool-core/src/main/java/cn/hutool/core/collection/RandomAccessPartition.java → hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java
View File

@@ -1,4 +1,4 @@
package cn.hutool.core.collection;
package cn.hutool.core.collection.partition;
import java.util.List;
import java.util.RandomAccess;

2
hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/lang/Opt.java
View File

@@ -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<T> {
* @since 5.7.17
*/
public static <T, R extends Collection<T>> Opt<R> ofEmptyAble(R value) {
return CollectionUtil.isEmpty(value) ? empty() : new Opt<>(value);
return CollUtil.isEmpty(value) ? empty() : new Opt<>(value);
}
/**

2
hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java
View File

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

6
hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java
View File

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

4
hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
View File

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

2
hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java
View File

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

3
hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
View File

@@ -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> T[] toArray(Iterable<T> iterable, Class<T> componentType) {
return toArray(CollectionUtil.toCollection(iterable), componentType);
return toArray(CollUtil.toCollection(iterable), componentType);
}
/**

2
hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
View File

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

2
hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
View File

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

2
hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java
View File

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

4
hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java
View File

@@ -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<String> past = Opt.ofNullable(Collections.<String>emptyList()).filter(CollectionUtil::isNotEmpty).orElseGet(() -> Collections.singletonList("hutool"));
List<String> past = Opt.ofNullable(Collections.<String>emptyList()).filter(CollUtil::isNotEmpty).orElseGet(() -> Collections.singletonList("hutool"));
// 现在，一个ofEmptyAble搞定
List<String> hutool = Opt.ofEmptyAble(Collections.<String>emptyList()).orElseGet(() -> Collections.singletonList("hutool"));
Assert.assertEquals(past, hutool);

2
hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java
View File

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

4
hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
View File

@@ -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<String> resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<>());
ArrayList<String> expected = CollectionUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34");
ArrayList<String> expected = CollUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34");
Assert.assertEquals(expected, resultFindAll);
}