From 75be3ebae4e91592360d55e1b69818853ab64649 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 03:31:23 +0800 Subject: [PATCH] fix code --- .../core/{lang => cache}/SimpleCache.java | 2 +- .../cn/hutool/core/collection/FilterIter.java | 12 +++--- .../cn/hutool/core/collection/IterUtil.java | 5 ++- .../cn/hutool/core/io/file/FileCopier.java | 4 +- .../hutool/core/io/resource/ResourceUtil.java | 4 +- .../cn/hutool/core/lang/ClassScanner.java | 23 ++++++----- .../core/lang/copier/SrcToDestCopier.java | 15 ++++--- .../lang/generator/ObjectIdGenerator.java | 2 +- .../lang/generator/SnowflakeGenerator.java | 2 +- .../core/lang/{ => hash}/ConsistentHash.java | 40 +++++++++++-------- .../core/{util => lang/hash}/HashUtil.java | 7 +--- .../java/cn/hutool/core/lang/id/IdUtil.java | 4 -- .../hutool/core/lang/{ => id}/ObjectId.java | 2 +- .../hutool/core/lang/{ => id}/Snowflake.java | 3 +- .../cn/hutool/core/{lang => map}/Dict.java | 4 +- .../text/bloomfilter/BitSetBloomFilter.java | 2 +- .../bloomfilter/filter/DefaultFilter.java | 2 +- .../text/bloomfilter/filter/ELFFilter.java | 2 +- .../text/bloomfilter/filter/FNVFilter.java | 2 +- .../text/bloomfilter/filter/HfFilter.java | 2 +- .../text/bloomfilter/filter/HfIpFilter.java | 2 +- .../text/bloomfilter/filter/JSFilter.java | 2 +- .../text/bloomfilter/filter/PJWFilter.java | 2 +- .../text/bloomfilter/filter/RSFilter.java | 2 +- .../text/bloomfilter/filter/SDBMFilter.java | 2 +- .../text/bloomfilter/filter/TianlFilter.java | 2 +- .../cn/hutool/core/text/dfa/WordTree.java | 14 +++---- .../hutool/core/text/escape/EscapeUtil.java | 9 +++-- .../java/cn/hutool/core/util/ClassUtil.java | 3 +- .../hutool/core/collection/CollUtilTest.java | 2 +- .../java/cn/hutool/core/lang/DictTest.java | 1 + .../cn/hutool/core/lang/ObjectIdTest.java | 1 + .../cn/hutool/core/lang/SimpleCacheTest.java | 1 + .../cn/hutool/core/lang/SnowflakeTest.java | 1 + .../cn/hutool/core/text/NamingCaseTest.java | 2 +- .../cn/hutool/core/util/HashUtilTest.java | 1 + .../java/cn/hutool/core/util/IdUtilTest.java | 2 +- .../java/cn/hutool/core/util/StrUtilTest.java | 2 +- .../src/main/java/cn/hutool/db/Entity.java | 2 +- .../cn/hutool/extra/ssh/JschSessionPool.java | 2 +- .../extra/template/engine/wit/WitEngine.java | 2 +- .../hutool/extra/expression/AviatorTest.java | 2 +- .../extra/expression/ExpressionUtilTest.java | 2 +- .../hutool/extra/template/JetbrickTest.java | 2 +- .../extra/template/TemplateUtilTest.java | 2 +- .../hutool/extra/template/ThymeleafTest.java | 2 +- .../hutool/extra/template/VelocityTest.java | 2 +- .../java/cn/hutool/json/JSONArrayTest.java | 2 +- .../log/dialect/console/ConsoleLog.java | 2 +- .../java/cn/hutool/setting/yaml/YamlUtil.java | 2 +- .../cn/hutool/setting/yaml/YamlUtilTest.java | 2 +- 51 files changed, 113 insertions(+), 103 deletions(-) rename hutool-core/src/main/java/cn/hutool/core/{lang => cache}/SimpleCache.java (99%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => hash}/ConsistentHash.java (74%) rename hutool-core/src/main/java/cn/hutool/core/{util => lang/hash}/HashUtil.java (98%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => id}/ObjectId.java (99%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => id}/Snowflake.java (99%) rename hutool-core/src/main/java/cn/hutool/core/{lang => map}/Dict.java (99%) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java rename to hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java index 5bef6a15f..b1f29de28 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.cache; import cn.hutool.core.collection.TransIter; import cn.hutool.core.lang.func.Func0; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java index 9c5ae2201..1d469f2c1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java @@ -1,13 +1,13 @@ package cn.hutool.core.collection; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Filter; import java.util.Iterator; import java.util.NoSuchElementException; +import java.util.function.Predicate; /** - * 包装 {@link Iterator}并根据{@link Filter}定义，过滤元素输出
+ * 包装 {@link Iterator}并根据{@link Predicate}定义，过滤元素输出
* 类实现来自Apache Commons Collection * * @author apache commons, looly @@ -16,7 +16,7 @@ import java.util.NoSuchElementException; public class FilterIter implements Iterator { private final Iterator iterator; - private final Filter filter; + private final Predicate filter; /** * 下一个元素 @@ -33,7 +33,7 @@ public class FilterIter implements Iterator { * @param iterator 被包装的{@link Iterator} * @param filter 过滤函数，{@code null}表示不过滤 */ - public FilterIter(final Iterator iterator, final Filter filter) { + public FilterIter(final Iterator iterator, final Predicate filter) { this.iterator = Assert.notNull(iterator); this.filter = filter; } @@ -74,7 +74,7 @@ public class FilterIter implements Iterator { * * @return 过滤函数，可能为{@code null} */ - public Filter getFilter() { + public Predicate getFilter() { return filter; } @@ -84,7 +84,7 @@ public class FilterIter implements Iterator { private boolean setNextObject() { while (iterator.hasNext()) { final E object = iterator.next(); - if (null != filter && filter.accept(object)) { + if (null != filter && filter.test(object)) { nextObject = object; nextObjectSet = true; return true; 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 dd0445e65..2bc4a6e82 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 @@ -27,6 +27,7 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Predicate; /** * {@link Iterable} 和 {@link Iterator} 相关工具类 @@ -753,7 +754,7 @@ public class IterUtil { * @return ArrayList * @since 5.7.22 */ - public static List filterToList(Iterator iter, Filter filter) { + public static List filterToList(Iterator iter, Predicate filter) { return toList(filtered(iter, filter)); } @@ -766,7 +767,7 @@ public class IterUtil { * @return {@link FilterIter} * @since 5.8.0 */ - public static FilterIter filtered(final Iterator iterator, final Filter filter) { + public static FilterIter filtered(final Iterator iterator, final Predicate filter) { return new FilterIter<>(iterator, filter); } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java index 3e7df8220..2d2878e75 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java @@ -206,7 +206,7 @@ public class FileCopier extends SrcToDestCopier{ * @throws IORuntimeException IO异常 */ private void internalCopyDirContent(File src, File dest) throws IORuntimeException { - if (null != copyFilter && false == copyFilter.accept(src)) { + if (null != copyPredicate && false == copyPredicate.test(src)) { //被过滤的目录跳过 return; } @@ -249,7 +249,7 @@ public class FileCopier extends SrcToDestCopier{ * @throws IORuntimeException IO异常 */ private void internalCopyFile(File src, File dest) throws IORuntimeException { - if (null != copyFilter && false == copyFilter.accept(src)) { + if (null != copyPredicate && false == copyPredicate.test(src)) { //被过滤的文件跳过 return; } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java index 49b7d90ec..0281af268 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.EnumerationIter; import cn.hutool.core.collection.IterUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.lang.Filter; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassLoaderUtil; import cn.hutool.core.util.StrUtil; @@ -17,6 +16,7 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.Enumeration; import java.util.List; +import java.util.function.Predicate; /** * Resource资源工具类 @@ -155,7 +155,7 @@ public class ResourceUtil { * @param filter 过滤器，用于过滤不需要的资源，{@code null}表示不过滤，保留所有元素 * @return 资源列表 */ - public static List getResources(String resource, Filter filter) { + public static List getResources(String resource, Predicate filter) { return IterUtil.filterToList(getResourceIter(resource), filter); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java index 3b65a5d6c..91a2f02e5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java @@ -16,6 +16,7 @@ import java.nio.charset.Charset; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import java.util.function.Predicate; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -48,7 +49,7 @@ public class ClassScanner implements Serializable { /** * 过滤器 */ - private final Filter> classFilter; + private final Predicate> classPredicate; /** * 编码 */ @@ -151,7 +152,7 @@ public class ClassScanner implements Serializable { * @return 类集合 * @since 5.7.5 */ - public static Set> scanAllPackage(String packageName, Filter> classFilter) { + public static Set> scanAllPackage(String packageName, Predicate> classFilter) { return new ClassScanner(packageName, classFilter).scan(true); } @@ -164,7 +165,7 @@ public class ClassScanner implements Serializable { * @param classFilter class过滤器，过滤掉不需要的class * @return 类集合 */ - public static Set> scanPackage(String packageName, Filter> classFilter) { + public static Set> scanPackage(String packageName, Predicate> classFilter) { return new ClassScanner(packageName, classFilter).scan(); } @@ -188,26 +189,26 @@ public class ClassScanner implements Serializable { * 构造，默认UTF-8编码 * * @param packageName 包名，所有包传入""或者null - * @param classFilter 过滤器，无需传入null + * @param classPredicate 过滤器，无需传入null */ - public ClassScanner(String packageName, Filter> classFilter) { - this(packageName, classFilter, CharsetUtil.CHARSET_UTF_8); + public ClassScanner(String packageName, Predicate> classPredicate) { + this(packageName, classPredicate, CharsetUtil.CHARSET_UTF_8); } /** * 构造 * * @param packageName 包名，所有包传入""或者null - * @param classFilter 过滤器，无需传入null + * @param classPredicate 过滤器，无需传入null * @param charset 编码 */ - public ClassScanner(String packageName, Filter> classFilter, Charset charset) { + public ClassScanner(String packageName, Predicate> classPredicate, Charset charset) { packageName = StrUtil.nullToEmpty(packageName); this.packageName = packageName; this.packageNameWithDot = StrUtil.addSuffixIfNot(packageName, StrUtil.DOT); this.packageDirName = packageName.replace(CharUtil.DOT, File.separatorChar); this.packagePath = packageName.replace(CharUtil.DOT, CharUtil.SLASH); - this.classFilter = classFilter; + this.classPredicate = classPredicate; this.charset = charset; } @@ -392,8 +393,8 @@ public class ClassScanner implements Serializable { */ private void addIfAccept(Class clazz) { if (null != clazz) { - Filter> classFilter = this.classFilter; - if (classFilter == null || classFilter.accept(clazz)) { + Predicate> classFilter = this.classPredicate; + if (classFilter == null || classFilter.test(clazz)) { this.classes.add(clazz); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java index 8efd688f8..84f667d54 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java @@ -1,8 +1,7 @@ package cn.hutool.core.lang.copier; import java.io.Serializable; - -import cn.hutool.core.lang.Filter; +import java.util.function.Predicate; /** * 复制器抽象类
@@ -22,7 +21,7 @@ public abstract class SrcToDestCopier> implem /** 目标 */ protected T dest; /** 拷贝过滤器，可以过滤掉不需要拷贝的源 */ - protected Filter copyFilter; + protected Predicate copyPredicate; //-------------------------------------------------------------------------------------------------------- Getters and Setters start /** @@ -68,18 +67,18 @@ public abstract class SrcToDestCopier> implem * 获得过滤器 * @return 过滤器 */ - public Filter getCopyFilter() { - return copyFilter; + public Predicate getCopyPredicate() { + return copyPredicate; } /** * 设置过滤器 * - * @param copyFilter 过滤器 + * @param copyPredicate 过滤器 * @return this */ @SuppressWarnings("unchecked") - public C setCopyFilter(Filter copyFilter) { - this.copyFilter = copyFilter; + public C setCopyPredicate(Predicate copyPredicate) { + this.copyPredicate = copyPredicate; return (C)this; } //-------------------------------------------------------------------------------------------------------- Getters and Setters end diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java index 548825f0a..26484d963 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java @@ -1,6 +1,6 @@ package cn.hutool.core.lang.generator; -import cn.hutool.core.lang.ObjectId; +import cn.hutool.core.lang.id.ObjectId; /** * ObjectId生成器 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java index e348e82e5..a8e46f31b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java @@ -1,6 +1,6 @@ package cn.hutool.core.lang.generator; -import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.lang.id.Snowflake; /** * Snowflake生成器
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/ConsistentHash.java similarity index 74% rename from hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java rename to hutool-core/src/main/java/cn/hutool/core/lang/hash/ConsistentHash.java index fee25398b..1ad43ac26 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/ConsistentHash.java @@ -1,7 +1,4 @@ -package cn.hutool.core.lang; - -import cn.hutool.core.lang.hash.Hash32; -import cn.hutool.core.util.HashUtil; +package cn.hutool.core.lang.hash; import java.io.Serializable; import java.util.Collection; @@ -10,26 +7,33 @@ import java.util.TreeMap; /** * 一致性Hash算法 - * 算法详解：http://blog.csdn.net/sparkliang/article/details/5279393 - * 算法实现：https://weblogs.java.net/blog/2007/11/27/consistent-hashing - * @author xiaoleilu + * 算法详解：http://blog.csdn.net/sparkliang/article/details/5279393 + * 算法实现：https://weblogs.java.net/blog/2007/11/27/consistent-hashing * - * @param 节点类型 + * @param 节点类型 + * @author xiaoleilu */ -public class ConsistentHash implements Serializable{ +public class ConsistentHash implements Serializable { private static final long serialVersionUID = 1L; - /** Hash计算对象，用于自定义hash算法 */ + /** + * Hash计算对象，用于自定义hash算法 + */ Hash32 hashFunc; - /** 复制的节点个数 */ + /** + * 复制的节点个数 + */ private final int numberOfReplicas; - /** 一致性Hash环 */ + /** + * 一致性Hash环 + */ private final SortedMap circle = new TreeMap<>(); /** * 构造，使用Java默认的Hash算法 + * * @param numberOfReplicas 复制的节点个数，增加每个节点的复制节点有利于负载均衡 - * @param nodes 节点对象 + * @param nodes 节点对象 */ public ConsistentHash(int numberOfReplicas, Collection nodes) { this.numberOfReplicas = numberOfReplicas; @@ -45,9 +49,10 @@ public class ConsistentHash implements Serializable{ /** * 构造 - * @param hashFunc hash算法对象 + * + * @param hashFunc hash算法对象 * @param numberOfReplicas 复制的节点个数，增加每个节点的复制节点有利于负载均衡 - * @param nodes 节点对象 + * @param nodes 节点对象 */ public ConsistentHash(Hash32 hashFunc, int numberOfReplicas, Collection nodes) { this.numberOfReplicas = numberOfReplicas; @@ -63,6 +68,7 @@ public class ConsistentHash implements Serializable{ * 每增加一个节点，就会在闭环上增加给定复制节点数
* 例如复制节点数是2，则每调用此方法一次，增加两个虚拟节点，这两个节点指向同一Node * 由于hash算法会调用node的toString方法，故按照toString去重 + * * @param node 节点对象 */ public void add(T node) { @@ -73,6 +79,7 @@ public class ConsistentHash implements Serializable{ /** * 移除节点的同时移除相应的虚拟节点 + * * @param node 节点对象 */ public void remove(T node) { @@ -83,6 +90,7 @@ public class ConsistentHash implements Serializable{ /** * 获得一个最近的顺时针节点 + * * @param key 为给定键取Hash，取得顺时针方向上最近的一个虚拟节点对应的实际节点 * @return 节点对象 */ @@ -92,7 +100,7 @@ public class ConsistentHash implements Serializable{ } int hash = hashFunc.hash32(key); if (false == circle.containsKey(hash)) { - SortedMap tailMap = circle.tailMap(hash); //返回此映射的部分视图，其键大于等于 hash + SortedMap tailMap = circle.tailMap(hash); //返回此映射的部分视图，其键大于等于 hash hash = tailMap.isEmpty() ? circle.firstKey() : tailMap.firstKey(); } //正好命中 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/HashUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java rename to hutool-core/src/main/java/cn/hutool/core/lang/hash/HashUtil.java index e5045601e..ac0be5923 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/HashUtil.java @@ -1,9 +1,4 @@ -package cn.hutool.core.util; - -import cn.hutool.core.lang.hash.CityHash; -import cn.hutool.core.lang.hash.MetroHash; -import cn.hutool.core.lang.hash.MurmurHash; -import cn.hutool.core.lang.hash.Number128; +package cn.hutool.core.lang.hash; /** * Hash算法大全
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java index 5bacfb1e5..af9f2d005 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java @@ -2,11 +2,7 @@ package cn.hutool.core.lang.id; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.ObjectId; import cn.hutool.core.lang.Singleton; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.lang.id.UUID; -import cn.hutool.core.lang.id.NanoId; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.RuntimeUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java rename to hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java index d8c7c6955..8c63a41ef 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.id; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ClassLoaderUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java rename to hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java index c676d0afa..808ee1a7a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java @@ -1,6 +1,7 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.id; import cn.hutool.core.date.SystemClock; +import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/Dict.java rename to hutool-core/src/main/java/cn/hutool/core/map/Dict.java index 2d3ec7796..46c0addbe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java @@ -1,9 +1,11 @@ -package cn.hutool.core.lang; +package cn.hutool.core.map; import cn.hutool.core.bean.BeanPath; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.Pair; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.func.LambdaUtil; import cn.hutool.core.getter.BasicTypeGetter; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/BitSetBloomFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/BitSetBloomFilter.java index 86942a144..6a0af9530 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/BitSetBloomFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/BitSetBloomFilter.java @@ -2,7 +2,7 @@ package cn.hutool.core.text.bloomfilter; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/DefaultFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/DefaultFilter.java index a42509335..ddab7fb12 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/DefaultFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/DefaultFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; /** * 默认Bloom过滤器，使用Java自带的Hash算法 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/ELFFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/ELFFilter.java index b72537a23..f51987467 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/ELFFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/ELFFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class ELFFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/FNVFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/FNVFilter.java index 7464ae4a1..a7d3d274a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/FNVFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/FNVFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class FNVFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfFilter.java index 4a5023935..75cfe9c79 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfFilter.java @@ -1,7 +1,7 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class HfFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfIpFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfIpFilter.java index 0292da096..2d21b9f68 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfIpFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/HfIpFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class HfIpFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/JSFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/JSFilter.java index 2a141dfbe..2ba0c29ae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/JSFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/JSFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class JSFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/PJWFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/PJWFilter.java index 127cd404c..4f2e937c8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/PJWFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/PJWFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class PJWFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/RSFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/RSFilter.java index 113ba9fbc..28a5f9cbc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/RSFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/RSFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class RSFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/SDBMFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/SDBMFilter.java index c96c1d031..c7a699372 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/SDBMFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/SDBMFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class SDBMFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/TianlFilter.java b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/TianlFilter.java index df8dff5ca..80c126adf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/TianlFilter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/bloomfilter/filter/TianlFilter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text.bloomfilter.filter; -import cn.hutool.core.util.HashUtil; +import cn.hutool.core.lang.hash.HashUtil; public class TianlFilter extends FuncFilter { private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java index 4e71a8d57..4b815794f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java @@ -1,7 +1,6 @@ package cn.hutool.core.text.dfa; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Filter; import cn.hutool.core.util.StrUtil; import java.util.ArrayList; @@ -10,6 +9,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.function.Predicate; /** * DFA（Deterministic Finite Automaton 确定有穷自动机） @@ -36,7 +36,7 @@ public class WordTree extends HashMap { /** * 字符过滤规则，通过定义字符串过滤规则，过滤不需要的字符，当accept为false时，此字符不参与匹配 */ - private Filter charFilter = StopChar::isNotStopChar; + private Predicate charFilter = StopChar::isNotStopChar; //--------------------------------------------------------------------------------------- Constructor start @@ -55,7 +55,7 @@ public class WordTree extends HashMap { * @return this * @since 5.2.0 */ - public WordTree setCharFilter(Filter charFilter) { + public WordTree setCharFilter(Predicate charFilter) { this.charFilter = charFilter; return this; } @@ -98,7 +98,7 @@ public class WordTree extends HashMap { * @return this */ public WordTree addWord(String word) { - final Filter charFilter = this.charFilter; + final Predicate charFilter = this.charFilter; WordTree parent = null; WordTree current = this; WordTree child; @@ -106,7 +106,7 @@ public class WordTree extends HashMap { final int length = word.length(); for (int i = 0; i < length; i++) { currentChar = word.charAt(i); - if (charFilter.accept(currentChar)) {//只处理合法字符 + if (charFilter.test(currentChar)) {//只处理合法字符 child = current.get(currentChar); if (child == null) { //无子类，新建一个子节点后存放下一个字符 @@ -245,7 +245,7 @@ public class WordTree extends HashMap { List foundWords = new ArrayList<>(); WordTree current = this; final int length = text.length(); - final Filter charFilter = this.charFilter; + final Predicate charFilter = this.charFilter; //存放查找到的字符缓存。完整出现一个词时加到findedWords中，否则清空 final StringBuilder wordBuffer = StrUtil.builder(); final StringBuilder keyBuffer = StrUtil.builder(); @@ -256,7 +256,7 @@ public class WordTree extends HashMap { for (int j = i; j < length; j++) { currentChar = text.charAt(j); // Console.log("i: {}, j: {}, currentChar: {}", i, j, currentChar); - if (false == charFilter.accept(currentChar)) { + if (false == charFilter.test(currentChar)) { if (wordBuffer.length() > 0) { //做为关键词中间的停顿词被当作关键词的一部分被返回 wordBuffer.append(currentChar); diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java index 4e19c3b4d..39aabe481 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java @@ -1,8 +1,9 @@ package cn.hutool.core.text.escape; -import cn.hutool.core.lang.Filter; import cn.hutool.core.util.StrUtil; +import java.util.function.Predicate; + /** * 转义和反转义工具类Escape / Unescape
* escape采用ISO Latin字符集对指定的字符串进行编码。
@@ -16,7 +17,7 @@ public class EscapeUtil { * 不转义的符号编码 */ private static final String NOT_ESCAPE_CHARS = "*@-_+./"; - private static final Filter JS_ESCAPE_FILTER = c -> false == ( + private static final Predicate JS_ESCAPE_FILTER = c -> false == ( Character.isDigit(c) || Character.isLowerCase(c) || Character.isUpperCase(c) @@ -109,7 +110,7 @@ public class EscapeUtil { * @param filter 编码过滤器，对于过滤器中accept为false的字符不做编码 * @return 编码后的字符串 */ - public static String escape(CharSequence content, Filter filter) { + public static String escape(CharSequence content, Predicate filter) { if (StrUtil.isEmpty(content)) { return StrUtil.str(content); } @@ -118,7 +119,7 @@ public class EscapeUtil { char c; for (int i = 0; i < content.length(); i++) { c = content.charAt(i); - if (false == filter.accept(c)) { + if (false == filter.test(c)) { tmp.append(c); } else if (c < 256) { tmp.append("%"); 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 e697fed49..431faff12 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 @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.function.Predicate; /** * 类工具类
@@ -233,7 +234,7 @@ public class ClassUtil { * @param classFilter class过滤器，过滤掉不需要的class * @return 类集合 */ - public static Set> scanPackage(String packageName, Filter> classFilter) { + public static Set> scanPackage(String packageName, Predicate> classFilter) { return ClassScanner.scanPackage(packageName, classFilter); } diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java index 512b13e2d..9a52bb068 100755 --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java @@ -2,7 +2,7 @@ package cn.hutool.core.collection; import cn.hutool.core.comparator.ComparableComparator; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java index 81d595708..06430dc7b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java @@ -2,6 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.builder.GenericBuilder; import cn.hutool.core.date.DateTime; +import cn.hutool.core.map.Dict; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java index dbf9c0446..151620550 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java @@ -2,6 +2,7 @@ package cn.hutool.core.lang; import java.util.HashSet; +import cn.hutool.core.lang.id.ObjectId; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java index 8b15d28e6..e2ce0f7d4 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java @@ -1,5 +1,6 @@ package cn.hutool.core.lang; +import cn.hutool.core.cache.SimpleCache; import cn.hutool.core.thread.ConcurrencyTester; import cn.hutool.core.thread.ThreadUtil; import org.junit.Assert; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java index 9bbb25db3..f20a3f3b5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java @@ -2,6 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.exceptions.UtilException; +import cn.hutool.core.lang.id.Snowflake; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java index 2eec1a248..4b611e3e3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java @@ -1,6 +1,6 @@ package cn.hutool.core.text; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.CharUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java index f76678de8..aa7e1ce8a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java @@ -1,5 +1,6 @@ package cn.hutool.core.util; +import cn.hutool.core.lang.hash.HashUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java index a900bf071..cd37132fb 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.TimeInterval; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.lang.id.Snowflake; import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.thread.ThreadUtil; import org.junit.Assert; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java index 514efd089..c909b8f4f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-db/src/main/java/cn/hutool/db/Entity.java b/hutool-db/src/main/java/cn/hutool/db/Entity.java index 5afd8ca10..adca98375 100644 --- a/hutool-db/src/main/java/cn/hutool/db/Entity.java +++ b/hutool-db/src/main/java/cn/hutool/db/Entity.java @@ -1,7 +1,7 @@ package cn.hutool.db; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java index 164b7824f..343f347b5 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java @@ -1,6 +1,6 @@ package cn.hutool.extra.ssh; -import cn.hutool.core.lang.SimpleCache; +import cn.hutool.core.cache.SimpleCache; import cn.hutool.core.util.StrUtil; import com.jcraft.jsch.Session; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java index 07ebb573b..ff24b8137 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java @@ -1,7 +1,7 @@ package cn.hutool.extra.template.engine.wit; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java index 8896ab439..0c2a55362 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java @@ -2,7 +2,7 @@ package cn.hutool.extra.expression; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.extra.expression.engine.aviator.AviatorEngine; import lombok.Data; import org.junit.Assert; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java index 9a36b609e..887d607fe 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.expression; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.extra.expression.engine.jexl.JexlEngine; import cn.hutool.extra.expression.engine.jfireel.JfireELEngine; import cn.hutool.extra.expression.engine.mvel.MvelEngine; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java index 1ee03b473..f0f6c4c11 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.template; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.engine.jetbrick.JetbrickEngine; import org.junit.Assert; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java index 2889ddf50..b14937d5a 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.template; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.TemplateConfig.ResourceMode; import cn.hutool.extra.template.engine.beetl.BeetlEngine; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java index ccb20c81d..ff391c9c7 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java @@ -14,7 +14,7 @@ import org.thymeleaf.context.Context; import org.thymeleaf.templateresolver.StringTemplateResolver; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine; /** diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java index fc53fd165..5ec9b43a3 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java @@ -1,6 +1,6 @@ package cn.hutool.extra.template; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.CharsetUtil; import cn.hutool.extra.template.engine.velocity.VelocityEngine; import org.junit.Assert; 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 d7b0a9911..e1a0dafcc 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.CharsetUtil; import cn.hutool.json.test.bean.Exam; diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java index 9f92ee3e2..a984853c7 100755 --- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java +++ b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java @@ -3,7 +3,7 @@ package cn.hutool.log.dialect.console; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.StrUtil; import cn.hutool.log.AbstractLog; import cn.hutool.log.level.Level; diff --git a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java b/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java index 7900f1ccd..6bbd18ee8 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java @@ -3,7 +3,7 @@ package cn.hutool.setting.yaml; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java index 137fde726..0656f9ae9 100644 --- a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java +++ b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java @@ -1,7 +1,7 @@ package cn.hutool.setting.yaml; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.Dict; import cn.hutool.core.util.CharsetUtil; import org.junit.Assert; import org.junit.Ignore;