diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index efe077ee1..3d2927912 100755 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -7,10 +7,10 @@ import cn.hutool.core.date.format.DatePrinter; import cn.hutool.core.date.format.FastDateFormat; import cn.hutool.core.date.format.GlobalCustomFormat; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import java.text.DateFormat; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java index d2f3a25ab..42899027f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java @@ -2,7 +2,7 @@ package cn.hutool.core.date; import cn.hutool.core.date.format.GlobalCustomFormat; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import java.time.DayOfWeek; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index 29a1f0410..8da312ecc 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -18,7 +18,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.ZipUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java index 5670f4383..a4f628163 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.file; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java b/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java index 9d80f71ba..7f1d14c61 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java @@ -2,10 +2,11 @@ package cn.hutool.core.lang; import cn.hutool.core.date.DateUtil; import cn.hutool.core.exceptions.ValidateException; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.util.CreditCodeUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.IdcardUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java rename to hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java index f702ed5b7..d92b138a0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.reflect; import java.io.Serializable; import java.lang.reflect.ParameterizedType; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java index 886f9c47f..a2478c4eb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java @@ -3,7 +3,7 @@ package cn.hutool.core.net; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java b/hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java rename to hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java index 93501ea24..3f4df641d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java +++ b/hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.regex; import cn.hutool.core.map.WeakConcurrentMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java rename to hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java index 9be7aa9f5..0bf59755d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java @@ -1,16 +1,19 @@ -package cn.hutool.core.util; +package cn.hutool.core.regex; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.PatternPool; -import cn.hutool.core.lang.RegexPool; +import cn.hutool.core.regex.PatternPool; +import cn.hutool.core.regex.RegexPool; import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.func.Func1; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutableObj; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java b/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java rename to hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java index 7258c79dd..50f8edc5d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java +++ b/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.regex; /** * 常用正则表达式字符串池 @@ -21,7 +21,7 @@ public interface RegexPool { String WORD = "[a-zA-Z]+"; /** * 单个中文汉字
- * 参照维基百科汉字Unicode范围(https://zh.wikipedia.org/wiki/%E6%B1%89%E5%AD%97 页面右侧) + * 参照维基百科汉字Unicode范围(https://zh.wikipedia.org/wiki/%E6%B1%89%E5%AD%97 页面右侧) */ String CHINESE = "[\u2E80-\u2EFF\u2F00-\u2FDF\u31C0-\u31EF\u3400-\u4DBF\u4E00-\u9FFF\uF900-\uFAFF\uD840\uDC00-\uD869\uDEDF\uD869\uDF00-\uD86D\uDF3F\uD86D\uDF40-\uD86E\uDC1F\uD86E\uDC20-\uD873\uDEAF\uD87E\uDC00-\uD87E\uDE1F]"; /** @@ -47,8 +47,8 @@ public interface RegexPool { */ String MONEY = "^(\\d+(?:\\.\\d+)?)$"; /** - * 邮件，符合RFC 5322规范，正则来自：http://emailregex.com/ - * What is the maximum length of a valid email address? https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address/44317754 + * 邮件，符合RFC 5322规范，正则来自：http://emailregex.com/ + * What is the maximum length of a valid email address? https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address/44317754 * 注意email 要宽松一点。比如 jetz.chong@hutool.cn、jetz-chong@ hutool.cn、jetz_chong@hutool.cn、dazhi.duan@hutool.cn 宽松一点把，都算是正常的邮箱 */ String EMAIL = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)])"; @@ -103,7 +103,7 @@ public interface RegexPool { String BIRTHDAY = "^(\\d{2,4})([/\\-.年]?)(\\d{1,2})([/\\-.月]?)(\\d{1,2})日?$"; /** * URI
- * 定义见：https://www.ietf.org/rfc/rfc3986.html#appendix-B + * 定义见：https://www.ietf.org/rfc/rfc3986.html#appendix-B */ String URI = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?"; /** @@ -111,7 +111,7 @@ public interface RegexPool { */ String URL = "[a-zA-Z]+://[\\w-+&@#/%?=~_|!:,.;]*[\\w-+&@#/%=~_|]"; /** - * Http URL（来自：http://urlregex.com/）
+ * Http URL（来自：http://urlregex.com/）
* 此正则同时支持FTP、File等协议的URL */ String URL_HTTP = "(https?|ftp|file)://[\\w-+&@#/%?=~_|!:,.;]*[\\w-+&@#/%=~_|]"; diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/package-info.java b/hutool-core/src/main/java/cn/hutool/core/regex/package-info.java new file mode 100644 index 000000000..687611b7b --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/regex/package-info.java @@ -0,0 +1,7 @@ +/** + * 正则表达式相关封装 + * + * @author looly + * + */ +package cn.hutool.core.regex; 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 ee2940134..f057adc24 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 @@ -15,7 +15,7 @@ import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java b/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java index ce9d998d7..9a0249c76 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java @@ -1,6 +1,6 @@ package cn.hutool.core.text; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.text.finder.CharFinder; import cn.hutool.core.text.finder.CharMatcherFinder; import cn.hutool.core.text.finder.LengthFinder; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java index e1ee0bf26..e655ede42 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java @@ -1,6 +1,7 @@ package cn.hutool.core.util; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; +import cn.hutool.core.regex.ReUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java index 9e1278ebc..3f8a2dd06 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java @@ -4,8 +4,9 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.lang.Validator; +import cn.hutool.core.regex.ReUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java index f8494c748..df72211c9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java @@ -1,7 +1,8 @@ package cn.hutool.core.util; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; import cn.hutool.core.lang.Validator; +import cn.hutool.core.regex.ReUtil; /** diff --git a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java index f962b5174..dbd21f9b0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.util; -import cn.hutool.core.lang.ParameterizedTypeImpl; +import cn.hutool.core.lang.reflect.ParameterizedTypeImpl; import cn.hutool.core.lang.reflect.ActualTypeMapperPool; import java.lang.reflect.Field; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java index bae67d22a..637c51cd6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java @@ -2,6 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.lang.id.IdUtil; +import cn.hutool.core.regex.PatternPool; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java index 0bed82723..b1bae7af3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java @@ -1,8 +1,8 @@ package cn.hutool.core.net; import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.PatternPool; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.PatternPool; +import cn.hutool.core.regex.ReUtil; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java index 0b26e6241..ad8efdd17 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java @@ -2,7 +2,8 @@ package cn.hutool.core.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.regex.PatternPool; +import cn.hutool.core.regex.ReUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java index 42d81cc58..133c189b7 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java @@ -1,7 +1,7 @@ package cn.hutool.db.dialect; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.db.dialect.impl.AnsiSqlDialect; import cn.hutool.db.dialect.impl.H2Dialect; diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java b/hutool-db/src/main/java/cn/hutool/db/meta/Column.java index 362d20ee8..25e7f5290 100644 --- a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/Column.java @@ -1,7 +1,7 @@ package cn.hutool.db.meta; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.db.DbRuntimeException; import java.io.Serializable; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java index 2aa2f2c37..43a4f2b6e 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java @@ -1,7 +1,7 @@ package cn.hutool.extra.system; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import java.io.Serializable; diff --git a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java index bdb5d801c..d680698d8 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java +++ b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java @@ -1,7 +1,7 @@ package cn.hutool.http; import cn.hutool.core.text.escape.EscapeUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; /** diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java index 9bbeff7c3..94b154e30 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java @@ -7,7 +7,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.StreamProgress; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.cookie.GlobalCookieManager; diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java index f496280a2..e8eb311ba 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java @@ -11,7 +11,7 @@ import cn.hutool.core.net.url.UrlQuery; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.cookie.GlobalCookieManager; diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java index 42ce32370..19fb21c26 100644 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java @@ -1,7 +1,7 @@ package cn.hutool.http.useragent; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import java.util.List; import java.util.regex.Pattern; diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java index 358a8e272..d281ed6dd 100644 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java @@ -1,7 +1,7 @@ package cn.hutool.http.useragent; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import java.util.List; import java.util.regex.Pattern; diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java index 965d851d3..953bc8360 100644 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java @@ -1,7 +1,7 @@ package cn.hutool.http.useragent; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import java.util.List; import java.util.regex.Pattern; diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java b/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java index c77ccbb8b..330b98933 100644 --- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java +++ b/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java @@ -1,6 +1,6 @@ package cn.hutool.http.useragent; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import java.io.Serializable; import java.util.regex.Pattern; diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java index 18dbb9682..06629d514 100644 --- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java +++ b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java @@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java index 2bbbdf60e..ba32c6109 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java @@ -4,7 +4,7 @@ import cn.hutool.core.exceptions.DependencyException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.poi.PoiChecker; import cn.hutool.poi.excel.cell.CellLocation; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java index 60a62e133..d6475f7d6 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java @@ -1,6 +1,6 @@ package cn.hutool.poi.excel.cell.setters; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import java.util.regex.Pattern; diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java index 81e349c2a..f010c415d 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java @@ -6,7 +6,7 @@ import cn.hutool.core.io.resource.Resource; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ReUtil; +import cn.hutool.core.regex.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.SystemPropsUtil; import cn.hutool.log.Log;