From fc8d25dfaca974deb0eb2bfe9c901da0bfa50361 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 29 Dec 2023 21:16:01 +0800 Subject: [PATCH] fix code --- .../dromara/hutool/core/codec/Hashids.java | 2 +- .../core/collection/set/SetFromMap.java | 6 +++- .../core/comparator/ComparatorChain.java | 2 +- .../hutool/core/data/id/SeataSnowflake.java | 2 +- .../hutool/core/data/id/Snowflake.java | 2 +- .../core/date/format/parser/TimeParser.java | 2 +- .../hutool/core/map/concurrent/Weighers.java | 2 +- .../core/net/multipart/UploadFileHeader.java | 4 +-- .../net/ssl/TrustAnyHostnameVerifier.java | 2 +- .../core/net/ssl/TrustAnyTrustManager.java | 2 +- .../lookup/ConstructorLookupFactory.java | 1 - .../stream/spliterators/package-info.java | 18 ++++++++++ .../dromara/hutool/core/text/StrTrimer.java | 6 ++-- .../core/text/placeholder/StrMatcher.java | 2 +- .../segment/AbstractPlaceholderSegment.java | 35 +++++++++++-------- .../hutool/core/text/split/SplitUtil.java | 2 +- .../hutool/core/tree/TreeNodeConfig.java | 2 +- .../dromara/hutool/core/util/SystemUtil.java | 2 +- .../hutool/cron/TaskExecutorManager.java | 5 +++ .../asymmetric/paillier/PaillierCrypto.java | 9 +++-- .../org/dromara/hutool/db/sql/SqlBuilder.java | 2 +- .../org/dromara/hutool/db/sql/SqlLog.java | 2 +- .../hutool/extra/ftp/SimpleFtpServer.java | 4 +-- .../extra/pinyin/engine/PinyinEngine.java | 6 ++-- .../tokenizer/engine/ansj/AnsjResult.java | 6 ---- hutool-http/pom.xml | 9 +---- .../server/servlet/JakartaServletUtil.java | 1 - .../http/server/servlet/ServletUtil.java | 1 - .../org/dromara/hutool/log/AbsLogEngine.java | 2 +- hutool-poi/pom.xml | 7 +--- .../poi/excel/reader/BeanSheetReader.java | 1 + .../poi/excel/sax/handler/BeanRowHandler.java | 1 + 32 files changed, 81 insertions(+), 69 deletions(-) create mode 100644 hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java index 2856f258c..353418ad9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java @@ -344,7 +344,7 @@ public class Hashids implements Encoder, Decoder LongStream decoded = LongStream.empty(); // parse the hash - if (hash.length() > 0) { + if (!hash.isEmpty()) { final char lottery = hash.charAt(startIdx); // create the initial accumulation string diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java index 14a29777c..637475d76 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java @@ -36,6 +36,11 @@ public class SetFromMap extends AbstractSet implements Serializable { private final Map m; // The backing map private transient Set s; // Its keySet + /** + * 构造 + * + * @param map Map + */ public SetFromMap(final Map map) { m = map; s = map.keySet(); @@ -82,7 +87,6 @@ public class SetFromMap extends AbstractSet implements Serializable { return s.toArray(); } - @SuppressWarnings("SuspiciousToArrayCall") @Override public T[] toArray(final T[] a) { return super.toArray(a); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java index c46814a3a..a4ec849c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java @@ -355,7 +355,7 @@ public class ComparatorChain implements Chain, ComparatorChain< * @throws UnsupportedOperationException 为空抛出此异常 */ private void checkChainIntegrity() { - if (chain.size() == 0) { + if (chain.isEmpty()) { throw new UnsupportedOperationException("ComparatorChains must contain at least one Comparator"); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java index 8cc2642cb..afa25c01d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java @@ -43,7 +43,7 @@ public class SeataSnowflake implements Generator, Serializable { /** * 默认的起始时间，为2020-05-03 */ - public static long DEFAULT_TWEPOCH = 1588435200000L; + public static final long DEFAULT_TWEPOCH = 1588435200000L; // 节点ID长度 private static final int NODE_ID_BITS = 10; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java index 23e85d38d..e3ef942de 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java @@ -51,7 +51,7 @@ public class Snowflake implements Generator, Serializable { /** * 默认的起始时间，为Thu, 04 Nov 2010 01:42:54 GMT */ - public static long DEFAULT_TWEPOCH = 1288834974657L; + public static final long DEFAULT_TWEPOCH = 1288834974657L; private static final long WORKER_ID_BITS = 5L; // 最大支持机器节点数0~31，一共32个 private static final long MAX_WORKER_ID = ~(-1L << WORKER_ID_BITS); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java index 24417da0e..c9cd557f9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java @@ -36,7 +36,7 @@ public class TimeParser extends DefaultDateBasic implements PredicateDateParser /** * 单例 */ - public static TimeParser INSTANCE = new TimeParser(); + public static final TimeParser INSTANCE = new TimeParser(); @Override public boolean test(final CharSequence dateStr) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java index cea0d94dd..6815595e6 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java @@ -46,7 +46,7 @@ public final class Weighers { final Weigher weigher) { return (weigher == singleton()) ? Weighers.entrySingleton() - : new EntryWeigherView(weigher); + : new EntryWeigherView<>(weigher); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java index 50ac12198..70f074bc3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java @@ -193,7 +193,7 @@ public class UploadFileHeader { if (formFileName == null) { return; } - if (formFileName.length() == 0) { + if (formFileName.isEmpty()) { path = StrUtil.EMPTY; fileName = StrUtil.EMPTY; } @@ -205,7 +205,7 @@ public class UploadFileHeader { path = formFileName.substring(0, ls); fileName = formFileName.substring(ls); } - if (fileName.length() > 0) { + if (!fileName.isEmpty()) { this.contentType = getContentType(dataHeader); mimeType = getMimeType(contentType); mimeSubtype = getMimeSubtype(contentType); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java index 11fd36e5b..3c9dd7d4e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java @@ -26,7 +26,7 @@ public class TrustAnyHostnameVerifier implements HostnameVerifier { /** * 单例对象 */ - public static TrustAnyHostnameVerifier INSTANCE = new TrustAnyHostnameVerifier(); + public static final TrustAnyHostnameVerifier INSTANCE = new TrustAnyHostnameVerifier(); @Override public boolean verify(final String hostname, final SSLSession session) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java index 7f88cbe56..35d14e91f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java @@ -34,7 +34,7 @@ public class TrustAnyTrustManager extends X509ExtendedTrustManager { * * @since 5.7.8 */ - public static TrustAnyTrustManager INSTANCE = new TrustAnyTrustManager(); + public static final TrustAnyTrustManager INSTANCE = new TrustAnyTrustManager(); @Override public X509Certificate[] getAcceptedIssuers() { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java index d173f604e..47fcea9da 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java @@ -48,7 +48,6 @@ public class ConstructorLookupFactory implements LookupFactory { } } - @SuppressWarnings("JavaReflectionMemberAccess") private static Constructor createLookupConstructor() { final Constructor constructor; try { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java new file mode 100644 index 000000000..519900401 --- /dev/null +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2023. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * spliterator实现 + * + * @author Looly + */ +package org.dromara.hutool.core.stream.spliterators; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java index 06dac76a3..1eae4a3a3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java @@ -29,15 +29,15 @@ public class StrTrimer implements UnaryOperator, Serializable { /** * 去除两边空白符 */ - public static StrTrimer TRIM_BLANK = new StrTrimer(TrimMode.BOTH, CharUtil::isBlankChar); + public static final StrTrimer TRIM_BLANK = new StrTrimer(TrimMode.BOTH, CharUtil::isBlankChar); /** * 去除头部空白符 */ - public static StrTrimer TRIM_PREFIX_BLANK = new StrTrimer(TrimMode.PREFIX, CharUtil::isBlankChar); + public static final StrTrimer TRIM_PREFIX_BLANK = new StrTrimer(TrimMode.PREFIX, CharUtil::isBlankChar); /** * 去除尾部空白符 */ - public static StrTrimer TRIM_SUFFIX_BLANK = new StrTrimer(TrimMode.SUFFIX, CharUtil::isBlankChar); + public static final StrTrimer TRIM_SUFFIX_BLANK = new StrTrimer(TrimMode.SUFFIX, CharUtil::isBlankChar); private final TrimMode mode; private final Predicate predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java index aee992eb0..cdcf4bb8c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java @@ -34,7 +34,7 @@ import java.util.Map; */ public class StrMatcher { - List patterns; + private final List patterns; /** * 构造 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java index 6984eddbf..ce3c9c2ef 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java @@ -20,22 +20,27 @@ package org.dromara.hutool.core.text.placeholder.segment; * @since 6.0.0 */ public abstract class AbstractPlaceholderSegment implements StrTemplateSegment { - /** - * 占位符变量 - *

例如：{@literal "???"->"???", "{}"->"{}", "{name}"->"name"}

- */ - private final String placeholder; + /** + * 占位符变量 + *

例如：{@literal "???"->"???", "{}"->"{}", "{name}"->"name"}

+ */ + private final String placeholder; - protected AbstractPlaceholderSegment(final String placeholder) { - this.placeholder = placeholder; - } + protected AbstractPlaceholderSegment(final String placeholder) { + this.placeholder = placeholder; + } - @Override - public String getText() { - return placeholder; - } + @Override + public String getText() { + return placeholder; + } - public String getPlaceholder() { - return placeholder; - } + /** + * 获取占位符 + * + * @return 占位符 + */ + public String getPlaceholder() { + return placeholder; + } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java index 1e613d9f7..11b6a2ada 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java @@ -36,7 +36,7 @@ public class SplitUtil { /** * 无限制切分个数 */ - public static int UNLIMITED = -1; + public static final int UNLIMITED = -1; // region ----- split to diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java index 24df0714e..5e751cc4f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java @@ -25,7 +25,7 @@ public class TreeNodeConfig implements Serializable { /** * 默认属性配置对象 */ - public static TreeNodeConfig DEFAULT_CONFIG = new TreeNodeConfig(); + public static final TreeNodeConfig DEFAULT_CONFIG = new TreeNodeConfig(); // 属性名配置字段 private String idKey = "id"; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java index 34abc4c21..0d3ff0b21 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java @@ -33,7 +33,7 @@ public class SystemUtil { /** * Hutool自定义系统属性：是否解析日期字符串采用严格模式 */ - public static String HUTOOL_DATE_LENIENT = "hutool.date.lenient"; + public static final String HUTOOL_DATE_LENIENT = "hutool.date.lenient"; /** * 取得系统属性，如果因为Java安全的限制而失败，则将错误打在Log中，然后返回 defaultValue diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java index 1fe971e61..46190555b 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java @@ -40,6 +40,11 @@ public class TaskExecutorManager implements Serializable { */ private final List executors = new ArrayList<>(); + /** + * 构造 + * + * @param scheduler {@link Scheduler} + */ public TaskExecutorManager(final Scheduler scheduler) { this.scheduler = scheduler; } diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java index ad9b1e370..79baeec20 100755 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java @@ -23,16 +23,16 @@ import java.security.*; * 同态加密算法Paillier
* 来自：https://github.com/peterstefanov/paillier
* 来自：https://github.com/dromara/hutool/pull/3131 - * + *

* 加法同态，存在有效算法+，E(x+y)=E(x)+E(y)或者 x+y=D(E(x)+E(y))成立，并且不泄漏 x 和 y。 * 乘法同态，存在有效算法*，E(x×y)=E(x)*E(y)或者 xy=D(E(x)*E(y))成立，并且不泄漏 x 和 y。 - * + *

* 方案安全性可以归约到判定性合数剩余假设（Decisional Composite Residuosity Assumption, DCRA），即给定一个合数n和整数z，判定z是否在n^2下是否是n次剩余是困难的。 * 这个假设经过了几十年的充分研究，到目前为止还没有多项式时间的算法可以攻破，所以Paillier加密方案的安全性被认为相当可靠。 - * + *

* 字符串文本加解密相互配对,此时无法使用同态加法和同态乘法 * 数值类型不可使用字符串加解密 - * + *

* 公钥加密和同态加法/同态乘法运算 * 私钥解密 * @@ -45,7 +45,6 @@ public class PaillierCrypto extends AbstractAsymmetricCrypto { /** * 构造，使用随机密钥对 - * */ public PaillierCrypto() { this(PaillierKeyPairGenerator.of().generateKeyPair()); diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java index bea4c99c8..78acfc679 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java @@ -264,7 +264,7 @@ public class SqlBuilder implements Builder { sql.append("UPDATE ").append(tableName).append(" SET "); entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field)) { - if (paramValues.size() > 0) { + if (!paramValues.isEmpty()) { sql.append(", "); } sql.append((null != quoteWrapper) ? quoteWrapper.wrap(field) : field).append(" = ? "); diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java index 3b223b584..facb216f2 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java @@ -26,7 +26,7 @@ public class SqlLog { /** * 单例 */ - public static SqlLog INSTANCE = new SqlLog(); + public static final SqlLog INSTANCE = new SqlLog(); private final static Log log = Log.get(); diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java index 308f5ce74..01194fb3f 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java @@ -48,8 +48,8 @@ public class SimpleFtpServer { return new SimpleFtpServer(); } - FtpServerFactory serverFactory; - ListenerFactory listenerFactory; + private final FtpServerFactory serverFactory; + private final ListenerFactory listenerFactory; /** * 构造 diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java index 6f82d58f2..d58b7f9c7 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java @@ -37,7 +37,7 @@ public interface PinyinEngine { /** * 获取字符串对应的完整拼音，非中文返回原字符 * - * @param str 字符串 + * @param str 字符串 * @param separator 拼音之间的分隔符 * @return 拼音 */ @@ -56,13 +56,13 @@ public interface PinyinEngine { /** * 将输入字符串转为拼音首字母，其它字符原样返回 * - * @param str 任意字符，汉字返回拼音，非汉字原样返回 + * @param str 任意字符，汉字返回拼音，非汉字原样返回 * @param separator 分隔符 * @return 汉字返回拼音，非汉字原样返回 */ default String getFirstLetter(final String str, final String separator) { final String splitSeparator = StrUtil.isEmpty(separator) ? "#" : separator; final List split = SplitUtil.split(getPinyin(str, splitSeparator), splitSeparator); - return CollUtil.join(split, separator, (s)->String.valueOf(s.length() > 0 ? s.charAt(0) : StrUtil.EMPTY)); + return CollUtil.join(split, separator, (s) -> String.valueOf(!s.isEmpty() ? s.charAt(0) : StrUtil.EMPTY)); } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java index 4b7436127..6f89ae6aa 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java @@ -51,10 +51,4 @@ public class AnsjResult implements Result { public void remove() { result.remove(); } - - @Override - public Iterator iterator() { - return this; - } - } diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 5081903ff..28233028e 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -82,17 +82,10 @@ com.squareup.okhttp3 okhttp - 4.11.0 + 4.12.0 provided - - - org.dromara.hutool - hutool-json - ${project.parent.version} - test - org.brotli dec diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java index 4bb3b72c5..9c008322d 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java @@ -392,7 +392,6 @@ public class JakartaServletUtil { public static boolean isIE(final HttpServletRequest request) { String userAgent = getHeaderIgnoreCase(request, "User-Agent"); if (StrUtil.isNotBlank(userAgent)) { - //noinspection ConstantConditions userAgent = userAgent.toUpperCase(); return userAgent.contains("MSIE") || userAgent.contains("TRIDENT"); } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java index fbb7edd7e..afd49d873 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java @@ -403,7 +403,6 @@ public class ServletUtil { public static boolean isIE(final HttpServletRequest request) { String userAgent = getHeaderIgnoreCase(request, "User-Agent"); if (StrUtil.isNotBlank(userAgent)) { - //noinspection ConstantConditions userAgent = userAgent.toUpperCase(); return userAgent.contains("MSIE") || userAgent.contains("TRIDENT"); } diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java b/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java index 9e3d760a7..cdfe02a65 100755 --- a/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java @@ -26,7 +26,7 @@ public abstract class AbsLogEngine implements LogEngine { /** * 日志框架名，用于打印当前所用日志框架 */ - protected String name; + private final String name; /** * 构造 diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 5f0a3be63..01f1c32b6 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -40,11 +40,6 @@ hutool-core ${project.parent.version} - - org.dromara.hutool - hutool-log - ${project.parent.version} - @@ -58,7 +53,7 @@ org.ofdrw ofdrw-full - 2.1.0 + 2.2.4 compile true diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java index 6c3170f2d..b48314447 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java @@ -26,6 +26,7 @@ import java.util.Map; * * @author looly * @since 5.4.4 + * @param 结果类型 */ public class BeanSheetReader implements SheetReader> { diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java index f44aad9ab..04a61998a 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java @@ -26,6 +26,7 @@ import java.util.List; * * @author looly * @since 5.4.4 + * @param 结果类型 */ public abstract class BeanRowHandler extends AbstractRowHandler {