lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2020-12-02 04:37:06 +08:00
parent 77e6759d9a
commit 61f58a9b62
36 changed files with 132 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
View File

@ -4,7 +4,7 @@
2. 请确认没有更改代码风格（如tab缩进）
3. 新特性添加请确认注释完备，如有必要，请在src/test/java下添加Junit测试用例
### 修改描述(包括说明bug修复还是新特性添加)
### 修改描述(包括说明bug修复或者添加新特性)
1. [bug修复] balabala……
2. [新特性] balabala……

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -4,7 +4,7 @@
2. 请确认没有更改代码风格（如tab缩进）
3. 新特性添加请确认注释完备，如有必要，请在src/test/java下添加Junit测试用例
### 修改描述(包括说明bug修复还是新特性添加)
### 修改描述(包括说明bug修复或者添加新特性)
1. [bug修复] balabala……
2. [新特性] balabala……

4
README-EN.md
View File

@ -65,7 +65,7 @@
Hutool,' Hútú '(Chinese Pinyin)，On the one hand, it is simple and easy to understand, on the other hand, it means "hard to be confused".(note: confused means 'Hútú (糊涂)' in china )
### How Hutool is changing the way we coding
### How Hutool is changing the way we code
The goal of **Hutool** is to use a simple function instead of a complex piece of code, thus avoiding the problem of "copy and paste" code as much as possible and revolutionizing the way we write code.
@ -182,7 +182,7 @@ Hutool welcomes anyone to contribute code to Hutool, but the author suffers from
1. Improve the comments, especially each new method should follow the Java documentation specification to indicate the method description, parameter description, return value description and other information, if necessary, please add unit tests, if you want, you can also add your name.
2. Code indentation according to Eclipse.
3. Newly added methods do not use third-party library methods，Unless the method tool is added to the '**extra module**'.
3. Newly added methods do not use third-party library methods，Unless the method tool is add to the '**extra module**'.
4. Please pull request to the `v5-dev` branch. Hutool uses a new branch after 5.x: `v5-master` is the master branch, which indicates the version of the central library that has been released, and this branch does not allow pr or modifications.
-------------------------------------------------------------------------------

2
README.md
View File

@ -55,7 +55,7 @@
## 简介
Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。
Hutool中的工具方法来自于每个用户的精雕细琢，它涵盖了Java开发底层代码中的方方面面，它既是大型项目开发中解决小问题的利器，也是小型项目中的效率担当；
Hutool中的工具方法来自每个用户的精雕细琢，它涵盖了Java开发底层代码中的方方面面，它既是大型项目开发中解决小问题的利器，也是小型项目中的效率担当；
Hutool是项目中“util”包友好的替代，它节省了开发人员对项目中公用类和公用工具方法的封装时间，使开发专注于业务，同时可以最大限度的避免封装不完善带来的bug。

3
hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java
View File

@ -13,9 +13,8 @@ public class JdkProxyFactory extends ProxyFactory {
private static final long serialVersionUID = 1L;
@Override
@SuppressWarnings("unchecked")
public <T> T proxy(T target, Aspect aspect) {
return (T) ProxyUtil.newProxyInstance(//
return ProxyUtil.newProxyInstance(//
target.getClass().getClassLoader(), //
new JdkInterceptor(target, aspect), //
target.getClass().getInterfaces());

4
hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java
View File

@ -33,14 +33,14 @@ public class IntMap implements BitMap, Serializable {
public void add(long i) {
int r = (int) (i / BitMap.MACHINE32);
int c = (int) (i % BitMap.MACHINE32);
ints[r] = (int) (ints[r] | (1 << c));
ints[r] = ints[r] | (1 << c);
}
@Override
public boolean contains(long i) {
int r = (int) (i / BitMap.MACHINE32);
int c = (int) (i % BitMap.MACHINE32);
return ((int) ((ints[r] >>> c)) & 1) == 1;
return ((ints[r] >>> c) & 1) == 1;
}
@Override

2
hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java
View File

@ -66,7 +66,7 @@ public class BeanPath implements Serializable{
* </pre>
*
* @param expression 表达式
* @return {@link BeanPath}
* @return BeanPath
*/
public static BeanPath create(String expression) {
return new BeanPath(expression);

8
hutool-core/src/main/java/cn/hutool/core/codec/Base62Codec.java
View File

@ -1,10 +1,10 @@
package cn.hutool.core.codec;
import cn.hutool.core.util.ArrayUtil;
import java.io.ByteArrayOutputStream;
import java.io.Serializable;
import cn.hutool.core.util.ArrayUtil;
/**
* Base62编码解码实现，常用于短URL<br>
* From https://github.com/seruco/base62
@ -49,7 +49,7 @@ public class Base62Codec implements Serializable{
/**
* 创建GMP风格的Base62编码解码器对象
*
* @return {@link Base62Codec}
* @return Base62Codec
*/
public static Base62Codec createGmp() {
return new Base62Codec(GMP);
@ -58,7 +58,7 @@ public class Base62Codec implements Serializable{
/**
* 创建Inverted风格的Base62编码解码器对象
*
* @return {@link Base62Codec}
* @return Base62Codec
*/
public static Base62Codec createInverted() {
return new Base62Codec(INVERTED);

1
hutool-core/src/main/java/cn/hutool/core/date/BetweenFormater.java
View File

@ -9,6 +9,7 @@ package cn.hutool.core.date;
*/
@Deprecated
public class BetweenFormater extends BetweenFormatter {
private static final long serialVersionUID = 1L;
public BetweenFormater(long betweenMs, Level level) {
super(betweenMs, level);

12
hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
View File

@ -61,25 +61,17 @@ public class SystemClock {
public static final SystemClock INSTANCE = new SystemClock(1);
}
/**
* 单例实例
* @return 单例实例
*/
private static SystemClock instance() {
return InstanceHolder.INSTANCE;
}
/**
* @return 当前时间
*/
public static long now() {
return instance().currentTimeMillis();
return InstanceHolder.INSTANCE.currentTimeMillis();
}
/**
* @return 当前时间字符串表现形式
*/
public static String nowDate() {
return new Timestamp(instance().currentTimeMillis()).toString();
return new Timestamp(InstanceHolder.INSTANCE.currentTimeMillis()).toString();
}
}

68
hutool-core/src/main/java/cn/hutool/core/date/format/FastDateFormat.java
View File

@ -50,20 +50,20 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
// -----------------------------------------------------------------------
/**
* 获得 {@link FastDateFormat} 实例，使用默认格式和地区
* 获得 FastDateFormat实例，使用默认格式和地区
*
* @return {@link FastDateFormat}
* @return FastDateFormat
*/
public static FastDateFormat getInstance() {
return CACHE.getInstance();
}
/**
* 获得 {@link FastDateFormat} 实例，使用默认地区<br>
* 获得 FastDateFormat 实例，使用默认地区<br>
* 支持缓存
*
* @param pattern 使用{@link java.text.SimpleDateFormat} 相同的日期格式
* @return {@link FastDateFormat}
* @return FastDateFormat
* @throws IllegalArgumentException 日期格式问题
*/
public static FastDateFormat getInstance(final String pattern) {
@ -71,12 +71,12 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param pattern 使用{@link java.text.SimpleDateFormat} 相同的日期格式
* @param timeZone 时区{@link TimeZone}
* @return {@link FastDateFormat}
* @return FastDateFormat
* @throws IllegalArgumentException 日期格式问题
*/
public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone) {
@ -84,12 +84,12 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param pattern 使用{@link java.text.SimpleDateFormat} 相同的日期格式
* @param locale {@link Locale} 日期地理位置
* @return {@link FastDateFormat}
* @return FastDateFormat
* @throws IllegalArgumentException 日期格式问题
*/
public static FastDateFormat getInstance(final String pattern, final Locale locale) {
@ -97,13 +97,13 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param pattern 使用{@link java.text.SimpleDateFormat} 相同的日期格式
* @param timeZone 时区{@link TimeZone}
* @param locale {@link Locale} 日期地理位置
* @return {@link FastDateFormat}
* @return FastDateFormat
* @throws IllegalArgumentException 日期格式问题
*/
public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone, final Locale locale) {
@ -112,48 +112,48 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
// -----------------------------------------------------------------------
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style date style: FULL, LONG, MEDIUM, or SHORT
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateInstance(final int style) {
return CACHE.getDateInstance(style, null, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style date style: FULL, LONG, MEDIUM, or SHORT
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateInstance(final int style, final Locale locale) {
return CACHE.getDateInstance(style, null, locale);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style date style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone 时区{@link TimeZone}
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone) {
return CACHE.getDateInstance(style, timeZone, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style date style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone 时区{@link TimeZone}
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone, final Locale locale) {
return CACHE.getDateInstance(style, timeZone, locale);
@ -161,48 +161,48 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
// -----------------------------------------------------------------------
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style time style: FULL, LONG, MEDIUM, or SHORT
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getTimeInstance(final int style) {
return CACHE.getTimeInstance(style, null, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style time style: FULL, LONG, MEDIUM, or SHORT
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getTimeInstance(final int style, final Locale locale) {
return CACHE.getTimeInstance(style, null, locale);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone optional time zone, overrides time zone of formatted time
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone) {
return CACHE.getTimeInstance(style, timeZone, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param style time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone optional time zone, overrides time zone of formatted time
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone, final Locale locale) {
return CACHE.getTimeInstance(style, timeZone, locale);
@ -210,52 +210,52 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
// -----------------------------------------------------------------------
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle) {
return CACHE.getDateTimeInstance(dateStyle, timeStyle, null, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final Locale locale) {
return CACHE.getDateTimeInstance(dateStyle, timeStyle, null, locale);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone 时区{@link TimeZone}
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone timeZone) {
return getDateTimeInstance(dateStyle, timeStyle, timeZone, null);
}
/**
* 获得 {@link FastDateFormat} 实例<br>
* 获得 FastDateFormat 实例<br>
* 支持缓存
*
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone 时区{@link TimeZone}
* @param locale {@link Locale} 日期地理位置
* @return 本地化 {@link FastDateFormat}
* @return 本地化 FastDateFormat
*/
public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone timeZone, final Locale locale) {
return CACHE.getDateTimeInstance(dateStyle, timeStyle, timeZone, locale);

13
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java
View File

@ -767,12 +767,11 @@ public class FileUtil extends PathUtil {
final File[] files = directory.listFiles();
if (ArrayUtil.isEmpty(files)) {
// 空文件夹则删除之
//noinspection ResultOfMethodCallIgnored
directory.delete();
} else {
for (File childFile : files) {
cleanEmpty(childFile);
}
return directory.delete();
}
for (File childFile : files) {
cleanEmpty(childFile);
}
return true;
}
@ -1666,7 +1665,7 @@ public class FileUtil extends PathUtil {
* </pre>
*
* @param file 文件 {@link File}
* @return 类型，文件的扩展名，未找到为<code>null</code>
* @return 类型，文件的扩展名，未找到为{@code null}
* @throws IORuntimeException IO异常
* @see FileTypeUtil#getType(File)
*/

3
hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC16.java
View File

@ -3,6 +3,7 @@ package cn.hutool.core.io.checksum;
import cn.hutool.core.io.checksum.crc16.CRC16Checksum;
import cn.hutool.core.io.checksum.crc16.CRC16IBM;
import java.io.Serializable;
import java.util.zip.Checksum;
/**
@ -11,7 +12,7 @@ import java.util.zip.Checksum;
* @author looly
* @since 4.4.1
*/
public class CRC16 implements Checksum {
public class CRC16 implements Checksum, Serializable {
private static final long serialVersionUID = 1L;
private final CRC16Checksum crc16;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Ansi.java
View File

@ -7,6 +7,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16Ansi extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xa001;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITT.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16CCITT extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0x8408;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java
View File

@ -7,6 +7,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16CCITTFalse extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0x1021;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16DNP.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16DNP extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xA6BC;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16IBM.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16IBM extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xa001;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Maxim.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16Maxim extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xa001;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Modbus.java
View File

@ -9,6 +9,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16Modbus extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xa001;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16USB.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16USB extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0xa001;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16X25.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16X25 extends CRC16Checksum{
private static final long serialVersionUID = 1L;
private static final int WC_POLY = 0x8408;

1
hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16XModem.java
View File

@ -8,6 +8,7 @@ package cn.hutool.core.io.checksum.crc16;
* @since 5.3.10
*/
public class CRC16XModem extends CRC16Checksum{
private static final long serialVersionUID = 1L;
// 0001 0000 0010 0001 (0, 5, 12)
private static final int WC_POLY = 0x1021;

16
hutool-core/src/main/java/cn/hutool/core/lang/Validator.java
View File

@ -92,7 +92,7 @@ public class Validator {
public final static Pattern PLATE_NUMBER = PatternPool.PLATE_NUMBER;
/**
* 给定值是否为<code>true</code>
* 给定值是否为{@code true}
*
* @param value 值
* @return 是否为<code>true</code>
@ -103,7 +103,7 @@ public class Validator {
}
/**
* 给定值是否不为<code>false</code>
* 给定值是否不为{@code false}
*
* @param value 值
* @return 是否不为<code>false</code>
@ -114,7 +114,7 @@ public class Validator {
}
/**
* 检查指定值是否为<code>true</code>
* 检查指定值是否为{@code true}
*
* @param value 值
* @param errorMsgTemplate 错误消息内容模板（变量使用{}表示）
@ -131,7 +131,7 @@ public class Validator {
}
/**
* 检查指定值是否为<code>false</code>
* 检查指定值是否为{@code false}
*
* @param value 值
* @param errorMsgTemplate 错误消息内容模板（变量使用{}表示）
@ -148,7 +148,7 @@ public class Validator {
}
/**
* 给定值是否为<code>null</code>
* 给定值是否为{@code null}
*
* @param value 值
* @return 是否为<code>null</code>
@ -158,7 +158,7 @@ public class Validator {
}
/**
* 给定值是否不为<code>null</code>
* 给定值是否不为{@code null}
*
* @param value 值
* @return 是否不为<code>null</code>
@ -168,7 +168,7 @@ public class Validator {
}
/**
* 检查指定值是否为<code>null</code>
* 检查指定值是否为{@code null}
*
* @param <T> 被检查的对象类型
* @param value 值
@ -186,7 +186,7 @@ public class Validator {
}
/**
* 检查指定值是否非<code>null</code>
* 检查指定值是否非{@code null}
*
* @param <T> 被检查的对象类型
* @param value 值

1
hutool-core/src/main/java/cn/hutool/core/map/BiMap.java
View File

@ -13,6 +13,7 @@ import java.util.Map;
* @since 5.2.6
*/
public class BiMap<K, V> extends MapWrapper<K, V> {
private static final long serialVersionUID = 1L;
private Map<V, K> inverse;

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

@ -296,7 +296,7 @@ public class NetUtil {
* 获取指定名称的网卡信息
*
* @param name 网络接口名，例如Linux下默认是eth0
* @return 网卡，未找到返回<code>null</code>
* @return 网卡，未找到返回{@code null}
* @since 5.0.7
*/
public static NetworkInterface getNetworkInterface(String name) {
@ -321,7 +321,7 @@ public class NetUtil {
/**
* 获取本机所有网卡
*
* @return 所有网卡，异常返回<code>null</code>
* @return 所有网卡，异常返回{@code null}
* @since 3.0.1
*/
public static Collection<NetworkInterface> getNetworkInterfaces() {
@ -425,11 +425,11 @@ public class NetUtil {
/**
* 获取本机网卡IP地址，这个地址为所有网卡中非回路地址的第一个<br>
* 如果获取失败调用 {@link InetAddress#getLocalHost()}方法获取。<br>
* 此方法不会抛出异常，获取失败将返回<code>null</code><br>
* 此方法不会抛出异常，获取失败将返回{@code null}<br>
* <p>
* 参考：http://stackoverflow.com/questions/9481865/getting-the-ip-address-of-the-current-machine-using-java
*
* @return 本机网卡IP地址，获取失败返回<code>null</code>
* @return 本机网卡IP地址，获取失败返回{@code null}
* @since 3.0.7
*/
public static String getLocalhostStr() {
@ -448,11 +448,11 @@ public class NetUtil {
* 2. 如果无满足要求的地址，调用 {@link InetAddress#getLocalHost()} 获取地址
* </pre>
* <p>
* 此方法不会抛出异常，获取失败将返回<code>null</code><br>
* 此方法不会抛出异常，获取失败将返回{@code null}<br>
* <p>
* 见：https://github.com/looly/hutool/issues/428
*
* @return 本机网卡IP地址，获取失败返回<code>null</code>
* @return 本机网卡IP地址，获取失败返回{@code null}
* @since 3.0.1
*/
public static InetAddress getLocalhost() {
@ -674,6 +674,7 @@ public class NetUtil {
* @since 4.4.1
* @deprecated 拼写错误，请使用{@link #isUnknown(String)}
*/
@Deprecated
public static boolean isUnknow(String checkString) {
return isUnknown(checkString);
}

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

@ -1765,7 +1765,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
// O(n)时间复杂度检查数组是否有序
/**
* 检查数组是否有序，即comparator.compare(array[i], array[i + 1]) <= 0，若传入空数组或空比较器，则返回false
* 检查数组是否有序，即comparator.compare(array[i], array[i + 1]) &lt;= 0，若传入空数组或空比较器，则返回false
*
* @param array 数组
* @param comparator 比较器
@ -1788,7 +1788,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i].compareTo(array[i + 1]) <= 0，若传入空数组，则返回false
* 检查数组是否升序，即array[i].compareTo(array[i + 1]) &lt;= 0，若传入空数组，则返回false
*
* @param <T> 数组元素类型，该类型需要实现Comparable接口
* @param array 数组
@ -1802,7 +1802,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
/**
* 检查数组是否升序，即array[i].compareTo(array[i + 1]) <= 0，若传入空数组，则返回false
* 检查数组是否升序，即array[i].compareTo(array[i + 1]) &lt;= 0，若传入空数组，则返回false
*
* @param <T> 数组元素类型，该类型需要实现Comparable接口
* @param array 数组
@ -1825,7 +1825,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i].compareTo(array[i + 1]) >= 0，若传入空数组，则返回false
* 检查数组是否降序，即array[i].compareTo(array[i + 1]) &gt;= 0，若传入空数组，则返回false
*
* @param <T> 数组元素类型，该类型需要实现Comparable接口
* @param array 数组

42
hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
View File

@ -3005,7 +3005,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3017,7 +3017,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3039,7 +3039,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3061,7 +3061,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3073,7 +3073,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3095,7 +3095,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3117,7 +3117,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3129,7 +3129,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3151,7 +3151,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3173,7 +3173,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3185,7 +3185,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3207,7 +3207,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3229,7 +3229,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3241,7 +3241,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3263,7 +3263,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3285,7 +3285,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3297,7 +3297,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3319,7 +3319,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序
@ -3341,7 +3341,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3353,7 +3353,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否升序，即array[i] <= array[i+1]，若传入空数组，则返回false
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否升序
@ -3375,7 +3375,7 @@ public class PrimitiveArrayUtil {
}
/**
* 检查数组是否降序，即array[i] >= array[i+1]，若传入空数组，则返回false
* 检查数组是否降序，即array[i] &gt;= array[i+1]，若传入空数组，则返回false
*
* @param array 数组
* @return 数组是否降序

2
hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java
View File

@ -51,6 +51,6 @@ public class VersionComparatorTest {
public void equalsTest(){
VersionComparator first = new VersionComparator();
VersionComparator other = new VersionComparator();
Assert.assertFalse(first.equals(other));
Assert.assertNotEquals(first, other);
}
}

4
hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
View File

@ -90,7 +90,7 @@ public class SM4 extends SymmetricCrypto{
* @param iv 偏移向量，加盐
*/
public SM4(Mode mode, Padding padding, SecretKey key, byte[] iv) {
this(mode, padding, key, ArrayUtil.isEmpty(iv) ? ((IvParameterSpec) null) : new IvParameterSpec(iv));
this(mode, padding, key, ArrayUtil.isEmpty(iv) ? null : new IvParameterSpec(iv));
}
/**
@ -137,7 +137,7 @@ public class SM4 extends SymmetricCrypto{
public SM4(String mode, String padding, byte[] key, byte[] iv) {
this(mode, padding,//
SecureUtil.generateKey(ALGORITHM_NAME, key),//
ArrayUtil.isEmpty(iv) ? ((IvParameterSpec) null) : new IvParameterSpec(iv));
ArrayUtil.isEmpty(iv) ? null : new IvParameterSpec(iv));
}
/**

1
hutool-db/src/main/java/cn/hutool/db/meta/Column.java
View File

@ -65,6 +65,7 @@ public class Column implements Serializable, Cloneable {
* @return 列对象
* @deprecated 请使用 {@link #create(Table, ResultSet)}
*/
@Deprecated
public static Column create(String tableName, ResultSet columnMetaRs) {
return new Column(tableName, columnMetaRs);
}

2
hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
View File

@ -29,6 +29,6 @@ public class UpdateTest {
int update = db.update(Entity.create("user").set("age", 88), Entity.create().set("name", "unitTestUser"));
Assert.assertTrue(update > 0);
Entity result2 = db.get("user", "name", "unitTestUser");
Assert.assertSame(88, (int) result2.getInt("age"));
Assert.assertSame(88, result2.getInt("age"));
}
}

6
hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlTemplate.java
View File

@ -1,12 +1,12 @@
package cn.hutool.extra.template.engine.beetl;
import cn.hutool.extra.template.AbstractTemplate;
import java.io.OutputStream;
import java.io.Serializable;
import java.io.Writer;
import java.util.Map;
import cn.hutool.extra.template.AbstractTemplate;
/**
* Beetl模板实现
*
@ -21,7 +21,7 @@ public class BeetlTemplate extends AbstractTemplate implements Serializable{
* 包装Beetl模板
*
* @param beetlTemplate Beetl的模板对象 {@link org.beetl.core.Template}
* @return {@link BeetlTemplate}
* @return BeetlTemplate
*/
public static BeetlTemplate wrap(org.beetl.core.Template beetlTemplate) {
return (null == beetlTemplate) ? null : new BeetlTemplate(beetlTemplate);

4
hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlUtil.java
View File

@ -260,7 +260,7 @@ public final class BeetlUtil {
/**
* 创建
*
* @return {@link ResourceLoaderBuilder}
* @return ResourceLoaderBuilder
*/
public static ResourceLoaderBuilder create() {
return new ResourceLoaderBuilder();
@ -271,7 +271,7 @@ public final class BeetlUtil {
*
* @param matcher {@link Matcher} 匹配器
* @param resourceLoader {@link ResourceLoader} 匹配时对应的资源加载器
* @return {@link ResourceLoaderBuilder}
* @return ResourceLoaderBuilder
*/
public ResourceLoaderBuilder add(Matcher matcher, ResourceLoader<?> resourceLoader) {
compositeResourceLoader.addResourceLoader(matcher, resourceLoader);

4
hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
View File

@ -20,9 +20,9 @@ public class EmojiUtilTest {
@Test
public void containsEmojiTest() {
boolean containsEmoji = EmojiUtil.containsEmoji("测试一下是否包含EMOJ:😄");
Assert.assertEquals(containsEmoji, true);
Assert.assertTrue(containsEmoji);
boolean notContainsEmoji = EmojiUtil.containsEmoji("不包含EMOJ:^_^");
Assert.assertEquals(notContainsEmoji, false);
Assert.assertFalse(notContainsEmoji);
}
}

21
hutool-http/src/main/java/cn/hutool/http/HTMLFilter.java
View File

@ -1,5 +1,8 @@
package cn.hutool.http;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -10,9 +13,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharUtil;
/**
* HTML过滤器，用于去除XSS(Cross Site Scripting) 漏洞隐患。
*
@ -74,11 +74,11 @@ public final class HTMLFilter {
private final Map<String, Integer> vTagCounts = new HashMap<>();
/**
* html elements which must always be self-closing (e.g. "<img />")
* html elements which must always be self-closing (e.g. "&lt;img /&gt;")
**/
private final String[] vSelfClosingTags;
/**
* html elements which must always have separate opening and closing tags (e.g. "<b></b>")
* html elements which must always have separate opening and closing tags (e.g. "&lt;b&gt;&lt;/b&gt;")
**/
private final String[] vNeedClosingTags;
/**
@ -94,7 +94,7 @@ public final class HTMLFilter {
**/
private final String[] vAllowedProtocols;
/**
* tags which should be removed if they contain no content (e.g. "<b></b>" or "<b />")
* tags which should be removed if they contain no content (e.g. "&lt;b&gt;&lt;/b&gt;" or "&lt;b /&gt;")
**/
private final String[] vRemoveBlanks;
/**
@ -108,7 +108,8 @@ public final class HTMLFilter {
private final boolean encodeQuotes;
private boolean vDebug = false;
/**
* flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>" becomes "<b> text </b>"). If set to false, unbalanced angle brackets will be
* flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "&lt;b text &lt;/b&gt;" becomes "&lt;b&gt; text &lt;/g&gt;").
* If set to false, unbalanced angle brackets will be
* html escaped.
*/
private final boolean alwaysMakeTags;
@ -452,7 +453,7 @@ public final class HTMLFilter {
Matcher m = P_ENTITY.matcher(s);
while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.decode(match).intValue();
final int decimal = Integer.decode(match);
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
}
m.appendTail(buf);
@ -462,7 +463,7 @@ public final class HTMLFilter {
m = P_ENTITY_UNICODE.matcher(s);
while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.valueOf(match, 16).intValue();
final int decimal = Integer.parseInt(match, 16);
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
}
m.appendTail(buf);
@ -472,7 +473,7 @@ public final class HTMLFilter {
m = P_ENCODE.matcher(s);
while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.valueOf(match, 16).intValue();
final int decimal = Integer.parseInt(match, 16);
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
}
m.appendTail(buf);