From ddfa1788822515c2ac1dd2e45062d2634e688d2a Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 03:45:06 +0800 Subject: [PATCH] fix code --- hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java | 2 +- .../main/java/cn/hutool/core/bean/copier/BeanCopier.java | 2 +- .../main/java/cn/hutool/core/bean/copier/CopyOptions.java | 2 +- .../src/main/java/cn/hutool/core/collection/CollUtil.java | 6 +++--- .../src/main/java/cn/hutool/core/collection/IterUtil.java | 6 +++--- .../src/main/java/cn/hutool/core/collection/ListUtil.java | 2 +- .../src/main/java/cn/hutool/core/compress/ZipReader.java | 2 +- .../src/main/java/cn/hutool/core/convert/Convert.java | 2 +- .../main/java/cn/hutool/core/convert/ConverterRegistry.java | 2 +- .../src/main/java/cn/hutool/core/io/watch/WatchServer.java | 2 +- .../src/main/java/cn/hutool/core/lang/WeightRandom.java | 4 ++-- .../main/java/cn/hutool/core/lang/{ => func}/Editor.java | 2 +- .../main/java/cn/hutool/core/lang/{ => func}/Filter.java | 2 +- .../main/java/cn/hutool/core/lang/{ => func}/Matcher.java | 2 +- .../main/java/cn/hutool/core/lang/{ => func}/Replacer.java | 2 +- .../cn/hutool/core/lang/{ => reflect}/TypeReference.java | 2 +- hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java | 6 +++--- .../java/cn/hutool/core/map/ReferenceConcurrentMap.java | 4 ++-- hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java | 2 +- .../src/main/java/cn/hutool/core/text/CharSequenceUtil.java | 4 ++-- .../java/cn/hutool/core/text/finder/CharMatcherFinder.java | 2 +- .../main/java/cn/hutool/core/text/replacer/StrReplacer.java | 2 +- .../src/main/java/cn/hutool/core/{lang => }/tree/Node.java | 2 +- .../src/main/java/cn/hutool/core/{lang => }/tree/Tree.java | 4 ++-- .../java/cn/hutool/core/{lang => }/tree/TreeBuilder.java | 4 ++-- .../main/java/cn/hutool/core/{lang => }/tree/TreeNode.java | 2 +- .../java/cn/hutool/core/{lang => }/tree/TreeNodeConfig.java | 2 +- .../main/java/cn/hutool/core/{lang => }/tree/TreeUtil.java | 6 +++--- .../java/cn/hutool/core/{lang => }/tree/package-info.java | 2 +- .../core/{lang => }/tree/parser/DefaultNodeParser.java | 6 +++--- .../cn/hutool/core/{lang => }/tree/parser/NodeParser.java | 4 ++-- .../src/main/java/cn/hutool/core/util/ArrayUtil.java | 6 +++--- .../src/main/java/cn/hutool/core/util/ClassUtil.java | 2 +- .../src/main/java/cn/hutool/core/util/ReflectUtil.java | 2 +- .../src/test/java/cn/hutool/core/convert/ConvertTest.java | 2 +- .../test/java/cn/hutool/core/convert/ConvertToBeanTest.java | 2 +- .../cn/hutool/core/convert/ConvertToCollectionTest.java | 2 +- .../java/cn/hutool/core/{lang => }/tree/Issue2279Test.java | 4 +++- .../cn/hutool/core/{lang => }/tree/TreeBuilderTest.java | 3 ++- .../java/cn/hutool/core/{lang => }/tree/TreeSearchTest.java | 5 ++++- .../test/java/cn/hutool/core/{lang => }/tree/TreeTest.java | 6 +++++- .../java/cn/hutool/cron/pattern/matcher/PartMatcher.java | 2 +- .../java/cn/hutool/extra/compress/archiver/Archiver.java | 2 +- .../cn/hutool/extra/compress/archiver/SevenZArchiver.java | 2 +- .../cn/hutool/extra/compress/archiver/StreamArchiver.java | 2 +- .../java/cn/hutool/extra/compress/extractor/Extractor.java | 2 +- .../cn/hutool/extra/compress/extractor/SevenZExtractor.java | 2 +- .../cn/hutool/extra/compress/extractor/StreamExtractor.java | 2 +- hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java | 2 +- .../src/main/java/cn/hutool/extra/spring/SpringUtil.java | 2 +- hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java | 2 +- .../extra/template/engine/jetbrick/JetbrickTemplate.java | 2 +- .../hutool/extra/template/engine/rythm/RythmTemplate.java | 2 +- .../extra/template/engine/thymeleaf/ThymeleafTemplate.java | 2 +- .../extra/template/engine/velocity/VelocityTemplate.java | 2 +- .../cn/hutool/extra/template/engine/wit/WitTemplate.java | 2 +- .../test/java/cn/hutool/extra/spring/SpringUtilTest.java | 2 +- .../hutool/extra/spring/SpringUtilWithAutoConfigTest.java | 2 +- .../src/main/java/cn/hutool/json/InternalJSONUtil.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSON.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSONArray.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSONObject.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSONParser.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSONUtil.java | 2 +- hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java | 2 +- hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java | 2 +- hutool-json/src/test/java/cn/hutool/json/Issue488Test.java | 2 +- .../src/test/java/cn/hutool/json/IssuesI4V14NTest.java | 2 +- hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java | 2 +- .../test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java | 2 +- 70 files changed, 98 insertions(+), 88 deletions(-) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => func}/Editor.java (93%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => func}/Filter.java (86%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => func}/Matcher.java (87%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => func}/Replacer.java (92%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => reflect}/TypeReference.java (96%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/Node.java (97%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/Tree.java (99%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/TreeBuilder.java (98%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/TreeNode.java (98%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/TreeNodeConfig.java (98%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/TreeUtil.java (97%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/package-info.java (92%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/parser/DefaultNodeParser.java (83%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/tree/parser/NodeParser.java (81%) rename hutool-core/src/test/java/cn/hutool/core/{lang => }/tree/Issue2279Test.java (91%) rename hutool-core/src/test/java/cn/hutool/core/{lang => }/tree/TreeBuilderTest.java (79%) rename hutool-core/src/test/java/cn/hutool/core/{lang => }/tree/TreeSearchTest.java (87%) rename hutool-core/src/test/java/cn/hutool/core/{lang => }/tree/TreeTest.java (94%) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index ade0212c2..c62ed7add 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -5,7 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Editor; +import cn.hutool.core.lang.func.Editor; import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java index 8d3fd418f..f1396dbe9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java @@ -61,11 +61,11 @@ public class BeanCopier implements Copier, Serializable { * @param targetType 目标的泛型类型，用于标注有泛型参数的Bean对象 * @param copyOptions 拷贝属性选项 */ + @SuppressWarnings("unchecked") public BeanCopier(Object source, T target, Type targetType, CopyOptions copyOptions) { Copier copier; if (source instanceof Map) { if (target instanceof Map) { - //noinspection unchecked copier = (Copier) new MapToMapCopier((Map) source, (Map) target, targetType, copyOptions); } else { copier = new MapToBeanCopier<>((Map) source, target, targetType, copyOptions); diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java index 2a48a38fb..9ec421277 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java @@ -2,7 +2,7 @@ package cn.hutool.core.bean.copier; import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.TypeConverter; -import cn.hutool.core.lang.Editor; +import cn.hutool.core.lang.func.Editor; import cn.hutool.core.lang.func.Func1; import cn.hutool.core.lang.func.LambdaUtil; import cn.hutool.core.util.ArrayUtil; 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 e3e051564..cdf976005 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 @@ -7,10 +7,10 @@ import cn.hutool.core.comparator.PropertyComparator; import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.ConverterRegistry; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Editor; -import cn.hutool.core.lang.Filter; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Editor; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.func.Func1; +import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.lang.hash.Hash32; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java index 2bc4a6e82..920ab610d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java @@ -2,9 +2,9 @@ package cn.hutool.core.collection; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Editor; -import cn.hutool.core.lang.Filter; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Editor; +import cn.hutool.core.lang.func.Filter; +import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.lang.func.Func1; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrJoiner; 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 b0d8bfe12..ab73d7147 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java @@ -2,7 +2,7 @@ package cn.hutool.core.collection; import cn.hutool.core.comparator.PinyinComparator; import cn.hutool.core.comparator.PropertyComparator; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PageUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java index 9899e95aa..b34600281 100755 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java @@ -3,7 +3,7 @@ package cn.hutool.core.compress; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java index 22f630544..91827f4a0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java @@ -4,7 +4,7 @@ import cn.hutool.core.convert.impl.CollectionConverter; import cn.hutool.core.convert.impl.EnumConverter; import cn.hutool.core.convert.impl.MapConverter; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.text.UnicodeUtil; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.CharUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java b/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java index bbc1fd347..677283fa3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java @@ -35,7 +35,7 @@ import cn.hutool.core.convert.impl.URLConverter; import cn.hutool.core.convert.impl.UUIDConverter; import cn.hutool.core.date.DateTime; import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java index f76bdadbc..0e063397f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.watch; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.ArrayUtil; import java.io.Closeable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java b/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java index e6b7b3305..5c9464d25 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java @@ -21,7 +21,7 @@ import java.util.TreeMap; * 然后随机出一个[0,10)之间的随机数。落在哪个区间，则该区间之后的元素即为按权重命中的元素。
* *

- * 参考博客：https://www.cnblogs.com/waterystone/p/5708063.html + * 参考博客：https://www.cnblogs.com/waterystone/p/5708063.html *

* * @param 权重随机获取的对象类型 @@ -38,7 +38,7 @@ public class WeightRandom implements Serializable { * 创建权重随机获取器 * * @param 权重随机获取的对象类型 - * @return {@link WeightRandom} + * @return WeightRandom */ public static WeightRandom create() { return new WeightRandom<>(); diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Editor.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Editor.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/Editor.java rename to hutool-core/src/main/java/cn/hutool/core/lang/func/Editor.java index 591a87340..d9376fd06 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Editor.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Editor.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.func; /** * 编辑器接口，常用于对于集合中的元素做统一编辑
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Filter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/lang/Filter.java rename to hutool-core/src/main/java/cn/hutool/core/lang/func/Filter.java index ffc0aec0e..45803eb2e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Filter.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.func; /** * 过滤器接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Matcher.java similarity index 87% rename from hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java rename to hutool-core/src/main/java/cn/hutool/core/lang/func/Matcher.java index 5867e7d68..bf293a0a9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Matcher.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.func; /** * 匹配接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Replacer.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java rename to hutool-core/src/main/java/cn/hutool/core/lang/func/Replacer.java index 03af67f39..806b8b2c1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Replacer.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.func; /** * 替换器
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java rename to hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java index ccb9f18b1..db971a5c0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index f7e4b5dda..c06c30083 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -2,9 +2,9 @@ package cn.hutool.core.map; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Editor; -import cn.hutool.core.lang.Filter; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.func.Editor; +import cn.hutool.core.lang.func.Filter; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java index 99e80a877..389270947 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java @@ -76,17 +76,17 @@ public class ReferenceConcurrentMap implements ConcurrentMap, Iterab return 0 == size(); } + @SuppressWarnings("unchecked") @Override public V get(Object key) { this.purgeStaleKeys(); - //noinspection unchecked return this.raw.get(ofKey((K) key, null)); } + @SuppressWarnings("unchecked") @Override public boolean containsKey(Object key) { this.purgeStaleKeys(); - //noinspection unchecked return this.raw.containsKey(ofKey((K) key, null)); } 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 e08b9212c..f5464d798 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.EnumerationIter; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.JNDIUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java index f057adc24..6f80d5f08 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.comparator.VersionComparator; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Filter; +import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.lang.func.Func1; import cn.hutool.core.text.finder.CharFinder; import cn.hutool.core.text.finder.Finder; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java b/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java index 216d68ee7..4ae92c790 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java @@ -1,7 +1,7 @@ package cn.hutool.core.text.finder; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Matcher; /** * 字符匹配查找器
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java b/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java index fc2fabe35..6ae136177 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.replacer; -import cn.hutool.core.lang.Replacer; +import cn.hutool.core.lang.func.Replacer; import cn.hutool.core.text.StrBuilder; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java b/hutool-core/src/main/java/cn/hutool/core/tree/Node.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java rename to hutool-core/src/main/java/cn/hutool/core/tree/Node.java index 901feea67..beb68dfae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/Node.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.comparator.CompareUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java b/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java rename to hutool-core/src/main/java/cn/hutool/core/tree/Tree.java index 34775f92d..5bc6cec07 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java rename to hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java index ebc1e0c13..be690aa3c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java @@ -1,9 +1,9 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.builder.Builder; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.tree.parser.NodeParser; +import cn.hutool.core.tree.parser.NodeParser; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java rename to hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java index 034cc8c04..abd2f6828 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java rename to hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java index 1bc9422eb..bc1c31f8a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java rename to hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java index 705cd1086..b08f3bd53 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.collection.IterUtil; -import cn.hutool.core.lang.tree.parser.DefaultNodeParser; -import cn.hutool.core.lang.tree.parser.NodeParser; +import cn.hutool.core.tree.parser.DefaultNodeParser; +import cn.hutool.core.tree.parser.NodeParser; import cn.hutool.core.util.ObjectUtil; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java b/hutool-core/src/main/java/cn/hutool/core/tree/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java rename to hutool-core/src/main/java/cn/hutool/core/tree/package-info.java index a4fe660b2..452fa69fc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/package-info.java @@ -11,4 +11,4 @@ * @author liangbaikai（https://gitee.com/liangbaikai00/） * @since 5.2.1 */ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java b/hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java similarity index 83% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java rename to hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java index f5b38ad21..1b245ad5c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java @@ -1,7 +1,7 @@ -package cn.hutool.core.lang.tree.parser; +package cn.hutool.core.tree.parser; -import cn.hutool.core.lang.tree.TreeNode; -import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.tree.TreeNode; +import cn.hutool.core.tree.Tree; import cn.hutool.core.map.MapUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java b/hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java similarity index 81% rename from hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java rename to hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java index ef240b843..d5b7de335 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang.tree.parser; +package cn.hutool.core.tree.parser; -import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.tree.Tree; /** * 树节点解析器 可以参考{@link DefaultNodeParser} 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 9e535b668..95efc370c 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 @@ -6,9 +6,9 @@ import cn.hutool.core.collection.UniqueKeySet; import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Editor; -import cn.hutool.core.lang.Filter; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Editor; +import cn.hutool.core.lang.func.Filter; +import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrJoiner; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java index 431faff12..76a7b3b1f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java @@ -8,7 +8,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.ClassScanner; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.Singleton; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java index 39d94196e..279e2158b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java @@ -7,7 +7,7 @@ import cn.hutool.core.collection.UniqueKeySet; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.reflect.MethodHandleUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.WeakConcurrentMap; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java index aa4ad0eab..5f0463c66 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java @@ -3,7 +3,7 @@ package cn.hutool.core.convert; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateException; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.codec.HexUtil; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java index 8ab5b15ff..c7363f3c8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java @@ -1,7 +1,7 @@ package cn.hutool.core.convert; import cn.hutool.core.bean.BeanUtilTest.SubPerson; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java index 0f51ad24f..50ccdee57 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java @@ -1,7 +1,7 @@ package cn.hutool.core.convert; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java rename to hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java index ad4a63004..6cca4554e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java @@ -1,6 +1,8 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.tree.Tree; +import cn.hutool.core.tree.TreeUtil; import lombok.Data; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java similarity index 79% rename from hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java index 449f91503..7848a5363 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java @@ -1,5 +1,6 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; +import cn.hutool.core.tree.TreeBuilder; import org.junit.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java b/hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java rename to hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java index 02b8b560b..7ae019bea 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java @@ -1,5 +1,8 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; +import cn.hutool.core.tree.Tree; +import cn.hutool.core.tree.TreeNode; +import cn.hutool.core.tree.TreeUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java rename to hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java index fc9131cc7..17315557e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java @@ -1,6 +1,10 @@ -package cn.hutool.core.lang.tree; +package cn.hutool.core.tree; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.tree.Tree; +import cn.hutool.core.tree.TreeNode; +import cn.hutool.core.tree.TreeNodeConfig; +import cn.hutool.core.tree.TreeUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java index 27b7cac79..7dcf3248d 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java @@ -1,6 +1,6 @@ package cn.hutool.cron.pattern.matcher; -import cn.hutool.core.lang.Matcher; +import cn.hutool.core.lang.func.Matcher; /** * 表达式中的某个位置部分匹配器
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java index ab13bb206..92ba28ea9 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java @@ -1,6 +1,6 @@ package cn.hutool.extra.compress.archiver; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.StrUtil; import java.io.Closeable; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java index da94b95ce..418e910c8 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java @@ -3,7 +3,7 @@ package cn.hutool.extra.compress.archiver; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java index b36984ef7..9111be46f 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java @@ -3,7 +3,7 @@ package cn.hutool.extra.compress.archiver; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.compress.CompressException; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java index ba56e7197..2e54e6d2d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java @@ -1,6 +1,6 @@ package cn.hutool.extra.compress.extractor; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import org.apache.commons.compress.archivers.ArchiveEntry; import java.io.Closeable; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java index f8a769896..e3f015b8e 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java @@ -4,7 +4,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.StrUtil; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java index 150cea101..9667273fb 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java @@ -4,7 +4,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.compress.CompressException; import org.apache.commons.compress.archivers.ArchiveEntry; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java index 05182e6b5..76c68b2ad 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java index ea08f0921..b99fb515d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java @@ -1,7 +1,7 @@ package cn.hutool.extra.spring; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.ArrayUtil; import org.springframework.beans.BeansException; import org.springframework.beans.factory.ListableBeanFactory; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java index e993b0824..19a8611c7 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java @@ -3,7 +3,7 @@ package cn.hutool.extra.ssh; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.ftp.AbstractFtp; import cn.hutool.extra.ftp.FtpConfig; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java index 78470a41f..b3c13bf7a 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java @@ -1,7 +1,7 @@ package cn.hutool.extra.template.engine.jetbrick; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.extra.template.AbstractTemplate; import jetbrick.template.JetTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java index 4e3df13cc..19a42e095 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java @@ -1,7 +1,7 @@ package cn.hutool.extra.template.engine.rythm; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.extra.template.AbstractTemplate; import java.io.OutputStream; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java index 720992fe5..5056b185e 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java @@ -2,7 +2,7 @@ package cn.hutool.extra.template.engine.thymeleaf; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.template.AbstractTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java index 9557c70f6..fc153820a 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java @@ -2,7 +2,7 @@ package cn.hutool.extra.template.engine.velocity; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.AbstractTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java index 24d1b0c21..dde1d49a8 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java @@ -1,7 +1,7 @@ package cn.hutool.extra.template.engine.wit; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.extra.template.AbstractTemplate; import org.febit.wit.Template; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java index a0ef2a2c6..17fb1ed13 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.spring; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.map.MapUtil; import lombok.Data; import org.junit.Assert; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java index ea8ee73c3..ff116b284 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.spring; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.map.MapUtil; import lombok.Data; import org.junit.Assert; diff --git a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java index 0229c4e38..16e631356 100755 --- a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.MutablePair; import cn.hutool.core.map.CaseInsensitiveLinkedMap; import cn.hutool.core.map.CaseInsensitiveTreeMap; diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/json/JSON.java index 4b71cd003..69f060eae 100644 --- a/hutool-json/src/main/java/cn/hutool/json/JSON.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSON.java @@ -1,7 +1,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanPath; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import java.io.Serializable; import java.io.StringWriter; diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java index 3d870b556..802170618 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanPath; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutableObj; import cn.hutool.core.lang.mutable.MutablePair; 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 26937f818..6160847d9 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanPath; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.MutablePair; import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapWrapper; diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONParser.java b/hutool-json/src/main/java/cn/hutool/json/JSONParser.java index 6eedd09c6..1558762d2 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONParser.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONParser.java @@ -1,6 +1,6 @@ package cn.hutool.json; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutablePair; diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java index 1367aa3ae..95b34275d 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.file.FileReader; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.map.MapWrapper; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; 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 6d7f9761e..c577bbd29 100755 --- a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java +++ b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ArrayIter; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Filter; +import cn.hutool.core.lang.func.Filter; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutablePair; import cn.hutool.core.util.ArrayUtil; diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java index 21a485edf..0246079ba 100644 --- a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java @@ -2,7 +2,7 @@ package cn.hutool.json; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import lombok.Data; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java index 867f49ed9..d0f2b6315 100644 --- a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Test; import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import lombok.Data; public class Issue488Test { diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java index 6eb7ee7d3..ed7674671 100755 --- a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java @@ -1,6 +1,6 @@ package cn.hutool.json; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java index e1a0dafcc..d47c481d6 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.map.Dict; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.core.util.CharsetUtil; import cn.hutool.json.test.bean.Exam; import cn.hutool.json.test.bean.JsonNode; diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java index c17a80242..ac49d5818 100644 --- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Test; import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.lang.reflect.TypeReference; import cn.hutool.json.JSONUtil; public class IssueIVMD5Test {