+ 
-
+
🍬A set of tools that keep Java sweet.
@@ -51,7 +51,7 @@
-------------------------------------------------------------------------------
## 📚Introduction
-**Hutool** is a small but comprehensive library of Java tools, encapsulation by static methods, reduce the cost of learning related APIs, increase productivity, and make Java as elegant as a functional programming language,let the Java be "sweet" too.
+**Hutool** is a small but comprehensive library of Java tools, achieved by encapsulation through static methods, reduce the cost of learning related APIs, increase productivity, and make Java as elegant as a functional programming language,let the Java be "sweet" too.
**Hutool** tools and methods from each user's crafted, it covers all aspects of the underlying code of Java development, it is a powerful tool for large project development to solve small problems, but also the efficiency of small projects;
@@ -138,18 +138,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop：
-
+
🍬A set of tools that keep Java sweet.
@@ -141,21 +141,21 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
-
+
🍬A set of tools that keep Java sweet.
diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml
index d8d3e5d78..4fa5a70ed 100755
--- a/hutool-core/pom.xml
+++ b/hutool-core/pom.xml
@@ -9,23 +9,15 @@
- * '你' =》\u4f60 + * 你 =》 \u4f60 ** * @param value int值，也可以是char @@ -278,7 +278,7 @@ public class HexUtil { * 转换的字符串如果u后不足4位，则前面用0填充，例如： * *
- * '你' =》'\u4f60' + * 你 =》 \u4f60 ** * @param ch char值 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java index 1a1e810aa..52b522892 100755 --- a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java @@ -1,6 +1,6 @@ package cn.hutool.core.codec; -import cn.hutool.core.codec.BaseN.Base16Codec; +import cn.hutool.core.codec.binary.Base16Codec; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharPool; import cn.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/BaseN/Base16Codec.java b/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/codec/BaseN/Base16Codec.java rename to hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java index 8d05d17c9..3fa9dc553 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/BaseN/Base16Codec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec.BaseN; +package cn.hutool.core.codec.binary; import cn.hutool.core.codec.Decoder; import cn.hutool.core.codec.Encoder; @@ -81,7 +81,7 @@ public class Base16Codec implements Encoder
- * 官方实现：https://github.com/jandrewrogers/MetroHash
- * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
- * Go语言实现：https://github.com/linvon/cuckoo-filter/blob/main/vendor/github.com/dgryski/go-metro/
- *
- * @author li
- */
-public class MetroHash implements Hash64
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ *
+ * @author Marius Posta
+ * @param
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ *
+ * @param
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ * @author Marius Posta
+ */
+public class MetroHash128 extends AbstractMetroHash
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ * @author Marius Posta
+ */
+public class MetroHash64 extends AbstractMetroHash
+ * 参考：https://github.com/postamar/java-metrohash
+ *
+ * @author postamar, looly
+ */
+package cn.hutool.core.codec.hash.metro;
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index 3ac2129fd..531378f2a 100755
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -363,7 +363,7 @@ public class CollUtil {
* 例如：集合1：[a, b, c, c, c]，集合2：[a, b, c, c]
* see： http://git.oschina.net/yu120/sequence
* @author lry, looly
*/
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java
index c737af574..51483bf34 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java
@@ -164,8 +164,6 @@ public class TemporalAccessorUtil extends TemporalUtil{
result = ((OffsetTime) temporalAccessor).atDate(LocalDate.now()).toInstant();
} else {
// issue#1891@Github
- // Instant.from不能完成日期转换
- //result = Instant.from(temporalAccessor);
result = toInstant(TimeUtil.of(temporalAccessor));
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java
index fbc0a95c0..1fd6b8e0e 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java
@@ -1,30 +1,18 @@
package cn.hutool.core.date;
import cn.hutool.core.date.format.GlobalCustomFormat;
+import cn.hutool.core.lang.func.LambdaUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ObjUtil;
-import java.time.DayOfWeek;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.Period;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.ChronoLocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoField;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAdjusters;
-import java.time.temporal.TemporalUnit;
-import java.time.temporal.WeekFields;
+import java.time.temporal.*;
import java.util.Date;
import java.util.TimeZone;
+import java.util.function.Function;
/**
* JDK8+中的{@link java.time} 工具类封装
@@ -35,11 +23,6 @@ import java.util.TimeZone;
* @since 6.0.0
*/
public class TimeUtil extends TemporalAccessorUtil {
- /**
- * UTC 的 ZoneID
- */
- public static final ZoneId ZONE_ID_UTC = ZoneId.of("UTC");
-
/**
* 当前时间，默认时区
*
@@ -65,7 +48,7 @@ public class TimeUtil extends TemporalAccessorUtil {
* @return {@link LocalDateTime}
*/
public static LocalDateTime ofUTC(final Instant instant) {
- return of(instant, ZONE_ID_UTC);
+ return of(instant, ZoneUtil.ZONE_ID_UTC);
}
/**
@@ -234,7 +217,7 @@ public class TimeUtil extends TemporalAccessorUtil {
/**
* 解析日期时间字符串为{@link LocalDateTime}，格式支持日期时间、日期、时间
- * 从5.7.6开始，删除文件使用{@link Files#delete(Path)}代替 {@link File#delete()}
+ * 此方法会更新hash值状态
+ *
+ * @param input 内容
+ * @return this
+ */
+ R apply(final ByteBuffer input);
+
+ /**
+ * 将结果hash值写出到{@link ByteBuffer}中，可选端序
+ *
+ * @param output 输出
+ * @param byteOrder 端序
+ * @return this
+ */
+ R write(ByteBuffer output, final ByteOrder byteOrder);
+
+ /**
+ * 重置，重置后可复用对象开启新的计算
+ *
+ * @return this
+ */
+ R reset();
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java b/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java
new file mode 100644
index 000000000..045bd4d5a
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java
@@ -0,0 +1,164 @@
+package cn.hutool.core.codec.hash.metro;
+
+import cn.hutool.core.codec.Number128;
+import cn.hutool.core.codec.hash.Hash128;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Apache 发布的MetroHash算法的128位实现，是一组用于非加密用例的最先进的哈希函数。
+ * 除了卓越的性能外，他们还以算法生成而著称。
+ *
+ *
+ *
* 结果：[a, b, c]，此结果中只保留了一个c
*
- * @param
+ * 例如：{@code
+ * CollUtil.groupByFunc(list, TestBean::getAge)
+ * }
+ *
+ * @param
- *
* 在以下场景无法获取到正确类型
@@ -123,7 +122,7 @@ public class LambdaUtil {
*
+ * 按照ISO8601规范，默认使用T分隔日期和时间，末尾不加Z表示当地时区
*/
- public static final String UTC_SIMPLE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
+ public static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss
+ * ISO8601日期时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss
*/
- public static final FastDateFormat UTC_SIMPLE_FORMAT = FastDateFormat.getInstance(UTC_SIMPLE_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat ISO8601_FORMAT = FastDateFormat.getInstance(ISO8601_PATTERN);
/**
* UTC时间：yyyy-MM-dd'T'HH:mm:ss.SSS
*/
- public static final String UTC_SIMPLE_MS_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
+ public static final String ISO8601_MS_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
/**
* UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSS
*/
- public static final FastDateFormat UTC_SIMPLE_MS_FORMAT = FastDateFormat.getInstance(UTC_SIMPLE_MS_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat ISO8601_MS_FORMAT = FastDateFormat.getInstance(ISO8601_MS_PATTERN);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ss'Z'
+ * UTC时间：yyyy-MM-dd'T'HH:mm:ss'Z'
+ * 按照ISO8601规范，后缀加Z表示UTC时间
*/
public static final String UTC_PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss'Z'
+ * ISO8601时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss'Z'
*/
- public static final FastDateFormat UTC_FORMAT = FastDateFormat.getInstance(UTC_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat UTC_FORMAT = FastDateFormat.getInstance(UTC_PATTERN, ZoneUtil.ZONE_UTC);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ssZ
+ * ISO8601时间：yyyy-MM-dd'T'HH:mm:ssZ，Z表示一个时间偏移，如+0800
*/
- public static final String UTC_WITH_ZONE_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ";
+ public static final String ISO8601_WITH_ZONE_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ssZ
+ * ISO8601时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ssZ，Z表示一个时间偏移，如+0800
*/
- public static final FastDateFormat UTC_WITH_ZONE_OFFSET_FORMAT = FastDateFormat.getInstance(UTC_WITH_ZONE_OFFSET_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat ISO8601_WITH_ZONE_OFFSET_FORMAT = FastDateFormat.getInstance(ISO8601_WITH_ZONE_OFFSET_PATTERN);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ssXXX
+ * ISO8601时间：yyyy-MM-dd'T'HH:mm:ssXXX
*/
- public static final String UTC_WITH_XXX_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX";
+ public static final String ISO8601_WITH_XXX_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ssXXX
+ * ISO8601时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ssXXX
*/
- public static final FastDateFormat UTC_WITH_XXX_OFFSET_FORMAT = FastDateFormat.getInstance(UTC_WITH_XXX_OFFSET_PATTERN);
+ public static final FastDateFormat ISO8601_WITH_XXX_OFFSET_FORMAT = FastDateFormat.getInstance(ISO8601_WITH_XXX_OFFSET_PATTERN);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+ * ISO8601时间：yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
*/
public static final String UTC_MS_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+ * ISO8601时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
*/
- public static final FastDateFormat UTC_MS_FORMAT = FastDateFormat.getInstance(UTC_MS_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat UTC_MS_FORMAT = FastDateFormat.getInstance(UTC_MS_PATTERN, ZoneUtil.ZONE_UTC);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ss.SSSZ
+ * ISO8601时间：yyyy-MM-dd'T'HH:mm:ss.SSSZ
*/
- public static final String UTC_MS_WITH_ZONE_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+ public static final String ISO8601_MS_WITH_ZONE_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
/**
- * UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSSZ
+ * ISO8601时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSSZ
*/
- public static final FastDateFormat UTC_MS_WITH_ZONE_OFFSET_FORMAT = FastDateFormat.getInstance(UTC_MS_WITH_ZONE_OFFSET_PATTERN, TimeZone.getTimeZone("UTC"));
+ public static final FastDateFormat ISO8601_MS_WITH_ZONE_OFFSET_FORMAT = FastDateFormat.getInstance(ISO8601_MS_WITH_ZONE_OFFSET_PATTERN);
/**
- * UTC时间：yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+ * ISO8601时间：yyyy-MM-dd'T'HH:mm:ss.SSSXXX
*/
- public static final String UTC_MS_WITH_XXX_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+ public static final String ISO8601_MS_WITH_XXX_OFFSET_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
/**
* UTC时间{@link FastDateFormat}：yyyy-MM-dd'T'HH:mm:ss.SSSXXX
*/
- public static final FastDateFormat UTC_MS_WITH_XXX_OFFSET_FORMAT = FastDateFormat.getInstance(UTC_MS_WITH_XXX_OFFSET_PATTERN);
+ public static final FastDateFormat ISO8601_MS_WITH_XXX_OFFSET_FORMAT = FastDateFormat.getInstance(ISO8601_MS_WITH_XXX_OFFSET_PATTERN);
// endregion
/**
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 dfed3e3db..a20c27a93 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
@@ -5,12 +5,7 @@ import cn.hutool.core.comparator.CompareUtil;
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.date.format.parser.CSTDateParser;
-import cn.hutool.core.date.format.parser.NormalDateParser;
-import cn.hutool.core.date.format.parser.PositionDateParser;
-import cn.hutool.core.date.format.parser.PureDateParser;
-import cn.hutool.core.date.format.parser.TimeParser;
-import cn.hutool.core.date.format.parser.UTCDateParser;
+import cn.hutool.core.date.format.parser.*;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.math.NumberUtil;
import cn.hutool.core.regex.PatternPool;
@@ -26,14 +21,7 @@ import java.time.LocalDateTime;
import java.time.Year;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -513,21 +501,7 @@ public class DateUtil extends CalendarUtil {
return yearAndQuarter(calendar(date));
}
- /**
- * 获得指定日期区间内的年份和季节
- *
- * @param startDate 起始日期（包含）
- * @param endDate 结束日期（包含）
- * @return 季度列表 ，元素类似于 20132
- */
- public static LinkedHashSet
* 格式 yyyy-MM-dd HH:mm:ss
@@ -696,10 +670,9 @@ public class DateUtil extends CalendarUtil {
return CalendarUtil.formatChineseDate(CalendarUtil.calendar(date), withTime);
}
- // ------------------------------------ Format end ----------------------------------------------
-
- // ------------------------------------ Parse start ----------------------------------------------
+ // endregion
+ // region ----- parse
/**
* 构建DateTime对象
*
@@ -840,8 +813,8 @@ public class DateUtil extends CalendarUtil {
// Wed Aug 01 00:00:00 CST 2012
return CSTDateParser.INSTANCE.parse(dateStr);
} else if (StrUtil.contains(dateStr, 'T')) {
- // UTC时间
- return UTCDateParser.INSTANCE.parse(dateStr);
+ // ISO8601标准时间
+ return ISO8601DateParser.INSTANCE.parse(dateStr);
}
//标准日期格式（包括单个数字的日期时间）
@@ -853,10 +826,9 @@ public class DateUtil extends CalendarUtil {
// 没有更多匹配的时间格式
throw new DateException("No format fit for date String [{}] !", dateStr);
}
- // ------------------------------------ Parse end ----------------------------------------------
-
- // ------------------------------------ Offset start ----------------------------------------------
+ // endregion
+ // region ----- offset
/**
* 修改日期为某个时间字段起始时间
*
@@ -1096,7 +1068,6 @@ public class DateUtil extends CalendarUtil {
public static DateTime endOfYear(final Date date) {
return new DateTime(endOfYear(calendar(date)));
}
- // --------------------------------------------------- Offset for now
/**
* 昨天
@@ -1243,9 +1214,9 @@ public class DateUtil extends CalendarUtil {
public static DateTime offset(final Date date, final DateField dateField, final int offset) {
return dateNew(date).offset(dateField, offset);
}
+ // endregion
- // ------------------------------------ Offset end ----------------------------------------------
-
+ // region ----- between
/**
* 判断两个日期相差的时长，只保留绝对值
*
@@ -1351,7 +1322,9 @@ public class DateUtil extends CalendarUtil {
public static long betweenYear(final Date beginDate, final Date endDate, final boolean isReset) {
return new DateBetween(beginDate, endDate).betweenYear(isReset);
}
+ // endregion
+ // region ----- formatBetween
/**
* 格式化日期间隔输出
*
@@ -1397,6 +1370,7 @@ public class DateUtil extends CalendarUtil {
public static String formatBetween(final long betweenMs) {
return new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND).format();
}
+ // endregion
/**
* 当前日期是否在日期指定范围内
@@ -1992,7 +1966,7 @@ public class DateUtil extends CalendarUtil {
* @return 单位简写名称
* @since 5.7.16
*/
- public static String getShotName(final TimeUnit unit) {
+ public static String getShortName(final TimeUnit unit) {
switch (unit) {
case NANOSECONDS:
return "ns";
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java b/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java
index 454a2f33d..e1920e2bf 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java
@@ -3,23 +3,29 @@ package cn.hutool.core.date;
/**
* 季度枚举
*
+ * @author zhfish(https : / / github.com / zhfish)
* @see #Q1
* @see #Q2
* @see #Q3
* @see #Q4
- *
- * @author zhfish(https://github.com/zhfish)
- *
*/
public enum Quarter {
- /** 第一季度 */
+ /**
+ * 第一季度
+ */
Q1(1),
- /** 第二季度 */
+ /**
+ * 第二季度
+ */
Q2(2),
- /** 第三季度 */
+ /**
+ * 第三季度
+ */
Q3(3),
- /** 第四季度 */
+ /**
+ * 第四季度
+ */
Q4(4);
// ---------------------------------------------------------------
@@ -29,6 +35,11 @@ public enum Quarter {
this.value = value;
}
+ /**
+ * 获取季度值
+ *
+ * @return 季度值
+ */
public int getValue() {
return this.value;
}
@@ -36,13 +47,12 @@ public enum Quarter {
/**
* 将 季度int转换为Season枚举对象
*
+ * @param intValue 季度int表示
+ * @return {@code Quarter}
* @see #Q1
* @see #Q2
* @see #Q3
* @see #Q4
- *
- * @param intValue 季度int表示
- * @return {@link Quarter}
*/
public static Quarter of(final int intValue) {
switch (intValue) {
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java b/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java
index 121d52dda..d748bf201 100755
--- a/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java
@@ -1,6 +1,6 @@
package cn.hutool.core.date;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.text.StrUtil;
import java.text.NumberFormat;
@@ -352,7 +352,7 @@ public class StopWatch {
unit = TimeUnit.NANOSECONDS;
}
return StrUtil.format("StopWatch '{}': running time = {} {}",
- this.id, getTotal(unit), DateUtil.getShotName(unit));
+ this.id, getTotal(unit), DateUtil.getShortName(unit));
}
/**
@@ -382,20 +382,27 @@ public class StopWatch {
sb.append("No task info kept");
} else {
sb.append("---------------------------------------------").append(FileUtil.getLineSeparator());
- sb.append(DateUtil.getShotName(unit)).append(" % Task name").append(FileUtil.getLineSeparator());
+ sb.append(DateUtil.getShortName(unit)).append(" % Task name").append(FileUtil.getLineSeparator());
sb.append("---------------------------------------------").append(FileUtil.getLineSeparator());
final NumberFormat nf = NumberFormat.getNumberInstance();
- nf.setMinimumIntegerDigits(9);
nf.setGroupingUsed(false);
final NumberFormat pf = NumberFormat.getPercentInstance();
- pf.setMinimumIntegerDigits(2);
pf.setGroupingUsed(false);
for (final TaskInfo task : getTaskInfo()) {
- sb.append(nf.format(task.getTime(unit))).append(" ");
- sb.append(pf.format((double) task.getTimeNanos() / getTotalTimeNanos())).append(" ");
+ final String taskTimeStr = nf.format(task.getTime(unit));
+ sb.append(taskTimeStr);
+ if(taskTimeStr.length() < 11){
+ sb.append(StrUtil.repeat(' ', 11 - taskTimeStr.length()));
+ }
+
+ final String percentStr = pf.format((double) task.getTimeNanos() / getTotalTimeNanos());
+ if(percentStr.length() < 4){
+ sb.append(StrUtil.repeat(' ', 4 - percentStr.length()));
+ }
+ sb.append(percentStr).append(" ");
sb.append(task.getTaskName()).append(FileUtil.getLineSeparator());
}
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java b/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
index 5f9cf30f7..dd6f960e9 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
@@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit;
* System.currentTimeMillis()的调用比new一个普通对象要耗时的多（具体耗时高出多少我还没测试过，有人说是100倍左右）
* System.currentTimeMillis()之所以慢是因为去跟系统打了一次交道
* 后台定时更新时钟，JVM退出时，线程自动回收
- *
+ *
- * 如果formatter为{code null}，则使用{@link DateTimeFormatter#ISO_LOCAL_DATE_TIME}
+ * 如果formatter为{@code null}，则使用{@link DateTimeFormatter#ISO_LOCAL_DATE_TIME}
*
* @param text 日期时间字符串
* @param formatter 日期格式化器，预定义的格式见：{@link DateTimeFormatter}
@@ -355,6 +338,17 @@ public class TimeUtil extends TemporalAccessorUtil {
return format(date, DatePattern.NORM_DATE_FORMATTER);
}
+
+ /**
+ * 格式化时间函数
+ *
+ * @param dateTimeFormatter {@link DateTimeFormatter}
+ * @return 格式化时间的函数
+ */
+ public static Function
*
+ * 关闭失败不会抛出异常
+ *
+ * @param closeable 被关闭的对象
+ * @throws IOException IO异常
+ */
+ public static void nullSafeClose(final Closeable closeable) throws IOException {
+ if (null != closeable) {
+ closeable.close();
+ }
+ }
+
/**
* 尝试关闭指定对象
* 判断对象如果实现了{@link AutoCloseable}，则调用之
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java
index a96bc8f66..dafb03ad0 100755
--- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java
@@ -6,9 +6,9 @@ import cn.hutool.core.io.stream.EmptyOutputStream;
import cn.hutool.core.lang.Assert;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream;
import java.util.zip.Checksum;
@@ -57,8 +57,8 @@ public class ChecksumUtil {
throw new IllegalArgumentException("Checksums can't be computed on directories");
}
try {
- return checksum(new FileInputStream(file), checksum);
- } catch (final FileNotFoundException e) {
+ return checksum(Files.newInputStream(file.toPath()), checksum);
+ } catch (final IOException e) {
throw new IORuntimeException(e);
}
}
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
deleted file mode 100755
index 7ced5f670..000000000
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package cn.hutool.core.io.file;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.copier.SrcToDestCopier;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.CopyOption;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-
-/**
- * 文件拷贝器
- * 支持以下几种情况：
- *
- * 1、文件复制到文件
- * 2、文件复制到目录
- * 3、目录复制到目录
- * 4、目录下的文件和目录复制到另一个目录
- *
- *
- * @author Looly
- * @since 3.0.9
- */
-public class FileCopier extends SrcToDestCopier
- * 拷贝规则为：
- *
- * 1、源为文件，目标为已存在目录，则拷贝到目录下，文件名不变
- * 2、源为文件，目标为不存在路径，则目标以文件对待（自动创建父级目录）比如：/dest/aaa，如果aaa不存在，则aaa被当作文件名
- * 3、源为文件，目标是一个已存在的文件，则当{@link #setOverride(boolean)}设为true时会被覆盖，默认不覆盖
- * 4、源为目录，目标为已存在目录，当{@link #setCopyContentIfDir(boolean)}为true时，只拷贝目录中的内容到目标目录中，否则整个源目录连同其目录拷贝到目标目录中
- * 5、源为目录，目标为不存在路径，则自动创建目标为新目录，然后按照规则4复制
- * 6、源为目录，目标为文件，抛出IO异常
- * 7、源路径和目标路径相同时，抛出IO异常
- *
- *
- * @return 拷贝后目标的文件或目录
- * @throws IORuntimeException IO异常
- */
- @Override
- public File copy() throws IORuntimeException {
- final File src = this.src;
- File dest = this.dest;
- // check
- Assert.notNull(src, "Source File is null !");
- if (false == src.exists()) {
- throw new IORuntimeException("File not exist: " + src);
- }
- Assert.notNull(dest, "Destination File or directiory is null !");
- if (FileUtil.equals(src, dest)) {
- throw new IORuntimeException("Files '{}' and '{}' are equal", src, dest);
- }
-
- if (src.isDirectory()) {// 复制目录
- if (dest.exists() && false == dest.isDirectory()) {
- //源为目录，目标为文件，抛出IO异常
- throw new IORuntimeException("Src is a directory but dest is a file!");
- }
- if (FileUtil.isSub(src, dest)) {
- throw new IORuntimeException("Dest is a sub directory of src !");
- }
-
- final File subTarget = isCopyContentIfDir ? dest : FileUtil.mkdir(FileUtil.file(dest, src.getName()));
- internalCopyDirContent(src, subTarget);
- } else {// 复制文件
- dest = internalCopyFile(src, dest);
- }
- return dest;
- }
-
- //----------------------------------------------------------------------------------------- Private method start
-
- /**
- * 拷贝目录内容，只用于内部，不做任何安全检查
- * 拷贝内容的意思为源目录下的所有文件和目录拷贝到另一个目录下，而不拷贝源目录本身
- *
- * @param src 源目录
- * @param dest 目标目录
- * @throws IORuntimeException IO异常
- */
- private void internalCopyDirContent(final File src, final File dest) throws IORuntimeException {
- if (null != copyPredicate && false == copyPredicate.test(src)) {
- //被过滤的目录跳过
- return;
- }
-
- if (false == dest.exists()) {
- //目标为不存在路径，创建为目录
- //noinspection ResultOfMethodCallIgnored
- dest.mkdirs();
- } else if (false == dest.isDirectory()) {
- throw new IORuntimeException(StrUtil.format("Src [{}] is a directory but dest [{}] is a file!", src.getPath(), dest.getPath()));
- }
-
- final String[] files = src.list();
- if (ArrayUtil.isNotEmpty(files)) {
- File srcFile;
- File destFile;
- for (final String file : files) {
- srcFile = new File(src, file);
- destFile = this.isOnlyCopyFile ? dest : new File(dest, file);
- // 递归复制
- if (srcFile.isDirectory()) {
- internalCopyDirContent(srcFile, destFile);
- } else {
- internalCopyFile(srcFile, destFile);
- }
- }
- }
- }
-
- /**
- * 拷贝文件，只用于内部，不做任何安全检查
- * 情况如下：
- *
- * 1、如果目标是一个不存在的路径，则目标以文件对待（自动创建父级目录）比如：/dest/aaa，如果aaa不存在，则aaa被当作文件名
- * 2、如果目标是一个已存在的目录，则文件拷贝到此目录下，文件名与原文件名一致
- *
- *
- * @param src 源文件，必须为文件
- * @param dest 目标文件，如果非覆盖模式必须为目录
- * @return 目标文件
- * @throws IORuntimeException IO异常
- */
- private File internalCopyFile(final File src, File dest) throws IORuntimeException {
- if (null != copyPredicate && false == copyPredicate.test(src)) {
- //被过滤的文件跳过
- return dest;
- }
-
- // 如果已经存在目标文件，切为不覆盖模式，跳过之
- if (dest.exists()) {
- if (dest.isDirectory()) {
- //目标为目录，目录下创建同名文件
- dest = new File(dest, src.getName());
- }
-
- if (dest.exists() && false == isOverride) {
- //非覆盖模式跳过
- return dest;
- }
- } else {
- //路径不存在则创建父目录
- FileUtil.mkParentDirs(dest);
- }
-
- final ArrayList
+ * The existing registration "application/font-woff" is deprecated in favor of "font/woff".
+ */
WOFF("font/woff", "woff") {
@Override
- public boolean match(byte[] bytes) {
- boolean flag1 = Objects.equals(bytes[0], (byte) 0x77)
+ public boolean match(final byte[] bytes) {
+ if(bytes.length < 8){
+ return false;
+ }
+ final boolean flag1 = Objects.equals(bytes[0], (byte) 0x77)
&& Objects.equals(bytes[1], (byte) 0x4f)
&& Objects.equals(bytes[2], (byte) 0x46)
&& Objects.equals(bytes[3], (byte) 0x46);
- boolean flag2 = Objects.equals(bytes[4], (byte) 0x00)
+ final boolean flag2 = Objects.equals(bytes[4], (byte) 0x00)
&& Objects.equals(bytes[5], (byte) 0x01)
&& Objects.equals(bytes[6], (byte) 0x00)
&& Objects.equals(bytes[7], (byte) 0x00);
- boolean flag3 = Objects.equals(bytes[4], (byte) 0x4f)
+ final boolean flag3 = Objects.equals(bytes[4], (byte) 0x4f)
&& Objects.equals(bytes[5], (byte) 0x54)
&& Objects.equals(bytes[6], (byte) 0x54)
&& Objects.equals(bytes[7], (byte) 0x4f);
- boolean flag4 = Objects.equals(bytes[4], (byte) 0x74)
+ final boolean flag4 = Objects.equals(bytes[4], (byte) 0x74)
&& Objects.equals(bytes[5], (byte) 0x72)
&& Objects.equals(bytes[6], (byte) 0x75)
&& Objects.equals(bytes[7], (byte) 0x65);
- return bytes.length > 7
- && (flag1 && (flag2 || flag3 || flag4));
+ return flag1 && (flag2 || flag3 || flag4);
}
},
+ /**
+ * woff2
+ */
WOFF2("font/woff2", "woff2") {
@Override
- public boolean match(byte[] bytes) {
- boolean flag1 = Objects.equals(bytes[0], (byte) 0x77)
+ public boolean match(final byte[] bytes) {
+ if(bytes.length < 8){
+ return false;
+ }
+ final boolean flag1 = Objects.equals(bytes[0], (byte) 0x77)
&& Objects.equals(bytes[1], (byte) 0x4f)
&& Objects.equals(bytes[2], (byte) 0x46)
&& Objects.equals(bytes[3], (byte) 0x32);
- boolean flag2 = Objects.equals(bytes[4], (byte) 0x00)
+ final boolean flag2 = Objects.equals(bytes[4], (byte) 0x00)
&& Objects.equals(bytes[5], (byte) 0x01)
&& Objects.equals(bytes[6], (byte) 0x00)
&& Objects.equals(bytes[7], (byte) 0x00);
- boolean flag3 = Objects.equals(bytes[4], (byte) 0x4f)
+ final boolean flag3 = Objects.equals(bytes[4], (byte) 0x4f)
&& Objects.equals(bytes[5], (byte) 0x54)
&& Objects.equals(bytes[6], (byte) 0x54)
&& Objects.equals(bytes[7], (byte) 0x4f);
- boolean flag4 = Objects.equals(bytes[4], (byte) 0x74)
+ final boolean flag4 = Objects.equals(bytes[4], (byte) 0x74)
&& Objects.equals(bytes[5], (byte) 0x72)
&& Objects.equals(bytes[6], (byte) 0x75)
&& Objects.equals(bytes[7], (byte) 0x65);
- return bytes.length > 7
- && (flag1 && (flag2 || flag3 || flag4));
+ return flag1 && (flag2 || flag3 || flag4);
}
},
+ /**
+ * ttf
+ */
TTF("font/ttf", "ttf") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0x00)
&& Objects.equals(bytes[1], (byte) 0x01)
@@ -379,9 +458,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[4], (byte) 0x00);
}
},
+ /**
+ * otf
+ */
OTF("font/otf", "otf") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0x4f)
&& Objects.equals(bytes[1], (byte) 0x54)
@@ -390,13 +472,15 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[4], (byte) 0x00);
}
},
+ // endregion
- //font end-----------------------------------------------
-
- //archive start-----------------------------------------
+ // region ----- archive
+ /**
+ * epub
+ */
EPUB("application/epub+zip", "epub") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 58
&& Objects.equals(bytes[0], (byte) 0x50) && Objects.equals(bytes[1], (byte) 0x4b)
&& Objects.equals(bytes[2], (byte) 0x03) && Objects.equals(bytes[3], (byte) 0x04)
@@ -416,21 +500,27 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[56], (byte) 0x69) && Objects.equals(bytes[57], (byte) 0x70);
}
},
+ /**
+ * zip
+ */
ZIP("application/zip", "zip") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 4) {
return false;
}
- boolean flag1 = Objects.equals(bytes[0], (byte) 0x50) && Objects.equals(bytes[1], (byte) 0x4b);
- boolean flag2 = Objects.equals(bytes[2], (byte) 0x03) || Objects.equals(bytes[2], (byte) 0x05) || Objects.equals(bytes[2], (byte) 0x07);
- boolean flag3 = Objects.equals(bytes[3], (byte) 0x04) || Objects.equals(bytes[3], (byte) 0x06) || Objects.equals(bytes[3], (byte) 0x08);
+ final boolean flag1 = Objects.equals(bytes[0], (byte) 0x50) && Objects.equals(bytes[1], (byte) 0x4b);
+ final boolean flag2 = Objects.equals(bytes[2], (byte) 0x03) || Objects.equals(bytes[2], (byte) 0x05) || Objects.equals(bytes[2], (byte) 0x07);
+ final boolean flag3 = Objects.equals(bytes[3], (byte) 0x04) || Objects.equals(bytes[3], (byte) 0x06) || Objects.equals(bytes[3], (byte) 0x08);
return flag1 && flag2 && flag3;
}
},
+ /**
+ * tar
+ */
TAR("application/x-tar", "tar") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 261
&& Objects.equals(bytes[257], (byte) 0x75)
&& Objects.equals(bytes[258], (byte) 0x73)
@@ -439,9 +529,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[261], (byte) 0x72);
}
},
+ /**
+ * rar
+ */
RAR("application/x-rar-compressed", "rar") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 6
&& Objects.equals(bytes[0], (byte) 0x52)
&& Objects.equals(bytes[1], (byte) 0x61)
@@ -452,27 +545,36 @@ public enum FileMagicNumber {
&& (Objects.equals(bytes[6], (byte) 0x00) || Objects.equals(bytes[6], (byte) 0x01));
}
},
+ /**
+ * gz
+ */
GZ("application/gzip", "gz") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 2
&& Objects.equals(bytes[0], (byte) 0x1f)
&& Objects.equals(bytes[1], (byte) 0x8b)
&& Objects.equals(bytes[2], (byte) 0x08);
}
},
+ /**
+ * bz2
+ */
BZ2("application/x-bzip2", "bz2") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 2
&& Objects.equals(bytes[0], (byte) 0x42)
&& Objects.equals(bytes[1], (byte) 0x5a)
&& Objects.equals(bytes[2], (byte) 0x68);
}
},
+ /**
+ * 7z
+ */
SevenZ("application/x-7z-compressed", "7z") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 6
&& Objects.equals(bytes[0], (byte) 0x37)
&& Objects.equals(bytes[1], (byte) 0x7a)
@@ -483,6 +585,9 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[6], (byte) 0x00);
}
},
+ /**
+ * pdf
+ */
PDF("application/pdf", "pdf") {
@Override
public boolean match(byte[] bytes) {
@@ -498,26 +603,35 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x46);
}
},
+ /**
+ * exe
+ */
EXE("application/x-msdownload", "exe") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 1
&& Objects.equals(bytes[0], (byte) 0x4d)
&& Objects.equals(bytes[1], (byte) 0x5a);
}
},
+ /**
+ * swf
+ */
SWF("application/x-shockwave-flash", "swf") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 2
&& (Objects.equals(bytes[0], 0x43) || Objects.equals(bytes[0], (byte) 0x46))
&& Objects.equals(bytes[1], (byte) 0x57)
&& Objects.equals(bytes[2], (byte) 0x53);
}
},
+ /**
+ * rtf
+ */
RTF("application/rtf", "rtf") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0x7b)
&& Objects.equals(bytes[1], (byte) 0x5c)
@@ -526,9 +640,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[4], (byte) 0x66);
}
},
+ /**
+ * nes
+ */
NES("application/x-nintendo-nes-rom", "nes") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0x4e)
&& Objects.equals(bytes[1], (byte) 0x45)
@@ -536,9 +653,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x1a);
}
},
+ /**
+ * crx
+ */
CRX("application/x-google-chrome-extension", "crx") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0x43)
&& Objects.equals(bytes[1], (byte) 0x72)
@@ -546,30 +666,39 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x34);
}
},
+ /**
+ * cab
+ */
CAB("application/vnd.ms-cab-compressed", "cab") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 4) {
return false;
}
- boolean flag1 = Objects.equals(bytes[0], (byte) 0x4d) && Objects.equals(bytes[1], (byte) 0x53)
+ final boolean flag1 = Objects.equals(bytes[0], (byte) 0x4d) && Objects.equals(bytes[1], (byte) 0x53)
&& Objects.equals(bytes[2], (byte) 0x43) && Objects.equals(bytes[3], (byte) 0x46);
- boolean flag2 = Objects.equals(bytes[0], (byte) 0x49) && Objects.equals(bytes[1], (byte) 0x53)
+ final boolean flag2 = Objects.equals(bytes[0], (byte) 0x49) && Objects.equals(bytes[1], (byte) 0x53)
&& Objects.equals(bytes[2], (byte) 0x63) && Objects.equals(bytes[3], (byte) 0x28);
return flag1 || flag2;
}
},
+ /**
+ * ps
+ */
PS("application/postscript", "ps") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 1
&& Objects.equals(bytes[0], (byte) 0x25)
&& Objects.equals(bytes[1], (byte) 0x21);
}
},
+ /**
+ * xz
+ */
XZ("application/x-xz", "xz") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 5
&& Objects.equals(bytes[0], (byte) 0xFD)
&& Objects.equals(bytes[1], (byte) 0x37)
@@ -579,9 +708,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[5], (byte) 0x00);
}
},
+ /**
+ * sqlite
+ */
SQLITE("application/x-sqlite3", "sqlite") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 15
&& Objects.equals(bytes[0], (byte) 0x53) && Objects.equals(bytes[1], (byte) 0x51)
&& Objects.equals(bytes[2], (byte) 0x4c) && Objects.equals(bytes[3], (byte) 0x69)
@@ -593,9 +725,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[14], (byte) 0x33) && Objects.equals(bytes[15], (byte) 0x00);
}
},
+ /**
+ * deb
+ */
DEB("application/x-deb", "deb") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 20
&& Objects.equals(bytes[0], (byte) 0x21) && Objects.equals(bytes[1], (byte) 0x3c)
&& Objects.equals(bytes[2], (byte) 0x61) && Objects.equals(bytes[3], (byte) 0x72)
@@ -610,9 +745,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[20], (byte) 0x79);
}
},
+ /**
+ * ar
+ */
AR("application/x-unix-archive", "ar") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 6
&& Objects.equals(bytes[0], (byte) 0x21)
&& Objects.equals(bytes[1], (byte) 0x3c)
@@ -623,9 +761,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[6], (byte) 0x3e);
}
},
+ /**
+ * lzo
+ */
LZOP("application/x-lzop", "lzo") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 7
&& Objects.equals(bytes[0], (byte) 0x89)
&& Objects.equals(bytes[1], (byte) 0x4c)
@@ -637,9 +778,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[7], (byte) 0x1a);
}
},
+ /**
+ * lz
+ */
LZ("application/x-lzip", "lz") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0x4c)
&& Objects.equals(bytes[1], (byte) 0x5a)
@@ -647,9 +791,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x50);
}
},
+ /**
+ * elf
+ */
ELF("application/x-executable", "elf") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 52
&& Objects.equals(bytes[0], (byte) 0x7f)
&& Objects.equals(bytes[1], (byte) 0x45)
@@ -657,9 +804,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x46);
}
},
+ /**
+ * lz4
+ */
LZ4("application/x-lz4", "lz4") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0x04)
&& Objects.equals(bytes[1], (byte) 0x22)
@@ -667,10 +817,13 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x18);
}
},
- //https://github.com/madler/brotli/blob/master/br-format-v3.txt,brotli 没有固定的file magic number,所以此处只是参考
+ /**
+ * br
+ * https://github.com/madler/brotli/blob/master/br-format-v3.txt,brotli 没有固定的file magic number,所以此处只是参考
+ */
BR("application/x-brotli", "br") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0xce)
&& Objects.equals(bytes[1], (byte) 0xb2)
@@ -678,9 +831,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x81);
}
},
+ /**
+ * dcm
+ */
DCM("application/x-dicom", "dcm") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 128
&& Objects.equals(bytes[128], (byte) 0x44)
&& Objects.equals(bytes[129], (byte) 0x49)
@@ -688,9 +844,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[131], (byte) 0x4d);
}
},
+ /**
+ * rpm
+ */
RPM("application/x-rpm", "rpm") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0xed)
&& Objects.equals(bytes[1], (byte) 0xab)
@@ -698,15 +857,18 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0xdb);
}
},
+ /**
+ * zst
+ */
ZSTD("application/x-zstd", "zst") {
@Override
- public boolean match(byte[] bytes) {
- int length = bytes.length;
+ public boolean match(final byte[] bytes) {
+ final int length = bytes.length;
if (length < 5) {
return false;
}
- byte[] buf1 = new byte[]{(byte) 0x22, (byte) 0x23, (byte) 0x24, (byte) 0x25, (byte) 0x26, (byte) 0x27, (byte) 0x28};
- boolean flag1 = ArrayUtil.contains(buf1, bytes[0])
+ final byte[] buf1 = new byte[]{(byte) 0x22, (byte) 0x23, (byte) 0x24, (byte) 0x25, (byte) 0x26, (byte) 0x27, (byte) 0x28};
+ final boolean flag1 = ArrayUtil.contains(buf1, bytes[0])
&& Objects.equals(bytes[1], (byte) 0xb5)
&& Objects.equals(bytes[2], (byte) 0x2f)
&& Objects.equals(bytes[3], (byte) 0xfd);
@@ -719,15 +881,19 @@ public enum FileMagicNumber {
return false;
}
},
- //archive end------------------------------------------------------------
- //video start------------------------------------------------------------
+ // endregion
+
+ // region ----- video
+ /**
+ * mp4
+ */
MP4("video/mp4", "mp4") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 13) {
return false;
}
- boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
&& Objects.equals(bytes[6], (byte) 0x79)
&& Objects.equals(bytes[7], (byte) 0x70)
@@ -735,7 +901,7 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[9], (byte) 0x53)
&& Objects.equals(bytes[10], (byte) 0x4e)
&& Objects.equals(bytes[11], (byte) 0x56);
- boolean flag2 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag2 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
&& Objects.equals(bytes[6], (byte) 0x79)
&& Objects.equals(bytes[7], (byte) 0x70)
@@ -746,9 +912,12 @@ public enum FileMagicNumber {
return flag1 || flag2;
}
},
+ /**
+ * avi
+ */
AVI("video/x-msvideo", "avi") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 11
&& Objects.equals(bytes[0], (byte) 0x52)
&& Objects.equals(bytes[1], (byte) 0x49)
@@ -760,9 +929,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[11], (byte) 0x20);
}
},
+ /**
+ * wmv
+ */
WMV("video/x-ms-wmv", "wmv") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 9
&& Objects.equals(bytes[0], (byte) 0x30)
&& Objects.equals(bytes[1], (byte) 0x26)
@@ -776,13 +948,16 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[9], (byte) 0xd9);
}
},
+ /**
+ * m4v
+ */
M4V("video/x-m4v", "m4v") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 12) {
return false;
}
- boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
&& Objects.equals(bytes[6], (byte) 0x79)
&& Objects.equals(bytes[7], (byte) 0x70)
@@ -790,7 +965,7 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[9], (byte) 0x34)
&& Objects.equals(bytes[10], (byte) 0x56)
&& Objects.equals(bytes[11], (byte) 0x20);
- boolean flag2 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag2 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
&& Objects.equals(bytes[6], (byte) 0x79)
&& Objects.equals(bytes[7], (byte) 0x70)
@@ -801,9 +976,12 @@ public enum FileMagicNumber {
return flag1 || flag2;
}
},
+ /**
+ * flv
+ */
FLV("video/x-flv", "flv") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0x46)
&& Objects.equals(bytes[1], (byte) 0x4c)
@@ -811,11 +989,14 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x01);
}
},
+ /**
+ * mkv
+ */
MKV("video/x-matroska", "mkv") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
//0x42 0x82 0x88 0x6d 0x61 0x74 0x72 0x6f 0x73 0x6b 0x61
- boolean flag1 = bytes.length > 11
+ final boolean flag1 = bytes.length > 11
&& Objects.equals(bytes[0], (byte) 0x1a)
&& Objects.equals(bytes[1], (byte) 0x45)
&& Objects.equals(bytes[2], (byte) 0xdf)
@@ -823,39 +1004,44 @@ public enum FileMagicNumber {
if (flag1) {
//此处需要判断是否是'\x42\x82\x88matroska'，算法类似kmp判断
- byte[] bytes1 = {(byte) 0x42, (byte) 0x82, (byte) 0x88, (byte) 0x6d, (byte) 0x61, (byte) 0x74, (byte) 0x72, (byte) 0x6f, (byte) 0x73, (byte) 0x6b, (byte) 0x61};
- int index = FileMagicNumber.indexOf(bytes, bytes1);
+ final byte[] bytes1 = {(byte) 0x42, (byte) 0x82, (byte) 0x88, (byte) 0x6d, (byte) 0x61, (byte) 0x74, (byte) 0x72, (byte) 0x6f, (byte) 0x73, (byte) 0x6b, (byte) 0x61};
+ final int index = FileMagicNumber.indexOf(bytes, bytes1);
return index > 0;
}
return false;
}
},
-
+ /**
+ * webm
+ */
WEBM("video/webm", "webm") {
@Override
- public boolean match(byte[] bytes) {
- boolean flag1 = bytes.length > 8
+ public boolean match(final byte[] bytes) {
+ final boolean flag1 = bytes.length > 8
&& Objects.equals(bytes[0], (byte) 0x1a)
&& Objects.equals(bytes[1], (byte) 0x45)
&& Objects.equals(bytes[2], (byte) 0xdf)
&& Objects.equals(bytes[3], (byte) 0xa3);
if (flag1) {
//此处需要判断是否是'\x42\x82\x88webm'，算法类似kmp判断
- byte[] bytes1 = {(byte) 0x42, (byte) 0x82, (byte) 0x88, (byte) 0x77, (byte) 0x65, (byte) 0x62, (byte) 0x6d};
- int index = FileMagicNumber.indexOf(bytes, bytes1);
+ final byte[] bytes1 = {(byte) 0x42, (byte) 0x82, (byte) 0x88, (byte) 0x77, (byte) 0x65, (byte) 0x62, (byte) 0x6d};
+ final int index = FileMagicNumber.indexOf(bytes, bytes1);
return index > 0;
}
return false;
}
},
- //此文件签名非常复杂，只判断常见的几种
+ /**
+ * mov
+ * 此文件签名非常复杂，只判断常见的几种
+ */
MOV("video/quicktime", "mov") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 12) {
return false;
}
- boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag1 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
&& Objects.equals(bytes[6], (byte) 0x79)
&& Objects.equals(bytes[7], (byte) 0x70)
@@ -863,36 +1049,39 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[9], (byte) 0x74)
&& Objects.equals(bytes[10], (byte) 0x20)
&& Objects.equals(bytes[11], (byte) 0x20);
- boolean flag2 = Objects.equals(bytes[4], (byte) 0x6D)
+ final boolean flag2 = Objects.equals(bytes[4], (byte) 0x6D)
&& Objects.equals(bytes[5], (byte) 0x6F)
&& Objects.equals(bytes[6], (byte) 0x6F)
&& Objects.equals(bytes[7], (byte) 0x76);
- boolean flag3 = Objects.equals(bytes[4], (byte) 0x66)
+ final boolean flag3 = Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x72)
&& Objects.equals(bytes[6], (byte) 0x65)
&& Objects.equals(bytes[7], (byte) 0x65);
- boolean flag4 = Objects.equals(bytes[4], (byte) 0x6D)
+ final boolean flag4 = Objects.equals(bytes[4], (byte) 0x6D)
&& Objects.equals(bytes[5], (byte) 0x64)
&& Objects.equals(bytes[6], (byte) 0x61)
&& Objects.equals(bytes[7], (byte) 0x74);
- boolean flag5 = Objects.equals(bytes[4], (byte) 0x77)
+ final boolean flag5 = Objects.equals(bytes[4], (byte) 0x77)
&& Objects.equals(bytes[5], (byte) 0x69)
&& Objects.equals(bytes[6], (byte) 0x64)
&& Objects.equals(bytes[7], (byte) 0x65);
- boolean flag6 = Objects.equals(bytes[4], (byte) 0x70)
+ final boolean flag6 = Objects.equals(bytes[4], (byte) 0x70)
&& Objects.equals(bytes[5], (byte) 0x6E)
&& Objects.equals(bytes[6], (byte) 0x6F)
&& Objects.equals(bytes[7], (byte) 0x74);
- boolean flag7 = Objects.equals(bytes[4], (byte) 0x73)
+ final boolean flag7 = Objects.equals(bytes[4], (byte) 0x73)
&& Objects.equals(bytes[5], (byte) 0x6B)
&& Objects.equals(bytes[6], (byte) 0x69)
&& Objects.equals(bytes[7], (byte) 0x70);
return flag1 || flag2 || flag3 || flag4 || flag5 || flag6 || flag7;
}
},
+ /**
+ * mpg
+ */
MPEG("video/mpeg", "mpg") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 3
&& Objects.equals(bytes[0], (byte) 0x00)
&& Objects.equals(bytes[1], (byte) 0x00)
@@ -900,9 +1089,12 @@ public enum FileMagicNumber {
&& (bytes[3] >= (byte) 0xb0 && bytes[3] <= (byte) 0xbf);
}
},
+ /**
+ * rmvb
+ */
RMVB("video/vnd.rn-realvideo", "rmvb") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 4
&& Objects.equals(bytes[0], (byte) 0x2E)
&& Objects.equals(bytes[1], (byte) 0x52)
@@ -910,9 +1102,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[3], (byte) 0x46);
}
},
+ /**
+ * 3gp
+ */
M3GP("video/3gpp", "3gp") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 10
&& Objects.equals(bytes[4], (byte) 0x66)
&& Objects.equals(bytes[5], (byte) 0x74)
@@ -923,94 +1118,115 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[10], (byte) 0x70);
}
},
- //video end ---------------------------------------------------------------
- //document start ----------------------------------------------------------
+ // endregion
+
+ // region ----- document
+ /**
+ * doc
+ */
DOC("application/msword", "doc") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
- boolean flag1 = bytes.length > 515 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
+ final boolean flag1 = bytes.length > 515 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
if (flag1) {
- byte[] byte2 = new byte[]{(byte) 0xec, (byte) 0xa5, (byte) 0xc1, (byte) 0x00};
- boolean flag2 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 516), byte2);
- byte[] byte3 = new byte[]{(byte) 0x00, (byte) 0x0a, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x4d, (byte) 0x53, (byte) 0x57, (byte) 0x6f, (byte) 0x72, (byte) 0x64
+ final byte[] byte2 = new byte[]{(byte) 0xec, (byte) 0xa5, (byte) 0xc1, (byte) 0x00};
+ final boolean flag2 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 516), byte2);
+ final byte[] byte3 = new byte[]{(byte) 0x00, (byte) 0x0a, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x4d, (byte) 0x53, (byte) 0x57, (byte) 0x6f, (byte) 0x72, (byte) 0x64
, (byte) 0x44, (byte) 0x6f, (byte) 0x63, (byte) 0x00, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x57, (byte) 0x6f, (byte) 0x72, (byte) 0x64,
(byte) 0x2e, (byte) 0x44, (byte) 0x6f, (byte) 0x63, (byte) 0x75, (byte) 0x6d, (byte) 0x65, (byte) 0x6e, (byte) 0x74, (byte) 0x2e, (byte) 0x38, (byte) 0x00,
(byte) 0xf4, (byte) 0x39, (byte) 0xb2, (byte) 0x71};
- byte[] range = Arrays.copyOfRange(bytes, 2075, 2142);
- boolean flag3 = bytes.length > 2142 && FileMagicNumber.indexOf(range, byte3) > 0;
+ final byte[] range = Arrays.copyOfRange(bytes, 2075, 2142);
+ final boolean flag3 = bytes.length > 2142 && FileMagicNumber.indexOf(range, byte3) > 0;
return flag2 || flag3;
}
return false;
}
},
-
+ /**
+ * xls
+ */
XLS("application/vnd.ms-excel", "xls") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
- boolean flag1 = bytes.length > 520 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
+ final boolean flag1 = bytes.length > 520 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
if (flag1) {
- byte[] byte2 = new byte[]{(byte) 0xfd, (byte) 0xff, (byte) 0xff, (byte) 0xff};
- boolean flag2 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 516), byte2) && (bytes[518] == 0x00 || bytes[518] == 0x02);
- byte[] byte3 = new byte[]{(byte) 0x09, (byte) 0x08, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x05, (byte) 0x00};
- boolean flag3 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 520), byte3);
- byte[] byte4 = new byte[]{(byte) 0xe2, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x70, (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x43, (byte) 0x61, (byte) 0x6c, (byte) 0x63};
- boolean flag4 = bytes.length > 2095 && Arrays.equals(Arrays.copyOfRange(bytes, 1568, 2095), byte4);
+ final byte[] byte2 = new byte[]{(byte) 0xfd, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+ final boolean flag2 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 516), byte2) && (bytes[518] == 0x00 || bytes[518] == 0x02);
+ final byte[] byte3 = new byte[]{(byte) 0x09, (byte) 0x08, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x05, (byte) 0x00};
+ final boolean flag3 = Arrays.equals(Arrays.copyOfRange(bytes, 512, 520), byte3);
+ final byte[] byte4 = new byte[]{(byte) 0xe2, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x70, (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x43, (byte) 0x61, (byte) 0x6c, (byte) 0x63};
+ final boolean flag4 = bytes.length > 2095 && Arrays.equals(Arrays.copyOfRange(bytes, 1568, 2095), byte4);
return flag2 || flag3 || flag4;
}
return false;
}
},
+ /**
+ * ppt
+ */
PPT("application/vnd.ms-powerpoint", "ppt") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
- boolean flag1 = bytes.length > 524 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xd0, (byte) 0xcf, (byte) 0x11, (byte) 0xe0, (byte) 0xa1, (byte) 0xb1, (byte) 0x1a, (byte) 0xe1};
+ final boolean flag1 = bytes.length > 524 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte1);
if (flag1) {
- byte[] byte2 = new byte[]{(byte) 0xa0, (byte) 0x46, (byte) 0x1d, (byte) 0xf0};
- byte[] byteRange = Arrays.copyOfRange(bytes, 512, 516);
- boolean flag2 = Arrays.equals(byteRange, byte2);
- byte[] byte3 = new byte[]{(byte) 0x00, (byte) 0x6e, (byte) 0x1e, (byte) 0xf0};
- boolean flag3 = Arrays.equals(byteRange, byte3);
- byte[] byte4 = new byte[]{(byte) 0x0f, (byte) 0x00, (byte) 0xe8, (byte) 0x03};
- boolean flag4 = Arrays.equals(byteRange, byte4);
- byte[] byte5 = new byte[]{(byte) 0xfd, (byte) 0xff, (byte) 0xff, (byte) 0xff};
- boolean flag5 = Arrays.equals(byteRange, byte5) && bytes[522] == 0x00 && bytes[523] == 0x00;
- byte[] byte6 = new byte[]{(byte) 0x00, (byte) 0xb9, (byte) 0x29, (byte) 0xe8, (byte) 0x11, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ final byte[] byte2 = new byte[]{(byte) 0xa0, (byte) 0x46, (byte) 0x1d, (byte) 0xf0};
+ final byte[] byteRange = Arrays.copyOfRange(bytes, 512, 516);
+ final boolean flag2 = Arrays.equals(byteRange, byte2);
+ final byte[] byte3 = new byte[]{(byte) 0x00, (byte) 0x6e, (byte) 0x1e, (byte) 0xf0};
+ final boolean flag3 = Arrays.equals(byteRange, byte3);
+ final byte[] byte4 = new byte[]{(byte) 0x0f, (byte) 0x00, (byte) 0xe8, (byte) 0x03};
+ final boolean flag4 = Arrays.equals(byteRange, byte4);
+ final byte[] byte5 = new byte[]{(byte) 0xfd, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+ final boolean flag5 = Arrays.equals(byteRange, byte5) && bytes[522] == 0x00 && bytes[523] == 0x00;
+ final byte[] byte6 = new byte[]{(byte) 0x00, (byte) 0xb9, (byte) 0x29, (byte) 0xe8, (byte) 0x11, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x4d, (byte) 0x53, (byte) 0x20, (byte) 0x50, (byte) 0x6f, (byte) 0x77, (byte) 0x65, (byte) 0x72, (byte) 0x50, (byte)
0x6f, (byte) 0x69, (byte) 0x6e, (byte) 0x74, (byte) 0x20, (byte) 0x39, (byte) 0x37};
- boolean flag6 = bytes.length > 2096 && Arrays.equals(Arrays.copyOfRange(bytes, 2072, 2096), byte6);
+ final boolean flag6 = bytes.length > 2096 && Arrays.equals(Arrays.copyOfRange(bytes, 2072, 2096), byte6);
return flag2 || flag3 || flag4 || flag5 || flag6;
}
return false;
}
},
+ /**
+ * docx
+ */
DOCX("application/vnd.openxmlformats-officedocument.wordprocessingml.document", "docx") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return Objects.equals(FileMagicNumber.matchDocument(bytes), DOCX);
}
},
+ /**
+ * pptx
+ */
PPTX("application/vnd.openxmlformats-officedocument.presentationml.presentation", "pptx") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return Objects.equals(FileMagicNumber.matchDocument(bytes), PPTX);
}
},
+ /**
+ * xlsx
+ */
XLSX("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "xlsx") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return Objects.equals(FileMagicNumber.matchDocument(bytes), XLSX);
}
},
+ // endregion
- //document end ------------------------------------------------------------
- //other start -------------------------------------------------------------
+ // region ----- others
+ /**
+ * wasm
+ */
WASM("application/wasm", "wasm") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 7
&& Objects.equals(bytes[0], (byte) 0x00)
&& Objects.equals(bytes[1], (byte) 0x61)
@@ -1022,10 +1238,13 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[7], (byte) 0x00);
}
},
- // https://source.android.com/devices/tech/dalvik/dex-format#dex-file-magic
+ /**
+ * dex
+ * https://source.android.com/devices/tech/dalvik/dex-format#dex-file-magic
+ */
DEX("application/vnd.android.dex", "dex") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 36
&& Objects.equals(bytes[0], (byte) 0x64)
&& Objects.equals(bytes[1], (byte) 0x65)
@@ -1034,9 +1253,12 @@ public enum FileMagicNumber {
&& Objects.equals(bytes[36], (byte) 0x70);
}
},
+ /**
+ * dey
+ */
DEY("application/vnd.android.dey", "dey") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
return bytes.length > 100
&& Objects.equals(bytes[0], (byte) 0x64)
&& Objects.equals(bytes[1], (byte) 0x65)
@@ -1045,113 +1267,172 @@ public enum FileMagicNumber {
DEX.match(Arrays.copyOfRange(bytes, 40, 100));
}
},
+ /**
+ * eml
+ */
EML("message/rfc822", "eml") {
@Override
- public boolean match(byte[] bytes) {
+ public boolean match(final byte[] bytes) {
if (bytes.length < 8) {
return false;
}
- byte[] byte1 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x20, (byte) 0x20, (byte) 0x20};
- byte[] byte2 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x20, (byte) 0x3F, (byte) 0x3F, (byte) 0x3F};
- byte[] byte3 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x3A, (byte) 0x20};
- byte[] byte4 = new byte[]{(byte) 0x52, (byte) 0x65, (byte) 0x74, (byte) 0x75, (byte) 0x72, (byte) 0x6E, (byte) 0x2D, (byte) 0x50, (byte) 0x61, (byte) 0x74, (byte) 0x68, (byte) 0x3A, (byte) 0x20};
+ final byte[] byte1 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x20, (byte) 0x20, (byte) 0x20};
+ final byte[] byte2 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x20, (byte) 0x3F, (byte) 0x3F, (byte) 0x3F};
+ final byte[] byte3 = new byte[]{(byte) 0x46, (byte) 0x72, (byte) 0x6F, (byte) 0x6D, (byte) 0x3A, (byte) 0x20};
+ final byte[] byte4 = new byte[]{(byte) 0x52, (byte) 0x65, (byte) 0x74, (byte) 0x75, (byte) 0x72, (byte) 0x6E, (byte) 0x2D, (byte) 0x50, (byte) 0x61, (byte) 0x74, (byte) 0x68, (byte) 0x3A, (byte) 0x20};
return Arrays.equals(Arrays.copyOfRange(bytes, 0, 7), byte1)
|| Arrays.equals(Arrays.copyOfRange(bytes, 0, 8), byte2)
|| Arrays.equals(Arrays.copyOfRange(bytes, 0, 6), byte3)
|| bytes.length > 13 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 13), byte4);
}
},
+ /**
+ * mdb
+ */
MDB("application/vnd.ms-access", "mdb") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x53, (byte) 0x74, (byte) 0x61, (byte) 0x6E, (byte) 0x64,
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x53, (byte) 0x74, (byte) 0x61, (byte) 0x6E, (byte) 0x64,
(byte) 0x61, (byte) 0x72, (byte) 0x64, (byte) 0x20, (byte) 0x4A, (byte) 0x65, (byte) 0x74, (byte) 0x20, (byte) 0x44, (byte) 0x42};
return bytes.length > 18 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 18), byte1);
}
},
- //CHM 49 54 53 46
+ /**
+ * CHM 49 54 53 46
+ */
CHM("application/vnd.ms-htmlhelp", "chm") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0x49, (byte) 0x54, (byte) 0x53, (byte) 0x46};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0x49, (byte) 0x54, (byte) 0x53, (byte) 0x46};
return bytes.length > 4 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 4), byte1);
}
},
- //class CA FE BA BE
+
+ /**
+ * class CA FE BA BE
+ */
CLASS("application/java-vm", "class") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
return bytes.length > 4 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 4), byte1);
}
},
- //torrent 64 38 3A 61 6E 6E 6F 75 6E 63 65
+ /**
+ * torrent 64 38 3A 61 6E 6E 6F 75 6E 63 65
+ */
TORRENT("application/x-bittorrent", "torrent") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0x64, (byte) 0x38, (byte) 0x3A, (byte) 0x61, (byte) 0x6E, (byte) 0x6E, (byte) 0x6F, (byte) 0x75, (byte) 0x6E, (byte) 0x63, (byte) 0x65};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0x64, (byte) 0x38, (byte) 0x3A, (byte) 0x61, (byte) 0x6E, (byte) 0x6E, (byte) 0x6F, (byte) 0x75, (byte) 0x6E, (byte) 0x63, (byte) 0x65};
return bytes.length > 11 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 11), byte1);
}
},
+ /**
+ * wpd
+ */
WPD("application/vnd.wordperfect", "wpd") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xFF, (byte) 0x57, (byte) 0x50, (byte) 0x43};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xFF, (byte) 0x57, (byte) 0x50, (byte) 0x43};
return bytes.length > 4 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 4), byte1);
}
},
+ /**
+ * dbx
+ */
DBX("", "dbx") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0xCF, (byte) 0xAD, (byte) 0x12, (byte) 0xFE};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0xCF, (byte) 0xAD, (byte) 0x12, (byte) 0xFE};
return bytes.length > 4 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 4), byte1);
}
},
+ /**
+ * pst
+ */
PST("application/vnd.ms-outlook-pst", "pst") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0x21, (byte) 0x42, (byte) 0x44, (byte) 0x4E};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0x21, (byte) 0x42, (byte) 0x44, (byte) 0x4E};
return bytes.length > 4 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 4), byte1);
}
},
+ /**
+ * ram
+ */
RAM("audio/x-pn-realaudio", "ram") {
@Override
- public boolean match(byte[] bytes) {
- byte[] byte1 = new byte[]{(byte) 0x2E, (byte) 0x72, (byte) 0x61, (byte) 0xFD, (byte) 0x00};
+ public boolean match(final byte[] bytes) {
+ final byte[] byte1 = new byte[]{(byte) 0x2E, (byte) 0x72, (byte) 0x61, (byte) 0xFD, (byte) 0x00};
return bytes.length > 5 && Arrays.equals(Arrays.copyOfRange(bytes, 0, 5), byte1);
}
}
- //other end ---------------------------------------------------------------
+ // endregion
;
- private final String mimeType;
- private final String extension;
- FileMagicNumber(String mimeType, String extension) {
- this.mimeType = mimeType;
- this.extension = extension;
- }
-
- public static FileMagicNumber getMagicNumber(byte[] bytes) {
- FileMagicNumber number = Arrays.stream(values())
+ /**
+ * 根据给定的bytes，获取对应识别到的{@code FileMagicNumber}
+ *
+ * @param bytes bytes魔数
+ * @return {@code FileMagicNumber}
+ */
+ public static FileMagicNumber getMagicNumber(final byte[] bytes) {
+ final FileMagicNumber number = Arrays.stream(values())
.filter(fileMagicNumber -> fileMagicNumber.match(bytes))
.findFirst()
.orElse(UNKNOWN);
- if (number.equals(FileMagicNumber.ZIP)) {
- FileMagicNumber fn = FileMagicNumber.matchDocument(bytes);
+
+ // 压缩文档类型，如office或jar等
+ if (FileMagicNumber.ZIP.equals(number)) {
+ final FileMagicNumber fn = FileMagicNumber.matchDocument(bytes);
return fn == UNKNOWN ? ZIP : fn;
}
return number;
}
+ private final String mimeType;
+ private final String extension;
+
+ /**
+ * 构造
+ *
+ * @param mimeType 媒体类型
+ * @param extension 扩展名
+ */
+ FileMagicNumber(final String mimeType, final String extension) {
+ this.mimeType = mimeType;
+ this.extension = extension;
+ }
+
+ /**
+ * 获取媒体类型
+ *
+ * @return 媒体类型
+ */
public String getMimeType() {
return mimeType;
}
+ /**
+ * 获取扩展名
+ *
+ * @return 扩展名
+ */
public String getExtension() {
return extension;
}
- private static int indexOf(byte[] array, byte[] target) {
+ /**
+ * 是否匹配bytes
+ *
+ * @param bytes bytes
+ * @return 是否匹配
+ */
+ public abstract boolean match(byte[] bytes);
+
+ // region ----- private static methods
+ private static int indexOf(final byte[] array, final byte[] target) {
if (array == null || target == null || array.length < target.length) {
return -1;
}
@@ -1172,19 +1453,26 @@ public enum FileMagicNumber {
}
//处理 Open XML 类型的文件
- private static boolean compareBytes(byte[] buf, byte[] slice, int startOffset) {
- int sl = slice.length;
+ private static boolean compareBytes(final byte[] buf, final byte[] slice, final int startOffset) {
+ final int sl = slice.length;
if (startOffset + sl > buf.length) {
return false;
}
- byte[] sub = Arrays.copyOfRange(buf, startOffset, startOffset + sl);
+ final byte[] sub = Arrays.copyOfRange(buf, startOffset, startOffset + sl);
return Arrays.equals(sub, slice);
}
- private static FileMagicNumber matchOpenXmlMime(byte[] bytes, int offset) {
- byte[] word = new byte[]{'w', 'o', 'r', 'd', '/'};
- byte[] ppt = new byte[]{'p', 'p', 't', '/'};
- byte[] xl = new byte[]{'x', 'l', '/'};
+ /**
+ * 判断OpenXML文档类型
+ *
+ * @param bytes bytes魔数
+ * @param offset 偏移
+ * @return {@code FileMagicNumber}
+ */
+ private static FileMagicNumber matchOpenXmlMime(final byte[] bytes, final int offset) {
+ final byte[] word = new byte[]{'w', 'o', 'r', 'd', '/'};
+ final byte[] ppt = new byte[]{'p', 'p', 't', '/'};
+ final byte[] xl = new byte[]{'x', 'l', '/'};
if (FileMagicNumber.compareBytes(bytes, word, offset)) {
return FileMagicNumber.DOCX;
}
@@ -1197,17 +1485,23 @@ public enum FileMagicNumber {
return FileMagicNumber.UNKNOWN;
}
- private static FileMagicNumber matchDocument(byte[] bytes) {
- FileMagicNumber fileMagicNumber = FileMagicNumber.matchOpenXmlMime(bytes, (byte) 0x1e);
+ /**
+ * 匹配文档类型
+ *
+ * @param bytes bytes魔数
+ * @return 匹配到的文档类型
+ */
+ private static FileMagicNumber matchDocument(final byte[] bytes) {
+ final FileMagicNumber fileMagicNumber = FileMagicNumber.matchOpenXmlMime(bytes, (byte) 0x1e);
if (false == fileMagicNumber.equals(UNKNOWN)) {
return fileMagicNumber;
}
- byte[] bytes1 = new byte[]{0x5B, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x5F, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5D, 0x2E, 0x78, 0x6D, 0x6C};
- byte[] bytes2 = new byte[]{0x5F, 0x72, 0x65, 0x6C, 0x73, 0x2F, 0x2E, 0x72, 0x65, 0x6C, 0x73};
- byte[] bytes3 = new byte[]{0x64, 0x6F, 0x63, 0x50, 0x72, 0x6F, 0x70, 0x73};
- boolean flag1 = FileMagicNumber.compareBytes(bytes, bytes1, (byte) 0x1e);
- boolean flag2 = FileMagicNumber.compareBytes(bytes, bytes2, (byte) 0x1e);
- boolean flag3 = FileMagicNumber.compareBytes(bytes, bytes3, (byte) 0x1e);
+ final byte[] bytes1 = new byte[]{0x5B, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x5F, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5D, 0x2E, 0x78, 0x6D, 0x6C};
+ final byte[] bytes2 = new byte[]{0x5F, 0x72, 0x65, 0x6C, 0x73, 0x2F, 0x2E, 0x72, 0x65, 0x6C, 0x73};
+ final byte[] bytes3 = new byte[]{0x64, 0x6F, 0x63, 0x50, 0x72, 0x6F, 0x70, 0x73};
+ final boolean flag1 = FileMagicNumber.compareBytes(bytes, bytes1, (byte) 0x1e);
+ final boolean flag2 = FileMagicNumber.compareBytes(bytes, bytes2, (byte) 0x1e);
+ final boolean flag3 = FileMagicNumber.compareBytes(bytes, bytes3, (byte) 0x1e);
if (false == (flag1 || flag2 || flag3)) {
return UNKNOWN;
}
@@ -1217,7 +1511,7 @@ public enum FileMagicNumber {
if (index == -1) {
continue;
}
- FileMagicNumber fn = FileMagicNumber.matchOpenXmlMime(bytes, index + 30);
+ final FileMagicNumber fn = FileMagicNumber.matchOpenXmlMime(bytes, index + 30);
if (false == fn.equals(UNKNOWN)) {
return fn;
}
@@ -1225,19 +1519,26 @@ public enum FileMagicNumber {
return UNKNOWN;
}
- private static int searchSignature(byte[] bytes, int start, int rangeNum) {
- byte[] signature = new byte[]{0x50, 0x4B, 0x03, 0x04};
- int length = bytes.length;
+ /**
+ * 查找文档签名（文档标识）
+ *
+ * @param bytes bytes
+ * @param start 开始位置
+ * @param rangeNum 步进长度
+ * @return 签名
+ */
+ @SuppressWarnings("SameParameterValue")
+ private static int searchSignature(final byte[] bytes, final int start, final int rangeNum) {
+ final byte[] signature = new byte[]{0x50, 0x4B, 0x03, 0x04};
+ final int length = bytes.length;
int end = start + rangeNum;
if (end > length) {
end = length;
}
- int index = FileMagicNumber.indexOf(Arrays.copyOfRange(bytes, start, end), signature);
+ final int index = FileMagicNumber.indexOf(Arrays.copyOfRange(bytes, start, end), signature);
return (index == -1)
? -1
: (start + index);
}
-
- public abstract boolean match(byte[] bytes);
-
+ // endregion
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java
index 0b73ad6a4..2542e14d3 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java
@@ -1,9 +1,10 @@
package cn.hutool.core.io.file;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.func.SerConsumer;
+import cn.hutool.core.lang.func.SerFunction;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.CharsetUtil;
@@ -14,6 +15,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -207,14 +209,20 @@ public class FileReader extends FileWrapper {
* @return 从文件中read出的数据
* @throws IORuntimeException IO异常
*/
- public
* 某个文件删除失败会终止删除操作
*
- *
- * 因为前者遇到文件被占用等原因时，抛出异常，而非返回false，异常会指明具体的失败原因。
- *
- * 此方法用于递归删除空的文件夹，不删除文件
- * 如果传入的文件夹本身就是空的，删除这个文件夹
- *
- * @param directory 文件夹
- * @return 成功与否
- * @throws IORuntimeException IO异常
- * @since 4.5.5
- */
- public static boolean cleanEmpty(final File directory) throws IORuntimeException {
- if (directory == null || false == directory.exists() || false == directory.isDirectory()) {
- return true;
- }
-
- final File[] files = directory.listFiles();
- if (ArrayUtil.isEmpty(files)) {
- // 空文件夹则删除之
- return directory.delete();
- }
-
- for (final File childFile : files) {
- cleanEmpty(childFile);
- }
- return true;
+ public static void clean(final File directory) throws IORuntimeException {
+ Assert.notNull(directory, "File must be not null!");
+ PathUtil.clean(directory.toPath());
}
/**
@@ -986,43 +880,6 @@ public class FileUtil extends PathUtil {
}
}
- /**
- * 通过JDK7+的 Files#copy(Path, Path, CopyOption...) 方法拷贝文件
- *
- * @param src 源文件路径
- * @param dest 目标文件或目录路径，如果为目录使用与源文件相同的文件名
- * @param options {@link StandardCopyOption}
- * @return File
- * @throws IORuntimeException IO异常
- */
- public static File copyFile(final String src, final String dest, final StandardCopyOption... options) throws IORuntimeException {
- Assert.notBlank(src, "Source File path is blank !");
- Assert.notBlank(dest, "Destination File path is blank !");
- return copyFile(Paths.get(src), Paths.get(dest), options).toFile();
- }
-
- /**
- * 通过JDK7+的 Files#copy(Path, Path, CopyOption...) 方法拷贝文件
- *
- * @param src 源文件
- * @param dest 目标文件或目录，如果为目录使用与源文件相同的文件名
- * @param options {@link StandardCopyOption}
- * @return 目标文件
- * @throws IORuntimeException IO异常
- */
- public static File copyFile(final File src, final File dest, final StandardCopyOption... options) throws IORuntimeException {
- // check
- Assert.notNull(src, "Source File is null !");
- if (false == src.exists()) {
- throw new IORuntimeException("File not exist: " + src);
- }
- Assert.notNull(dest, "Destination File or directiory is null !");
- if (equals(src, dest)) {
- throw new IORuntimeException("Files '{}' and '{}' are equal", src, dest);
- }
- return copyFile(src.toPath(), dest.toPath(), options).toFile();
- }
-
/**
* 复制文件或目录
* 如果目标文件为目录，则将源文件以相同文件名拷贝到目标目录
@@ -1048,13 +905,19 @@ public class FileUtil extends PathUtil {
*
*
* @param src 源文件
- * @param dest 目标文件或目录，目标不存在会自动创建（目录、文件都创建）
+ * @param target 目标文件或目录，目标不存在会自动创建（目录、文件都创建）
* @param isOverride 是否覆盖目标文件
* @return 目标目录或文件
* @throws IORuntimeException IO异常
*/
- public static File copy(final File src, final File dest, final boolean isOverride) throws IORuntimeException {
- return FileCopier.of(src, dest).setOverride(isOverride).copy();
+ public static File copy(final File src, final File target, final boolean isOverride) throws IORuntimeException {
+ Assert.notNull(src, "Src file must be not null!");
+ Assert.notNull(target, "target file must be not null!");
+ return PathUtil.copy(
+ src.toPath(),
+ target.toPath(),
+ isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{})
+ .toFile();
}
/**
@@ -1068,65 +931,43 @@ public class FileUtil extends PathUtil {
*
*
* @param src 源文件
- * @param dest 目标文件或目录，目标不存在会自动创建（目录、文件都创建）
+ * @param target 目标文件或目录，目标不存在会自动创建（目录、文件都创建）
* @param isOverride 是否覆盖目标文件
* @return 目标目录或文件
* @throws IORuntimeException IO异常
*/
- public static File copyContent(final File src, final File dest, final boolean isOverride) throws IORuntimeException {
- return FileCopier.of(src, dest).setCopyContentIfDir(true).setOverride(isOverride).copy();
+ public static File copyContent(final File src, final File target, final boolean isOverride) throws IORuntimeException {
+ Assert.notNull(src, "Src file must be not null!");
+ Assert.notNull(target, "target file must be not null!");
+ return PathUtil.copyContent(
+ src.toPath(),
+ target.toPath(),
+ isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{})
+ .toFile();
}
/**
- * 复制文件或目录
- * 情况如下：
+ * 移动文件或目录到目标中，例如：
+ *
+ *
*
- *
- * 1、src和dest都为目录，则将src下所有文件（包括子目录）拷贝到dest下
- * 2、src和dest都为文件，直接复制，名字为dest
- * 3、src为文件，dest为目录，将src拷贝到dest目录下
- *
- *
- * @param src 源文件
- * @param dest 目标文件或目录，目标不存在会自动创建（目录、文件都创建）
+ * @param src 源文件或目录路径
+ * @param target 目标路径，如果为目录，则移动到此目录下
* @param isOverride 是否覆盖目标文件
- * @return 目标目录或文件
- * @throws IORuntimeException IO异常
- * @since 4.1.5
- */
- public static File copyFilesFromDir(final File src, final File dest, final boolean isOverride) throws IORuntimeException {
- return FileCopier.of(src, dest).setCopyContentIfDir(true).setOnlyCopyFile(true).setOverride(isOverride).copy();
- }
-
- /**
- * 移动文件或者目录
- *
- * @param src 源文件或者目录
- * @param target 目标文件或者目录
- * @param isOverride 是否覆盖目标，只有目标为文件才覆盖
+ * @return 目标文件或目录
* @throws IORuntimeException IO异常
* @see PathUtil#move(Path, Path, boolean)
*/
- public static void move(final File src, final File target, final boolean isOverride) throws IORuntimeException {
+ public static File move(final File src, final File target, final boolean isOverride) throws IORuntimeException {
Assert.notNull(src, "Src file must be not null!");
Assert.notNull(target, "target file must be not null!");
- move(src.toPath(), target.toPath(), isOverride);
- }
-
- /**
- * 移动文件或者目录
- *
- * @param src 源文件或者目录
- * @param target 目标文件或者目录
- * @param isOverride 是否覆盖目标，只有目标为文件才覆盖
- * @throws IORuntimeException IO异常
- * @see PathUtil#moveContent(Path, Path, boolean)
- * @since 5.7.9
- */
- public static void moveContent(final File src, final File target, final boolean isOverride) throws IORuntimeException {
- Assert.notNull(src, "Src file must be not null!");
- Assert.notNull(target, "target file must be not null!");
- moveContent(src.toPath(), target.toPath(), isOverride);
+ return move(src.toPath(), target.toPath(), isOverride).toFile();
}
/**
@@ -1172,7 +1013,7 @@ public class FileUtil extends PathUtil {
*/
public static File rename(final File file, String newName, final boolean isRetainExt, final boolean isOverride) {
if (isRetainExt) {
- final String extName = FileUtil.extName(file);
+ final String extName = FileNameUtil.extName(file);
if (StrUtil.isNotBlank(extName)) {
newName = newName.concat(".").concat(extName);
}
@@ -1604,129 +1445,6 @@ public class FileUtil extends PathUtil {
return filePath;
}
- // -------------------------------------------------------------------------------------------- name start
-
- /**
- * 返回文件名
- *
- * @param file 文件
- * @return 文件名
- * @see FileNameUtil#getName(File)
- * @since 4.1.13
- */
- public static String getName(final File file) {
- return FileNameUtil.getName(file);
- }
-
- /**
- * 返回文件名
- *
- * "d:/test/aaa" 返回 "aaa"
- * "/test/aaa.jpg" 返回 "aaa.jpg"
- *
- *
- * @param filePath 文件
- * @return 文件名
- * @see FileNameUtil#getName(String)
- * @since 4.1.13
- */
- public static String getName(final String filePath) {
- return FileNameUtil.getName(filePath);
- }
-
- /**
- * 获取文件后缀名，扩展名不带“.”
- *
- * @param file 文件
- * @return 扩展名
- * @see FileNameUtil#getSuffix(File)
- * @since 5.3.8
- */
- public static String getSuffix(final File file) {
- return FileNameUtil.getSuffix(file);
- }
-
- /**
- * 获得文件后缀名，扩展名不带“.”
- *
- * @param fileName 文件名
- * @return 扩展名
- * @see FileNameUtil#getSuffix(String)
- * @since 5.3.8
- */
- public static String getSuffix(final String fileName) {
- return FileNameUtil.getSuffix(fileName);
- }
-
- /**
- * 返回主文件名
- *
- * @param file 文件
- * @return 主文件名
- * @see FileNameUtil#getPrefix(File)
- * @since 5.3.8
- */
- public static String getPrefix(final File file) {
- return FileNameUtil.getPrefix(file);
- }
-
- /**
- * 返回主文件名
- *
- * @param fileName 完整文件名
- * @return 主文件名
- * @see FileNameUtil#getPrefix(String)
- * @since 5.3.8
- */
- public static String getPrefix(final String fileName) {
- return FileNameUtil.getPrefix(fileName);
- }
-
- /**
- * 返回主文件名
- *
- * @param file 文件
- * @return 主文件名
- * @see FileNameUtil#mainName(File)
- */
- public static String mainName(final File file) {
- return FileNameUtil.mainName(file);
- }
-
- /**
- * 返回主文件名
- *
- * @param fileName 完整文件名
- * @return 主文件名
- * @see FileNameUtil#mainName(String)
- */
- public static String mainName(final String fileName) {
- return FileNameUtil.mainName(fileName);
- }
-
- /**
- * 获取文件扩展名（后缀名），扩展名不带“.”
- *
- * @param file 文件
- * @return 扩展名
- * @see FileNameUtil#extName(File)
- */
- public static String extName(final File file) {
- return FileNameUtil.extName(file);
- }
-
- /**
- * 获得文件的扩展名（后缀名），扩展名不带“.”
- *
- * @param fileName 文件名
- * @return 扩展名
- * @see FileNameUtil#extName(String)
- */
- public static String extName(final String fileName) {
- return FileNameUtil.extName(fileName);
- }
- // -------------------------------------------------------------------------------------------- name end
-
/**
* 判断文件路径是否有指定后缀，忽略大小写
* 常用语判断扩展名
@@ -1765,6 +1483,7 @@ public class FileUtil extends PathUtil {
* @param file 文件
* @return 输入流
* @throws IORuntimeException 文件未找到
+ * @see IoUtil#toStream(File)
*/
public static BufferedInputStream getInputStream(final File file) throws IORuntimeException {
return IoUtil.toBuffered(IoUtil.toStream(file));
@@ -1790,8 +1509,7 @@ public class FileUtil extends PathUtil {
*/
public static BOMInputStream getBOMInputStream(final File file) throws IORuntimeException {
try {
- //noinspection IOStreamConstructor
- return new BOMInputStream(new FileInputStream(file));
+ return new BOMInputStream(Files.newInputStream(file.toPath()));
} catch (final IOException e) {
throw new IORuntimeException(e);
}
@@ -2258,10 +1976,9 @@ public class FileUtil extends PathUtil {
* @param path 文件的绝对路径
* @return 从文件中load出的数据
* @throws IORuntimeException IO异常
- * @since 3.1.1
*/
- public static
* 原理是首先获取ClassPath路径，由于在web项目中ClassPath位于 WEB-INF/classes/下，故向上获取两级目录即可。
@@ -3051,7 +2728,7 @@ public class FileUtil extends PathUtil {
* getParent(file("d:/aaa/bbb/cc/ddd")) -》 "d:/aaa/bbb/cc"
*
*
- * @param file 目录或文件
+ * @param file 目录或文件
* @return 路径File，如果不存在返回null
* @since 6.0.0
*/
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java
index 3c712c028..a7405a8b1 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java
@@ -1,6 +1,5 @@
package cn.hutool.core.io.file;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.func.Wrapper;
import cn.hutool.core.util.CharsetUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java
index 255421399..cd51770c2 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java
@@ -1,11 +1,10 @@
package cn.hutool.core.io.file;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.CharsetUtil;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -13,9 +12,11 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.util.Map;
import java.util.Map.Entry;
@@ -336,9 +337,9 @@ public class FileWriter extends FileWrapper {
* @since 5.5.2
*/
public File writeFromStream(final InputStream in, final boolean isCloseIn) throws IORuntimeException {
- FileOutputStream out = null;
+ OutputStream out = null;
try {
- out = new FileOutputStream(FileUtil.touch(file));
+ out = Files.newOutputStream(FileUtil.touch(file).toPath());
IoUtil.copy(in, out);
} catch (final IOException e) {
throw new IORuntimeException(e);
@@ -359,7 +360,7 @@ public class FileWriter extends FileWrapper {
*/
public BufferedOutputStream getOutputStream() throws IORuntimeException {
try {
- return new BufferedOutputStream(new FileOutputStream(FileUtil.touch(file)));
+ return new BufferedOutputStream(Files.newOutputStream(FileUtil.touch(file).toPath()));
} catch (final IOException e) {
throw new IORuntimeException(e);
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java b/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java
index 3abbb178d..e6acd1ebb 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java
@@ -1,6 +1,5 @@
package cn.hutool.core.io.file;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.watch.SimpleWatcher;
import cn.hutool.core.lang.func.SerConsumer;
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java
new file mode 100755
index 000000000..eda09af2c
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java
@@ -0,0 +1,164 @@
+package cn.hutool.core.io.file;
+
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.io.file.visitor.CopyVisitor;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.copier.SrcToDestCopier;
+import cn.hutool.core.util.ObjUtil;
+
+import java.io.IOException;
+import java.nio.file.*;
+
+/**
+ * 文件复制封装
+ *
+ * @author looly
+ * @since 6.0.0
+ */
+public class PathCopier extends SrcToDestCopier
+ *
+ *
+ * @return 目标Path
+ * @throws IORuntimeException IO异常
+ */
+ @Override
+ public Path copy() throws IORuntimeException {
+ if (PathUtil.isDirectory(src)) {
+ if (PathUtil.exists(target, false)) {
+ if (PathUtil.isDirectory(target)) {
+ return _copyContent(src, target.resolve(src.getFileName()), options);
+ } else {
+ // src目录，target文件，无法拷贝
+ throw new IllegalArgumentException("Can not copy directory to a file!");
+ }
+ } else {
+ // 目标不存在，按照重命名对待
+ return _copyContent(src, target, options);
+ }
+ }
+ return copyFile(src, target, options);
+ }
+
+ /**
+ * 复制src的内容到target中
+ *
+ *
+ *
+ * @return 目标Path
+ * @throws IORuntimeException IO异常
+ */
+ public Path copyContent() throws IORuntimeException {
+ if (PathUtil.isDirectory(src, false)) {
+ return _copyContent(src, target, options);
+ }
+ return copyFile(src, target, options);
+ }
+
+ /**
+ * 拷贝目录下的所有文件或目录到目标目录中，此方法不支持文件对文件的拷贝。
+ *
+ *
+ *
+ * @param src 源文件路径，如果为目录只在目标中创建新目录
+ * @param target 目标目录，如果为目录使用与源文件相同的文件名
+ * @param options {@link StandardCopyOption}
+ * @return Path
+ * @throws IORuntimeException IO异常
+ */
+ private static Path _copyContent(final Path src, final Path target, final CopyOption... options) throws IORuntimeException {
+ try {
+ Files.walkFileTree(src, new CopyVisitor(src, target, options));
+ } catch (final IOException e) {
+ throw new IORuntimeException(e);
+ }
+ return target;
+ }
+
+ /**
+ * 通过JDK7+的 {@link Files#copy(Path, Path, CopyOption...)} 方法拷贝文件
+ * 此方法不支持递归拷贝目录，如果src传入是目录，只会在目标目录中创建空目录
+ *
+ * @param src 源文件路径，如果为目录只在目标中创建新目录
+ * @param target 目标文件或目录，如果为目录使用与源文件相同的文件名
+ * @param options {@link StandardCopyOption}
+ * @return Path
+ * @throws IORuntimeException IO异常
+ */
+ private static Path copyFile(final Path src, final Path target, final CopyOption... options) throws IORuntimeException {
+ Assert.notNull(src, "Source File is null !");
+ Assert.notNull(target, "Destination File or directory is null !");
+
+ final Path targetPath = PathUtil.isDirectory(target) ? target.resolve(src.getFileName()) : target;
+ // 创建级联父目录
+ PathUtil.mkParentDirs(targetPath);
+ try {
+ return Files.copy(src, targetPath, options);
+ } catch (final IOException e) {
+ throw new IORuntimeException(e);
+ }
+ }
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java b/hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java
new file mode 100755
index 000000000..3b82b0ce1
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java
@@ -0,0 +1,104 @@
+package cn.hutool.core.io.file;
+
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.io.file.visitor.DelVisitor;
+import cn.hutool.core.lang.Assert;
+
+import java.io.IOException;
+import java.nio.file.*;
+import java.util.stream.Stream;
+
+/**
+ * 文件删除封装
+ *
+ * @author looly
+ * @since 6.0.0
+ */
+public class PathDeleter {
+
+ /**
+ * 创建文件或目录移动器
+ *
+ * @param src 源文件或目录
+ * @return {@code PathMover}
+ */
+ public static PathDeleter of(final Path src) {
+ return new PathDeleter(src);
+ }
+
+ private final Path path;
+
+ /**
+ * 构造
+ *
+ * @param path 文件或目录，不能为{@code null}且必须存在
+ */
+ public PathDeleter(final Path path) {
+ this.path = Assert.notNull(path, "Path must be not null !");
+ }
+
+ /**
+ * 删除文件或者文件夹，不追踪软链
+ * 注意：删除文件夹时不会判断文件夹是否为空，如果不空则递归删除子文件或文件夹
+ * 某个文件删除失败会终止删除操作
+ *
+ * @throws IORuntimeException IO异常
+ */
+ public void del() throws IORuntimeException {
+ final Path path = this.path;
+ if (Files.notExists(path)) {
+ return;
+ }
+
+ if (PathUtil.isDirectory(path)) {
+ _del(path);
+ } else {
+ delFile(path);
+ }
+ }
+
+ /**
+ * 清空目录
+ */
+ public void clean() {
+ try (final Stream
+ *
+ *
+ * @return 目标文件Path
+ */
+ public Path move() {
+ final Path src = this.src;
+ Path target = this.target;
+ final CopyOption[] options = this.options;
+
+ if (PathUtil.isDirectory(target)) {
+ // 创建子路径的情况，1是目标是目录，需要移动到目录下，2是目标不能存在，自动创建目录
+ target = target.resolve(src.getFileName());
+ }
+
+ // issue#2893 target 不存在导致NoSuchFileException
+ if (Files.exists(target) && PathUtil.equals(src, target)) {
+ // issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。
+ return target;
+ }
+
+ // 自动创建目标的父目录
+ PathUtil.mkParentDirs(target);
+ try {
+ return Files.move(src, target, options);
+ } catch (final IOException e) {
+ if (e instanceof FileAlreadyExistsException) {
+ // 目标文件已存在，直接抛出异常
+ // issue#I4QV0L@Gitee
+ throw new IORuntimeException(e);
+ }
+ // 移动失败，可能是跨分区移动导致的，采用递归移动方式
+ walkMove(src, target, options);
+ // 移动后删除空目录
+ PathUtil.del(src);
+ return target;
+ }
+ }
+
+ /**
+ * 移动文件或目录内容到目标中，例如：
+ *
+ *
+ *
+ * @return 目标文件Path
+ */
+ public Path moveContent() {
+ final Path src = this.src;
+ if (PathUtil.isExistsAndNotDirectory(target, false)) {
+ // 文件移动调用move方法
+ return move();
+ }
+
+ final Path target = this.target;
+ if (PathUtil.isExistsAndNotDirectory(target, false)) {
+ // 目标不能为文件
+ throw new IllegalArgumentException("Can not move dir content to a file");
+ }
+
+ // issue#2893 target 不存在导致NoSuchFileException
+ if (PathUtil.equals(src, target)) {
+ // issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。
+ return target;
+ }
+
+ final CopyOption[] options = this.options;
+
+ // 移动失败，可能是跨分区移动导致的，采用递归移动方式
+ walkMove(src, target, options);
+ return target;
+ }
+
+ /**
+ * 递归移动
+ *
+ * @param src 源目录
+ * @param target 目标目录
+ * @param options 移动参数
+ */
+ private static void walkMove(final Path src, final Path target, final CopyOption... options) {
+ try {
+ // 移动源目录下的内容而不删除目录
+ Files.walkFileTree(src, new MoveVisitor(src, target, options));
+ } catch (final IOException e) {
+ throw new IORuntimeException(e);
+ }
+ }
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java
index 76888bffe..dcac7bcd9 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java
@@ -2,33 +2,12 @@ package cn.hutool.core.io.file;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.visitor.CopyVisitor;
-import cn.hutool.core.io.file.visitor.DelVisitor;
-import cn.hutool.core.io.file.visitor.MoveVisitor;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharsetUtil;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.nio.charset.Charset;
-import java.nio.file.AccessDeniedException;
-import java.nio.file.CopyOption;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.FileVisitOption;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -147,73 +126,32 @@ public class PathUtil {
* 某个文件删除失败会终止删除操作
*
* @param path 文件对象
- * @return 成功与否
* @throws IORuntimeException IO异常
* @since 4.4.2
*/
- public static boolean del(final Path path) throws IORuntimeException {
- if (Files.notExists(path)) {
- return true;
- }
-
- try {
- if (isDirectory(path)) {
- Files.walkFileTree(path, DelVisitor.INSTANCE);
- } else {
- delFile(path);
- }
- } catch (final IOException e) {
- throw new IORuntimeException(e);
- }
- return true;
+ public static void del(final Path path) throws IORuntimeException {
+ PathDeleter.of(path).del();
}
/**
- * 通过JDK7+的 {@link Files#copy(Path, Path, CopyOption...)} 方法拷贝文件
- * 此方法不支持递归拷贝目录，如果src传入是目录，只会在目标目录中创建空目录
+ * 清空目录
*
- * @param src 源文件路径，如果为目录只在目标中创建新目录
- * @param dest 目标文件或目录，如果为目录使用与源文件相同的文件名
- * @param options {@link StandardCopyOption}
- * @return Path
- * @throws IORuntimeException IO异常
+ * @param path 目录路径
*/
- public static Path copyFile(final Path src, final Path dest, final StandardCopyOption... options) throws IORuntimeException {
- return copyFile(src, dest, (CopyOption[]) options);
+ public static void clean(final Path path) {
+ PathDeleter.of(path).clean();
}
/**
- * 通过JDK7+的 {@link Files#copy(Path, Path, CopyOption...)} 方法拷贝文件
- * 此方法不支持递归拷贝目录，如果src传入是目录，只会在目标目录中创建空目录
- *
- * @param src 源文件路径，如果为目录只在目标中创建新目录
- * @param target 目标文件或目录，如果为目录使用与源文件相同的文件名
- * @param options {@link StandardCopyOption}
- * @return Path
- * @throws IORuntimeException IO异常
- * @since 5.4.1
- */
- public static Path copyFile(final Path src, final Path target, final CopyOption... options) throws IORuntimeException {
- Assert.notNull(src, "Source File is null !");
- Assert.notNull(target, "Destination File or directory is null !");
-
- final Path targetPath = isDirectory(target) ? target.resolve(src.getFileName()) : target;
- // 创建级联父目录
- mkParentDirs(targetPath);
- try {
- return Files.copy(src, targetPath, options);
- } catch (final IOException e) {
- throw new IORuntimeException(e);
- }
- }
-
- /**
- * 拷贝文件或目录，拷贝规则为：
- *
+ * 复制src到target中
*
- *
*
* @param src 源文件路径，如果为目录会在目标中创建新目录
@@ -221,23 +159,21 @@ public class PathUtil {
* @param options {@link StandardCopyOption}
* @return Path
* @throws IORuntimeException IO异常
- * @since 5.5.1
*/
public static Path copy(final Path src, final Path target, final CopyOption... options) throws IORuntimeException {
- Assert.notNull(src, "Src path must be not null !");
- Assert.notNull(target, "Target path must be not null !");
-
- if (isDirectory(src)) {
- return copyContent(src, target.resolve(src.getFileName()), options);
- }
- return copyFile(src, target, options);
+ return PathCopier.of(src, target, options).copy();
}
/**
- * 拷贝目录下的所有文件或目录到目标目录中，此方法不支持文件对文件的拷贝。
+ * 复制src的内容到target中
*
- *
*
* @param src 源文件路径，如果为目录只在目标中创建新目录
@@ -245,18 +181,9 @@ public class PathUtil {
* @param options {@link StandardCopyOption}
* @return Path
* @throws IORuntimeException IO异常
- * @since 5.5.1
*/
public static Path copyContent(final Path src, final Path target, final CopyOption... options) throws IORuntimeException {
- Assert.notNull(src, "Src path must be not null !");
- Assert.notNull(target, "Target path must be not null !");
-
- try {
- Files.walkFileTree(src, new CopyVisitor(src, target, options));
- } catch (final IOException e) {
- throw new IORuntimeException(e);
- }
- return target;
+ return PathCopier.of(src, target, options).copyContent();
}
/**
@@ -271,6 +198,22 @@ public class PathUtil {
return isDirectory(path, false);
}
+ /**
+ * 判断是否存在且为非目录
+ *
+ *
+ *
+ * @param path {@link Path}
+ * @param isFollowLinks 是否追踪到软链对应的真实地址
+ * @return 如果为目录true
+ * @since 3.1.0
+ */
+ public static boolean isExistsAndNotDirectory(final Path path, final boolean isFollowLinks) {
+ return exists(path, isFollowLinks) && false == isDirectory(path, isFollowLinks);
+ }
+
/**
* 判断是否为目录，如果file为null，则返回false
*
@@ -457,6 +400,7 @@ public class PathUtil {
*
*
* FileUtil.rename(file, "aaa.jpg", false) xx/xx.png =》xx/aaa.jpg
+ * FileUtil.rename(dir, "dir2", false) xx/xx/ =》xx/dir2/
*
*
* @param path 被修改的文件
@@ -470,74 +414,44 @@ public class PathUtil {
}
/**
- * 移动文件或目录
- * 当目标是目录时，会将源文件或文件夹整体移动至目标目录下
- * 例如：
+ * 移动文件或目录到目标中，例如：
*
- *
*
* @param src 源文件或目录路径
* @param target 目标路径，如果为目录，则移动到此目录下
* @param isOverride 是否覆盖目标文件
* @return 目标文件Path
- * @since 5.5.1
*/
- public static Path move(final Path src, Path target, final boolean isOverride) {
- Assert.notNull(src, "Src path must be not null !");
- Assert.notNull(target, "Target path must be not null !");
-
- if (isDirectory(target)) {
- target = target.resolve(src.getFileName());
- }
- return moveContent(src, target, isOverride);
+ public static Path move(final Path src, final Path target, final boolean isOverride) {
+ return PathMover.of(src, target, isOverride).move();
}
/**
- * 移动文件或目录内容到目标目录中，例如：
+ * 移动文件或目录内容到目标中，例如：
*
- *
*
* @param src 源文件或目录路径
* @param target 目标路径，如果为目录，则移动到此目录下
* @param isOverride 是否覆盖目标文件
* @return 目标文件Path
- * @since 5.7.9
*/
public static Path moveContent(final Path src, final Path target, final boolean isOverride) {
- Assert.notNull(src, "Src path must be not null !");
- Assert.notNull(target, "Target path must be not null !");
-
- if(equals(src, target)){
- // issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。
- return target;
- }
-
- final CopyOption[] options = isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{};
-
- // 自动创建目标的父目录
- mkParentDirs(target);
- try {
- return Files.move(src, target, options);
- } catch (final IOException e) {
- if(e instanceof FileAlreadyExistsException){
- // 目标文件已存在，直接抛出异常
- // issue#I4QV0L@Gitee
- throw new IORuntimeException(e);
- }
- // 移动失败，可能是跨分区移动导致的，采用递归移动方式
- try {
- Files.walkFileTree(src, new MoveVisitor(src, target, options));
- // 移动后空目录没有删除，
- del(src);
- } catch (final IOException e2) {
- throw new IORuntimeException(e2);
- }
- return target;
- }
+ return PathMover.of(src, target, isOverride).moveContent();
}
/**
@@ -589,12 +503,15 @@ public class PathUtil {
/**
* 判断文件或目录是否存在
*
- * @param path 文件
+ * @param path 文件，{@code null}返回{@code false}
* @param isFollowLinks 是否跟踪软链（快捷方式）
* @return 是否存在
* @since 5.5.3
*/
public static boolean exists(final Path path, final boolean isFollowLinks) {
+ if (null == path) {
+ return false;
+ }
final LinkOption[] options = isFollowLinks ? new LinkOption[0] : new LinkOption[]{LinkOption.NOFOLLOW_LINKS};
return Files.exists(path, options);
}
@@ -681,22 +598,4 @@ public class PathUtil {
}
return path.getFileName().toString();
}
-
- /**
- * 删除文件或空目录，不追踪软链
- *
- * @param path 文件对象
- * @throws IOException IO异常
- * @since 5.7.7
- */
- protected static void delFile(final Path path) throws IOException {
- try {
- Files.delete(path);
- } catch (final AccessDeniedException e) {
- // 可能遇到只读文件，无法删除.使用 file 方法删除
- if (false == path.toFile().delete()) {
- throw e;
- }
- }
- }
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java
index 3bd690fce..e15c504ad 100755
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java
@@ -2,8 +2,8 @@ package cn.hutool.core.io.file;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.func.SerConsumer;
import cn.hutool.core.util.CharUtil;
@@ -140,7 +140,11 @@ public class Tailer implements Serializable {
* 结束，此方法需在异步模式或
*/
public void stop(){
- this.executorService.shutdown();
+ try{
+ this.executorService.shutdown();
+ } finally {
+ IoUtil.close(this.randomAccessFile);
+ }
}
// ---------------------------------------------------------------------------------------- Private method start
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java b/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
index 09b456113..a167ad627 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
@@ -15,6 +15,9 @@ import java.nio.file.attribute.BasicFileAttributes;
*/
public class DelVisitor extends SimpleFileVisitor
* Assert.isNull(value, "The value must be null");
*
@@ -160,7 +159,6 @@ public class Assert {
/**
* 断言对象是否为{@code null} ，如果不为{@code null} 抛出{@link IllegalArgumentException} 异常
- *
*
* Assert.isNull(value);
*
@@ -201,7 +199,6 @@ public class Assert {
/**
* 断言对象是否不为{@code null} ，如果为{@code null} 抛出{@link IllegalArgumentException} 异常 Assert that an object is not {@code null} .
- *
*
* Assert.notNull(clazz, "The class must not be null");
*
@@ -219,7 +216,6 @@ public class Assert {
/**
* 断言对象是否不为{@code null} ，如果为{@code null} 抛出{@link IllegalArgumentException} 异常
- *
*
* Assert.notNull(clazz);
*
@@ -358,8 +354,8 @@ public class Assert {
}
/**
- * 断言给定字符串是否不被另一个字符串包含（即是否为子串）
- * 并使用指定的函数获取错误信息返回
+ * 断言给定字符串是否不被另一个字符串包含（即是否为子串），并使用指定的函数获取错误信息返回
+ * 如果非子串，返回子串，如果是子串，则抛出{@link IllegalArgumentException}异常。
*
* Assert.notContain(name, "rod", ()->{
* // to query relation message
@@ -385,43 +381,42 @@ public class Assert {
}
/**
- * 断言给定字符串是否不被另一个字符串包含（即是否为子串）
- *
+ * 断言给定字符串是否不被另一个字符串包含（即是否为子串）
*
*
+ * 如果非子串，返回子串，如果是子串，则抛出{@link IllegalArgumentException}异常。
*
* Assert.notContain(name, "rod", "Name must not contain 'rod'");
*
*
* @param textToSearch 被搜索的字符串
- * @param substring 被检查的子串
+ * @param subString 被检查的子串
* @param errorMsgTemplate 异常时的消息模板
* @param params 参数列表
* @return 被检查的子串
* @throws IllegalArgumentException 非子串抛出异常
*/
- public static String notContain(final String textToSearch, final String substring, final String errorMsgTemplate, final Object... params) throws IllegalArgumentException {
- return notContain(textToSearch, substring, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params)));
+ public static String notContain(final String textToSearch, final String subString, final String errorMsgTemplate, final Object... params) throws IllegalArgumentException {
+ return notContain(textToSearch, subString, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params)));
}
/**
- * 断言给定字符串是否不被另一个字符串包含（即是否为子串）
- *
+ * 断言给定字符串是否不被另一个字符串包含（即是否为子串），即subString是否不是textToSearch的子串。
+ * 如果非子串，返回子串，如果是子串，则抛出{@link IllegalArgumentException}异常。
*
* Assert.notContain(name, "rod");
*
*
* @param textToSearch 被搜索的字符串
- * @param substring 被检查的子串
+ * @param subString 被检查的子串
* @return 被检查的子串
* @throws IllegalArgumentException 非子串抛出异常
*/
- public static String notContain(final String textToSearch, final String substring) throws IllegalArgumentException {
- return notContain(textToSearch, substring, "[Assertion failed] - this String argument must not contain the substring [{}]", substring);
+ public static String notContain(final String textToSearch, final String subString) throws IllegalArgumentException {
+ return notContain(textToSearch, subString, "[Assertion failed] - this String argument must not contain the substring [{}]", subString);
}
/**
* 断言给定数组是否包含元素，数组必须不为 {@code null} 且至少包含一个元素
* 并使用指定的函数获取错误信息返回
- *
*
* Assert.notEmpty(array, ()->{
* // to query relation message
@@ -447,7 +442,6 @@ public class Assert {
/**
* 断言给定数组是否包含元素，数组必须不为 {@code null} 且至少包含一个元素
- *
*
+ * }
* Assert.notEmpty(array, "The array must have elements");
*
@@ -465,7 +459,6 @@ public class Assert {
/**
* 断言给定数组是否包含元素，数组必须不为 {@code null} 且至少包含一个元素
- *
*
* Assert.notEmpty(array, "The array must have elements");
*
@@ -507,7 +500,6 @@ public class Assert {
/**
* 断言给定数组是否不包含{@code null}元素，如果数组为空或 {@code null}将被认为不包含
- *
*
* Assert.noNullElements(array, "The array must not have null elements");
*
@@ -525,7 +517,6 @@ public class Assert {
/**
* 断言给定数组是否不包含{@code null}元素，如果数组为空或 {@code null}将被认为不包含
- *
*
* Assert.noNullElements(array);
*
@@ -568,7 +559,6 @@ public class Assert {
/**
* 断言给定集合非空
- *
*
* Assert.notEmpty(collection, "Collection must have elements");
*
@@ -587,7 +577,6 @@ public class Assert {
/**
* 断言给定集合非空
- *
*
* Assert.notEmpty(collection);
*
@@ -632,7 +621,6 @@ public class Assert {
/**
* 断言给定Map非空
- *
*
* Assert.notEmpty(map, "Map must have entries");
*
@@ -652,7 +640,6 @@ public class Assert {
/**
* 断言给定Map非空
- *
*
* Assert.notEmpty(map, "Map must have entries");
*
@@ -670,7 +657,6 @@ public class Assert {
/**
* 断言给定对象是否是给定类的实例
- *
*
* Assert.instanceOf(Foo.class, foo);
*
@@ -688,7 +674,6 @@ public class Assert {
/**
* 断言给定对象是否是给定类的实例
- *
*
* Assert.instanceOf(Foo.class, foo, "foo must be an instance of class Foo");
*
@@ -712,7 +697,6 @@ public class Assert {
/**
* 断言 {@code superType.isAssignableFrom(subType)} 是否为 {@code true}.
- *
*
* Assert.isAssignable(Number.class, myClass);
*
@@ -727,7 +711,6 @@ public class Assert {
/**
* 断言 {@code superType.isAssignableFrom(subType)} 是否为 {@code true}.
- *
*
* Assert.isAssignable(Number.class, myClass, "myClass must can be assignable to class Number");
*
@@ -767,7 +750,6 @@ public class Assert {
/**
* 检查boolean表达式，当检查结果为false时抛出 {@code IllegalStateException}。
- *
*
* Assert.state(id == null, "The id property must not already be initialized");
*
@@ -785,7 +767,6 @@ public class Assert {
/**
* 检查boolean表达式，当检查结果为false时抛出 {@code IllegalStateException}。
- *
*
* Assert.state(id == null);
*
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java b/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java
index 1e69e28a2..02c8b24fc 100644
--- a/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java
@@ -1,5 +1,7 @@
package cn.hutool.core.lang;
+import cn.hutool.core.text.StrUtil;
+
/**
* 片段默认实现
*
@@ -9,26 +11,32 @@ package cn.hutool.core.lang;
*/
public class DefaultSegment{@code
* Class
+ * }
*
setter方法返回的值类型
+ * @param setter方法返回的值类型
* @return Obj::setXxx
*/
- public static setter方法返回的值类型
+ * @param setter方法返回的值类型
* @return Obj::setXxx
*/
- public static 空区间 根据数学定义，当区间中无任何实数时，认为该区间代表的集合为空集，
+ * 根据数学定义，当区间中无任何实数时，认为该区间 代表的集合为空集，
* 用户可通过{@link #isEmpty}确认当前实例是否为空区间。
* 工具实现见博客：https://blog.starxg.com/2020/11/bit-status/
*
* @author huangxingguang，senssic
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
index bf54ed668..3657c72d6 100644
--- a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
+++ b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
@@ -56,7 +56,10 @@ public class Calculator {
resultStack.push(tempResult.toString());
}
}
- return Double.parseDouble(resultStack.pop());
+
+ // 当结果集中有多个数字时，可能是省略*，类似(1+2)3
+ return NumberUtil.mul(resultStack.toArray(new String[0])).doubleValue();
+ //return Double.parseDouble(resultStack.pop());
}
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/NavigatePageInfo.java b/hutool-core/src/main/java/cn/hutool/core/math/NavigatePageInfo.java
new file mode 100644
index 000000000..cee14bc65
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/math/NavigatePageInfo.java
@@ -0,0 +1,71 @@
+package cn.hutool.core.math;
+
+public class NavigatePageInfo extends PageInfo{
+
+ private final int navigatePages = 8; //导航页码数
+ private int[] navigatePageNumbers; //所有导航页号
+
+ public NavigatePageInfo(final int total, final int pageSize) {
+ super(total, pageSize);
+
+ //基本参数设定之后进行导航页面的计算
+ calcNavigatePageNumbers();
+ }
+
+ /**
+ * 得到所有导航页号
+ *
+ * @return {int[]}
+ */
+ public int[] getNavigatePageNumbers() {
+ return navigatePageNumbers;
+ }
+
+ public String toString() {
+ final StringBuilder str = new StringBuilder(super.toString());
+ str.append(", {navigatePageNumbers=");
+ final int len = navigatePageNumbers.length;
+ if (len > 0) str.append(navigatePageNumbers[0]);
+ for (int i = 1; i < len; i++) {
+ str.append(" ").append(navigatePageNumbers[i]);
+ }
+ str.append("}");
+ return str.toString();
+ }
+
+ /**
+ * 计算导航页
+ */
+ private void calcNavigatePageNumbers() {
+ //当总页数小于或等于导航页码数时
+ if (pages <= navigatePages) {
+ navigatePageNumbers = new int[pages];
+ for (int i = 0; i < pages; i++) {
+ navigatePageNumbers[i] = i + 1;
+ }
+ } else { //当总页数大于导航页码数时
+ navigatePageNumbers = new int[navigatePages];
+ int startNum = pageNo - navigatePages / 2;
+ int endNum = pageNo + navigatePages / 2;
+
+ if (startNum < 1) {
+ startNum = 1;
+ //(最前navPageCount页
+ for (int i = 0; i < navigatePages; i++) {
+ navigatePageNumbers[i] = startNum++;
+ }
+ } else if (endNum > pages) {
+ endNum = pages;
+ //最后navPageCount页
+ for (int i = navigatePages - 1; i >= 0; i--) {
+ navigatePageNumbers[i] = endNum--;
+ }
+ } else {
+ //所有中间页
+ for (int i = 0; i < navigatePages; i++) {
+ navigatePageNumbers[i] = startNum++;
+ }
+ }
+ }
+ }
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java
index 365fdcaf0..f40ae04af 100644
--- a/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java
@@ -1761,5 +1761,4 @@ public class NumberUtil {
public static boolean isEven(final int num) {
return false == isOdd(num);
}
-
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/PageInfo.java b/hutool-core/src/main/java/cn/hutool/core/math/PageInfo.java
new file mode 100644
index 000000000..a84079fff
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/math/PageInfo.java
@@ -0,0 +1,291 @@
+package cn.hutool.core.math;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.DefaultSegment;
+import cn.hutool.core.lang.Segment;
+
+/**
+ * 分页信息，通过提供的总数、页码、每页记录数等信息，计算总页数等信息 pr自：https://gitee.com/loolly/hutool/pulls/161 名词解释：
+ * 方法别名：inet_aton 方法别名：inet_ntoa
+ * 公网IP：
+ * 例如，ip为{@literal 0xC0A802FA}：
+ *
@@ -32,7 +33,7 @@ public class SSLContextBuilder implements SSLProtocols, Builder
* 参考：
* https://blog.csdn.net/u013202238/article/details/108687086 去除每个元素两边空格，大小写敏感，忽略空串 去除每个元素两边空格，大小写敏感，忽略空串 去除每个元素两边空格，大小写敏感，忽略空串 去除每个元素两边空格，大小写敏感，忽略空串
* 其他系统内置的拒绝策略，见hutool定义的枚举 {@link RejectPolicy} 线程拒绝策略枚举.
*
* @author luozongle
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java b/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
index b8cbec6dd..e5263816b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
@@ -3,7 +3,6 @@ package cn.hutool.core.thread;
import cn.hutool.core.exceptions.UtilException;
import java.io.Closeable;
-import java.io.IOException;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
@@ -70,6 +69,7 @@ public class SyncFinisher implements Closeable {
* @param runnable 工作线程
* @return this
*/
+ @SuppressWarnings("resource")
public SyncFinisher addRepeatWorker(final Runnable runnable) {
for (int i = 0; i < this.threadSize; i++) {
addWorker(new Worker() {
@@ -197,7 +197,7 @@ public class SyncFinisher implements Closeable {
}
@Override
- public void close() throws IOException {
+ public void close() {
stop();
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
index de79b82eb..17d126d08 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
@@ -140,7 +140,7 @@ public class ThreadUtil {
* 最后，引用一句电影经典台词： 无处安放的双手，以及无处安放的灵魂。——《Hello!树先生》 若传入空数组，则返回{@code false}
- * 当{@link #setFirstPageNo(int)}设置为1时：
- *
- * 当{@link #setFirstPageNo(int)}设置为1时：
- *
- * 当{@link #setFirstPageNo(int)}设置为1时：
- *
- * 当{@link #setFirstPageNo(int)}设置为1时：
- *
* 若实例上界a，下界为b，则当实例满足下述任意条件时，认为其为一个空区间：
*
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java b/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java
index b9d69d397..5915e771c 100644
--- a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java
@@ -54,12 +54,13 @@ class NoneLowerBound
*
*
* @param bound 边界
* @return 位置
*/
+ @SuppressWarnings("ComparatorMethodParameterNotUsed")
@Override
public int compareTo(final Bound
* 参数必须是 `偶数` 且 `大于等于0`！
- *
+ *
+ * 来自：https://bbs.csdn.net/topics/360010907
+ *
+ * @author 莫取网名
+ */
+public class PageInfo {
+
+ private static final int DEFAULT_PAGE_SIZE = 10;
+
+ /**
+ * 创建{@code PageInfo}，默认当前页是1
+ *
+ * @param total 总记录数
+ * @param pageSize 每页显示记录数
+ * @return {@code PageInfo}
+ */
+ public static PageInfo of(final int total, final int pageSize) {
+ return new PageInfo(total, pageSize);
+ }
+
+ /**
+ * 总记录数
+ */
+ int total;
+ /**
+ * 每页显示记录数
+ */
+ int pageSize;
+ /**
+ * 总页数
+ */
+ int pages;
+ /**
+ * 首页标识
+ */
+ int firstPageNo = 1;
+ /**
+ * 当前页
+ */
+ int pageNo = firstPageNo;
+
+ /**
+ * 构造
+ *
+ * @param total 总记录数
+ * @param pageSize 每页显示记录数
+ */
+ public PageInfo(final int total, final int pageSize) {
+ init(total, pageSize);
+ }
+
+ /**
+ * 初始化
+ *
+ * @param total 总记录数
+ * @param pageSize 每页显示记录数
+ */
+ private void init(final int total, int pageSize) {
+ Assert.isTrue(total >= 0, "Total must >= 0");
+
+ //设置基本参数
+ this.total = total;
+
+ if (pageSize < 1) {
+ pageSize = DEFAULT_PAGE_SIZE;
+ }
+ this.pageSize = pageSize;
+ // 因为总条数除以页大小的最大余数是页大小数-1，
+ // 因此加一个最大余数，保证舍弃的余数与最大余数凑1.x，就是一旦有余数则+1页
+ this.pages = (total + pageSize - 1) / pageSize;
+ }
+
+ /**
+ * 得到记录总数
+ *
+ * @return {int}
+ */
+ public int getTotal() {
+ return total;
+ }
+
+ /**
+ * 得到每页显示多少条记录
+ *
+ * @return {int}
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /**
+ * 得到页面总数
+ *
+ * @return {int}
+ */
+ public int getPages() {
+ return pages;
+ }
+
+ /**
+ * 得到当前页号
+ *
+ * @return {int}
+ */
+ public int getPageNo() {
+ return pageNo;
+ }
+
+
+ /**
+ * 是否首页
+ *
+ * @return 是否首页
+ */
+ public boolean isFirstPage() {
+ return getPageIndexBase1() == 1;
+ }
+
+ /**
+ * 是否尾页
+ *
+ * @return 是否尾页
+ */
+ public boolean isLastPage() {
+ return getPageIndexBase1() == this.pages;
+ }
+
+ /**
+ * 是否有前一页
+ *
+ * @return 是否有前一页
+ */
+ public boolean hasPreviousPage() {
+ return getPageIndexBase1() > 1;
+ }
+
+ /**
+ * 是否有下一页
+ *
+ * @return 是否有下一页
+ */
+ public boolean hasNextPage() {
+ return getBeginIndex() < this.pages;
+ }
+
+ /**
+ * 当前页是否可用（是否大于firstPageNum且小于总页数）
+ * @return 是否可用
+ */
+ public boolean isValidPage(){
+ return this.getPageIndexBase1() <= this.pages;
+ }
+
+ /**
+ * 获取当前页的开始记录index（包含）
+ *
+ * @return 开始记录index（包含）
+ */
+ public int getBeginIndex() {
+ return (getPageIndexBase1() -1) * this.pageSize;
+ }
+
+ /**
+ * 获取当前页的结束记录index（不包含）
+ *
+ *
+ *
+ * @return 结束记录index（不包含）
+ */
+ public int getEndIndexExclude() {
+ return getEndIndex() + 1;
+ }
+
+ /**
+ * 获取当前页的结束记录index（包含）
+ *
+ *
+ *
+ * @return 结束记录index（包含）
+ */
+ public int getEndIndex() {
+ final int begin = getBeginIndex();
+ int end = begin + this.pageSize - 1;
+ if (begin <= this.total && end > this.total) {
+ end = this.total;
+ }
+ return end;
+ }
+
+ /**
+ * 将页数和每页条目数转换为开始位置和结束位置
+ * 此方法用于包括结束位置的分页方法
+ * 例如：
+ *
+ * 页码：1，每页10 =》 [0, 9]
+ * 页码：2，每页10 =》 [10, 19]
+ * ……
+ *
+ *
+ * @return {@link Segment}
+ */
+ public Segment
+ * 如设置0，则0表示第一页，1表示第二页
+ *
+ * @param firstPageNo 首页编号
+ * @return this
+ */
+ public PageInfo setFirstPageNo(final int firstPageNo) {
+ this.firstPageNo = firstPageNo;
+ return this;
+ }
+
+ /**
+ * 设置当前页码
+ *
+ * @param pageNo 当前页码
+ * @return this
+ */
+ public PageInfo setPageNo(final int pageNo) {
+ //根据输入可能错误的当前号码进行自动纠正
+ // 不判断后边界，因为当页码超出边界，应该返回一个空区间的数据，而非始终保持在最后一页
+ this.pageNo = Math.max(pageNo, firstPageNo);
+ return this;
+ }
+
+ /**
+ * 下一页，即当前页码+1
+ *
+ * @return this
+ */
+ public PageInfo nextPage() {
+ return setPageNo(this.pageNo + 1);
+ }
+
+ /**
+ * 上一页，即当前页码-1,直到第一页则始终为第一页
+ *
+ * @return this
+ */
+ public PageInfo PreviousPage() {
+ return setPageNo(this.pageNo - 1);
+ }
+
+ public String toString() {
+ return "{" +
+ "total=" + total +
+ ",pages=" + pages +
+ ",pageNumber=" + pageNo +
+ ",limit=" + pageSize +
+ ",isFirstPage=" + isFirstPage() +
+ ",isLastPage=" + isLastPage() +
+ ",hasPreviousPage=" + hasPreviousPage() +
+ ",hasNextPage=" + hasNextPage() +
+ "}";
+ }
+
+ /**
+ * 获取页码序号，第一个序号就是1
+ * @return 页码序号
+ */
+ private int getPageIndexBase1(){
+ return this.pageNo - this.firstPageNo + 1;
+ }
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java
new file mode 100644
index 000000000..172dcd22f
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java
@@ -0,0 +1,439 @@
+package cn.hutool.core.net;
+
+/**
+ * Ip相关常量
+ *
+ * 为了方便处理作出以下特别说明，若后续因此收到影响或有更好处理方式需要及时调整：
+ * 1、此处定义的`最小值`、`最大值`并非实际ip可分配的最小值、最大值。而是正常地址格式所能表示的最小值、最大值。
+ * 2、比如：1.0.0.0这种保留地址，我们仍然认为属于A类网。
+ * 3、类似于127.0.0.1这种本地回环地址，我们仍然认为数据C类网。
+ *
+ *
+ * @author aoshiguchen
+ * @author emptypoint
+ * @since 6.0.0
+ */
+public interface Ipv4Pool {
+
+ /**
+ * IP段的分割符
+ */
+ String IP_SPLIT_MARK = "-";
+
+ /**
+ * IP与掩码的分割符
+ */
+ String IP_MASK_SPLIT_MARK = "/";
+
+ /**
+ * localhost默认解析的ip地址
+ */
+ String LOCAL_IP = "127.0.0.1";
+ /**
+ * localhost默认解析的ip地址的数值形式
+ */
+ long LOCAL_IP_NUM = Ipv4Util.ipv4ToLong(LOCAL_IP);
+
+ /**
+ * Ipv4地址最小值字符串形式
+ */
+ String IPV4_STR_MIN = "0.0.0.0";
+ /**
+ * Ipv4最小值数值形式
+ */
+ long IPV4_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_STR_MIN);
+
+ /**
+ * Ipv4地址最大值字符串形式
+ */
+ String IPV4_STR_MAX = "255.255.255.255";
+ /**
+ * Ipv4最大值数值形式
+ */
+ long IPV4_NUM_MAX = 0xffffffffL;
+
+ /**
+ * Ipv4未使用地址最小值字符串形式
+ */
+ String IPV4_UNUSED_STR_MIN = "0.0.0.0";
+ /**
+ * Ipv4未使用地址最小值数值形式
+ */
+ long IPV4_UNUSED_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_UNUSED_STR_MIN);
+
+ /**
+ * Ipv4未使用地址最大值字符串形式
+ */
+ String IPV4_UNUSED_STR_MAX = "0.255.255.255";
+ /**
+ * Ipv4未使用地址最大值数值形式
+ */
+ long IPV4_UNUSED_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_UNUSED_STR_MAX);
+
+ // region 子网掩码常量
+ // ================================================== 子网掩码常量 ==================================================
+ /**
+ * Ipv4最小掩码位
+ */
+ int IPV4_MASK_BIT_MIN = 0;
+
+ /**
+ * Ipv4有意义的最小掩码位
+ */
+ int IPV4_MASK_BIT_VALID_MIN = 1;
+ /**
+ * Ipv4有意义的最小掩码字符串
+ */
+ String IPV4_MASK_VALID_MIN = MaskBit.get(IPV4_MASK_BIT_VALID_MIN);
+
+ /**
+ * Ipv4最大掩码位
+ */
+ int IPV4_MASK_BIT_MAX = 32;
+ /**
+ * Ipv4最大掩码字符串
+ */
+ String IPV4_MASK_MAX = MaskBit.get(IPV4_MASK_BIT_MAX);
+ // endregion
+
+ // region 本地回环地址常量
+ // ================================================== 本地回环地址常量 ================================================
+ /**
+ * Ipv4 本地回环地址最小值字符串形式
+ */
+ String IPV4_LOOPBACK_STR_MIN = "127.0.0.0";
+ /**
+ * Ipv4 本地回环地址最小值数值形式
+ */
+ long IPV4_LOOPBACK_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_LOOPBACK_STR_MIN);
+ /**
+ * Ipv4 本地回环地址最大值字符串形式
+ */
+ String IPV4_LOOPBACK_STR_MAX = "127.255.255.255";
+ /**
+ * Ipv4 本地回环地址最大值数值形式
+ */
+ long IPV4_LOOPBACK_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_LOOPBACK_STR_MAX);
+ // endregion
+
+ // region A类地址常量
+ // ================================================== A类地址常量 ==================================================
+ /**
+ * Ipv4 A类地址最小值字符串形式
+ */
+ String IPV4_A_STR_MIN = "0.0.0.0";
+ /**
+ * Ipv4 A类地址最小值数值形式
+ */
+ long IPV4_A_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_A_STR_MIN);
+
+ /**
+ * Ipv4 A类地址最大值字符串形式
+ */
+ String IPV4_A_STR_MAX = "127.255.255.255";
+ /**
+ * Ipv4 A类地址最大值数值形式
+ */
+ long IPV4_A_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_A_STR_MAX);
+
+ /**
+ * Ipv4 A类地址第一个公网网段最小值字符串形式
+ */
+ String IPV4_A_PUBLIC_1_STR_MIN = "1.0.0.0";
+ /**
+ * Ipv4 A类地址第一个公网网段最小值数值形式
+ */
+ long IPV4_A_PUBLIC_1_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_A_PUBLIC_1_STR_MIN);
+
+ /**
+ * Ipv4 A类地址第一个公网网段最大值字符串形式
+ */
+ String IPV4_A_PUBLIC_1_STR_MAX = "9.255.255.255";
+ /**
+ * Ipv4 A类地址第一个公网网段最大值数值形式
+ */
+ long IPV4_A_PUBLIC_1_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_A_PUBLIC_1_STR_MAX);
+
+ /**
+ * Ipv4 A类地址私网网段最小值字符串形式
+ */
+ String IPV4_A_PRIVATE_STR_MIN = "10.0.0.0";
+ /**
+ * Ipv4 A类地址私网网段最小值数值形式
+ */
+ long IPV4_A_PRIVATE_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_A_PRIVATE_STR_MIN);
+
+ /**
+ * Ipv4 A类地址私网网段最大值字符串形式
+ */
+ String IPV4_A_PRIVATE_STR_MAX = "10.255.255.255";
+ /**
+ * Ipv4 A类地址私网网段最大值数值形式
+ */
+ long IPV4_A_PRIVATE_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_A_PRIVATE_STR_MAX);
+
+ /**
+ * Ipv4 A类地址第二个公网网段最小值字符串形式
+ */
+ String IPV4_A_PUBLIC_2_STR_MIN = "11.0.0.0";
+ /**
+ * Ipv4 A类地址第二个公网网段最小值数值形式
+ */
+ long IPV4_A_PUBLIC_2_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_A_PUBLIC_2_STR_MIN);
+
+ /**
+ * Ipv4 A类地址第二个公网网段最大值字符串形式
+ */
+ String IPV4_A_PUBLIC_2_STR_MAX = "126.255.255.255";
+ /**
+ * Ipv4 A类地址第二个公网网段最大值数值形式
+ */
+ long IPV4_A_PUBLIC_2_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_A_PUBLIC_2_STR_MAX);
+ // endregion
+
+ // region B类地址常量
+ // ================================================== B类地址常量 ==================================================
+ /**
+ * Ipv4 B类地址最小值字符串形式
+ */
+ String IPV4_B_STR_MIN = "128.0.0.0";
+ /**
+ * Ipv4 B类地址最小值数值形式
+ */
+ long IPV4_B_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_B_STR_MIN);
+
+ /**
+ * Ipv4 B类地址最大值字符串形式
+ */
+ String IPV4_B_STR_MAX = "191.255.255.255";
+ /**
+ * Ipv4 B类地址最大值数值形式
+ */
+ long IPV4_B_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_B_STR_MAX);
+
+ /**
+ * Ipv4 B类地址第一个公网网段最小值字符串形式
+ */
+ String IPV4_B_PUBLIC_1_STR_MIN = "128.0.0.0";
+ /**
+ * Ipv4 B类地址第一个公网网段最小值数值形式
+ */
+ long IPV4_B_PUBLIC_1_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_B_PUBLIC_1_STR_MIN);
+
+ /**
+ * Ipv4 B类地址第一个公网网段最大值字符串形式
+ */
+ String IPV4_B_PUBLIC_1_STR_MAX = "172.15.255.255";
+ /**
+ * Ipv4 B类地址第一个公网网段最大值数值形式
+ */
+ long IPV4_B_PUBLIC_1_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_B_PUBLIC_1_STR_MAX);
+
+ /**
+ * Ipv4 B类地址私网网段最小值字符串形式
+ */
+ String IPV4_B_PRIVATE_STR_MIN = "172.16.0.0";
+ /**
+ * Ipv4 B类地址私网网段最小值数值形式
+ */
+ long IPV4_B_PRIVATE_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_B_PRIVATE_STR_MIN);
+
+ /**
+ * Ipv4 B类地址私网网段最大值字符串形式
+ */
+ String IPV4_B_PRIVATE_STR_MAX = "172.31.255.255";
+ /**
+ * Ipv4 B类地址私网网段最大值数值形式
+ */
+ long IPV4_B_PRIVATE_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_B_PRIVATE_STR_MAX);
+
+ /**
+ * Ipv4 B类地址第二个公网网段最小值字符串形式
+ */
+ String IPV4_B_PUBLIC_2_STR_MIN = "172.32.0.0";
+ /**
+ * Ipv4 B类地址第二个公网网段最小值数值形式
+ */
+ long IPV4_B_PUBLIC_2_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_B_PUBLIC_2_STR_MIN);
+
+ /**
+ * Ipv4 B类地址第二个公网网段最大值字符串形式
+ */
+ String IPV4_B_PUBLIC_2_STR_MAX = "191.255.255.255";
+ /**
+ * Ipv4 B类地址第二个公网网段最大值数值形式
+ */
+ long IPV4_B_PUBLIC_2_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_B_PUBLIC_2_STR_MAX);
+ // endregion
+
+ // region C类地址常量
+ // ================================================== C类地址常量 ==================================================
+ /**
+ * Ipv4 C类地址最小值字符串形式
+ */
+ String IPV4_C_STR_MIN = "192.0.0.0";
+ /**
+ * Ipv4 C类地址最小值数值形式
+ */
+ long IPV4_C_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_C_STR_MIN);
+
+ /**
+ * Ipv4 C类地址最大值字符串形式
+ */
+ String IPV4_C_STR_MAX = "223.255.255.255";
+ /**
+ * Ipv4 C类地址最大值数值形式
+ */
+ long IPV4_C_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_C_STR_MAX);
+
+ /**
+ * Ipv4 C类地址第一个公网网段最小值字符串形式
+ */
+ String IPV4_C_PUBLIC_1_STR_MIN = "192.0.0.0";
+ /**
+ * Ipv4 C类地址第一个公网网段最小值数值形式
+ */
+ long IPV4_C_PUBLIC_1_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_C_PUBLIC_1_STR_MIN);
+
+ /**
+ * Ipv4 C类地址第一个公网网段最大值字符串形式
+ */
+ String IPV4_C_PUBLIC_1_STR_MAX = "192.167.255.255";
+ /**
+ * Ipv4 C类地址第一个公网网段最大值数值形式
+ */
+ long IPV4_C_PUBLIC_1_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_C_PUBLIC_1_STR_MAX);
+
+ /**
+ * Ipv4 C类地址私网网段最小值字符串形式
+ */
+ String IPV4_C_PRIVATE_STR_MIN = "192.168.0.0";
+ /**
+ * Ipv4 C类地址私网网段最小值数值形式
+ */
+ long IPV4_C_PRIVATE_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_C_PRIVATE_STR_MIN);
+
+ /**
+ * Ipv4 C类地址私网网段最大值字符串形式
+ */
+ String IPV4_C_PRIVATE_STR_MAX = "192.168.255.255";
+ /**
+ * Ipv4 C类地址私网网段最大值数值形式
+ */
+ long IPV4_C_PRIVATE_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_C_PRIVATE_STR_MAX);
+
+ /**
+ * Ipv4 C类地址第二个公网网段最小值字符串形式
+ */
+ String IPV4_C_PUBLIC_2_STR_MIN = "192.169.0.0";
+ /**
+ * Ipv4 C类地址第二个公网网段最小值数值形式
+ */
+ long IPV4_C_PUBLIC_2_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_C_PUBLIC_2_STR_MIN);
+
+ /**
+ * Ipv4 C类地址第二个公网网段最大值字符串形式
+ */
+ String IPV4_C_PUBLIC_2_STR_MAX = "223.255.255.255";
+ /**
+ * Ipv4 C类地址第二个公网网段最大值数值形式
+ */
+ long IPV4_C_PUBLIC_2_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_C_PUBLIC_2_STR_MAX);
+ // endregion
+
+ // region D类地址常量
+ // ================================================== D类地址常量 ==================================================
+ /**
+ * Ipv4 D类地址最小值字符串形式
+ */
+ String IPV4_D_STR_MIN = "224.0.0.0";
+ /**
+ * Ipv4 D类地址最小值数值形式
+ */
+ long IPV4_D_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_D_STR_MIN);
+
+ /**
+ * Ipv4 D类地址最大值字符串形式
+ */
+ String IPV4_D_STR_MAX = "239.255.255.255";
+ /**
+ * Ipv4 D类地址最大值数值形式
+ */
+ long IPV4_D_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_D_STR_MAX);
+
+ /**
+ * Ipv4 D类地址专用网段(用于广播)最小值字符串形式
+ */
+ String IPV4_D_DEDICATED_STR_MIN = "224.0.0.0";
+ /**
+ * Ipv4 D类地址专用网段(用于广播)最小值数值形式
+ */
+ long IPV4_D_DEDICATED_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_D_DEDICATED_STR_MIN);
+
+ /**
+ * Ipv4 D类地址专用网段(用于广播)最大值字符串形式
+ */
+ String IPV4_D_DEDICATED_STR_MAX = "224.0.0.255";
+ /**
+ * Ipv4 D类地址专用网段(用于广播)最大值数值形式
+ */
+ long IPV4_D_DEDICATED_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_D_DEDICATED_STR_MAX);
+
+ /**
+ * Ipv4 D类地址公用网段(用于组播)最小值字符串形式
+ */
+ String IPV4_D_PUBLIC_STR_MIN = "224.0.1.0";
+ /**
+ * Ipv4 D类地址公用网段(用于组播)最小值数值形式
+ */
+ long IPV4_D_PUBLIC_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_D_PUBLIC_STR_MIN);
+
+ /**
+ * Ipv4 D类地址公用网段(用于组播)最大值字符串形式
+ */
+ String IPV4_D_PUBLIC_STR_MAX = "238.255.255.255";
+ /**
+ * Ipv4 D类地址公用网段(用于组播)最大值数值形式
+ */
+ long IPV4_D_PUBLIC_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_D_PUBLIC_STR_MAX);
+
+ /**
+ * Ipv4 D类地址私用网段(用于测试)最小值字符串形式
+ */
+ String IPV4_D_PRIVATE_STR_MIN = "239.0.0.0";
+ /**
+ * Ipv4 D类地址私用网段(用于测试)最小值数值形式
+ */
+ long IPV4_D_PRIVATE_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_D_PRIVATE_STR_MIN);
+
+ /**
+ * Ipv4 D类地址私用网段(用于测试)最大值字符串形式
+ */
+ String IPV4_D_PRIVATE_STR_MAX = "239.255.255.255";
+ /**
+ * Ipv4 D类地址私用网段(用于测试)最大值数值形式
+ */
+ long IPV4_D_PRIVATE_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_D_PRIVATE_STR_MAX);
+ // endregion
+
+ // region E类地址常量
+ // ================================================== E类地址常量 ==================================================
+ /**
+ * Ipv4 E类地址最小值字符串形式
+ */
+ String IPV4_E_STR_MIN = "240.0.0.0";
+ /**
+ * Ipv4 E类地址最小值数值形式
+ */
+ long IPV4_E_NUM_MIN = Ipv4Util.ipv4ToLong(IPV4_E_STR_MIN);
+
+ /**
+ * Ipv4 E类地址最大值字符串形式
+ */
+ String IPV4_E_STR_MAX = "255.255.255.255";
+ /**
+ * Ipv4 E类地址最大值数值形式
+ */
+ long IPV4_E_NUM_MAX = Ipv4Util.ipv4ToLong(IPV4_E_STR_MAX);
+ // endregion
+}
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 6c8c89689..b600a24ec 100755
--- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java
@@ -1,64 +1,55 @@
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.regex.PatternPool;
-import cn.hutool.core.util.CharUtil;
import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.CharUtil;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.regex.Matcher;
/**
* IPV4地址工具类
*
- *
+ *
*
* @author ZhuKun
+ * @author emptypoint
+ * @author aoshiguchen
* @since 5.4.1
*/
-public class Ipv4Util {
+public class Ipv4Util implements Ipv4Pool {
/**
- * 本地IP：127.0.0.1
- */
- public static final String LOCAL_IP = "127.0.0.1";
-
- /**
- * IP段的分割符
- */
- public static final String IP_SPLIT_MARK = "-";
-
- /**
- * IP与掩码的分割符
- */
- public static final String IP_MASK_SPLIT_MARK = StrUtil.SLASH;
-
- /**
- * 最大掩码位
- */
- public static final int IP_MASK_MAX = 32;
-
- /**
- * 格式化IP段
+ * 根据 ip地址 和 掩码地址 获得 CIDR格式字符串
*
- * @param ip IP地址
- * @param mask 掩码
- * @return 返回xxx.xxx.xxx.xxx/mask的格式
+ * @param ip IP地址，点分十进制，如：xxx.xxx.xxx.xxx
+ * @param mask 掩码地址，点分十进制，如：255.255.255.0
+ * @return 返回 {@literal xxx.xxx.xxx.xxx/掩码位} 的格式，例如：192.168.1.101/24
*/
public static String formatIpBlock(final String ip, final String mask) {
return ip + IP_MASK_SPLIT_MARK + getMaskBitByMask(mask);
}
/**
- * 智能转换IP地址集合
+ * 智能获取指定区间内的所有IP地址
*
- * @param ipRange IP段，支持X.X.X.X-X.X.X.X或X.X.X.X/X
- * @param isAll true:全量地址，false:可用地址；仅在ipRange为X.X.X.X/X时才生效
- * @return IP集
+ * @param ipRange IP区间，支持 {@literal X.X.X.X-X.X.X.X} 或 {@literal X.X.X.X/X}
+ * @param isAll true:全量地址，false:可用地址；该参数仅在ipRange为X.X.X.X/X时才生效
+ * @return 区间内的所有IP地址，点分十进制格式
*/
public static List
+ * A类 1.0.0.0-9.255.255.255，11.0.0.0-126.255.255.255
+ * B类 128.0.0.0-172.15.255.255，172.32.0.0-191.255.255.255
+ * C类 192.0.0.0-192.167.255.255，192.169.0.0-223.255.255.255
+ *
+ *
+ * @param ipAddress IP地址，点分十进制
+ * @return 是否为公网IP
+ * @since 6.0.0
+ */
+ public static boolean isPublicIP(final String ipAddress) {
+ return isPublicIP(ipv4ToLong(ipAddress));
+ }
+
+ /**
+ * 是否为公网地址
+ *
+ * @param ipNum IP地址数值形式
+ * @return 是否为公网IP
+ * @see #isPublicIP(String)
+ * @since 6.0.0
+ */
+ public static boolean isPublicIP(final long ipNum) {
+ return isBetween(ipNum, IPV4_A_PUBLIC_1_NUM_MIN, IPV4_A_PUBLIC_1_NUM_MAX)
+ || isBetween(ipNum, IPV4_A_PUBLIC_2_NUM_MIN, IPV4_A_PUBLIC_2_NUM_MAX)
+ || isBetween(ipNum, IPV4_B_PUBLIC_1_NUM_MIN, IPV4_B_PUBLIC_1_NUM_MAX)
+ || isBetween(ipNum, IPV4_B_PUBLIC_2_NUM_MIN, IPV4_B_PUBLIC_2_NUM_MAX)
+ || isBetween(ipNum, IPV4_C_PUBLIC_1_NUM_MIN, IPV4_C_PUBLIC_1_NUM_MAX)
+ || isBetween(ipNum, IPV4_C_PUBLIC_2_NUM_MIN, IPV4_C_PUBLIC_2_NUM_MAX);
+ }
+
+ /**
+ * 获取ip(Long类型)指定部分的十进制值，即，{@literal X.X.X.X }形式中每个部分的值
+ *
+ *
+ *
+ * @param ip ip地址，Long类型
+ * @param position 指定位置，取值范围：[1,4]
+ * @return ip地址指定部分的十进制值
+ * @since 6.0.0
+ */
+ public static int getPartOfIp(final long ip, final int position) {
+ switch (position) {
+ case 1:
+ return (int) (ip >> 24) & 0xFF;
+ case 2:
+ return (int) (ip >> 16) & 0xFF;
+ case 3:
+ return (int) (ip >> 8) & 0xFF;
+ case 4:
+ return (int)ip & 0xFF;
+ default:
+ throw new IllegalArgumentException("Illegal position of ip Long: " + position);
+ }
+ }
//-------------------------------------------------------------------------------- Private method start
/**
- * 根据 ip/掩码位 计算IP段的终止IP（Long型）
- * 注：此接口返回负数，请使用转成字符串后再转Long型
- *
- * @param ip 给定的IP，如218.240.38.69
- * @param maskBit 给定的掩码位，如30
- * @return 终止IP的长整型表示
- */
- public static Long getEndIpLong(final String ip, final int maskBit) {
- return getBeginIpLong(ip, maskBit)
- + ~ipv4ToLong(getMaskByMaskBit(maskBit));
- }
-
- /**
- * 将匹配到的Ipv4地址的4个分组分别处理
+ * 将匹配到的Ipv4地址转为Long类型
*
* @param matcher 匹配到的Ipv4正则
- * @return ipv4对应long
+ * @return ip的long值
*/
private static long matchAddress(final Matcher matcher) {
- long addr = 0;
- for (int i = 1; i <= 4; ++i) {
- addr |= Long.parseLong(matcher.group(i)) << 8 * (4 - i);
+ int addr = 0;
+ // 每个点分十进制数字 转为 8位二进制
+ addr |= Integer.parseInt(matcher.group(1));
+ addr <<= 8;
+ addr |= Integer.parseInt(matcher.group(2));
+ addr <<= 8;
+ addr |= Integer.parseInt(matcher.group(3));
+ addr <<= 8;
+ addr |= Integer.parseInt(matcher.group(4));
+
+ // int的最高位无法直接使用，转为Long
+ if (addr < 0) {
+ return IPV4_NUM_MAX & addr;
}
return addr;
}
/**
- * 指定IP的long是否在指定范围内
+ * 指定IP是否在指定范围内
*
* @param userIp 用户IP
- * @param begin 开始IP
- * @param end 结束IP
+ * @param begin 开始IP，包含
+ * @param end 结束IP，包含
* @return 是否在范围内
*/
- private static boolean isInner(final long userIp, final long begin, final long end) {
+ private static boolean isBetween(final long userIp, final long begin, final long end) {
return (userIp >= begin) && (userIp <= end);
}
+
+ /**
+ * 校验 掩码位数，合法范围为：[{@link Ipv4Pool#IPV4_MASK_BIT_VALID_MIN}, {@link Ipv4Pool#IPV4_MASK_BIT_MAX}]，不合法则抛出异常
+ *
+ * @param maskBit 掩码位数
+ */
+ private static void assertMaskBitValid(final int maskBit) {
+ Assert.isTrue(isMaskBitValid(maskBit), "Invalid maskBit：{}", maskBit);
+ }
//-------------------------------------------------------------------------------- Private method end
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java b/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java
index 8e2cccc22..fcd96153b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java
@@ -1,8 +1,13 @@
package cn.hutool.core.net;
+import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.BiMap;
+
import java.util.HashMap;
+import static cn.hutool.core.net.Ipv4Pool.IPV4_MASK_BIT_MAX;
+import static cn.hutool.core.net.Ipv4Pool.IPV4_NUM_MAX;
+
/**
* 掩码位和掩码之间的Map对应
*
@@ -73,4 +78,15 @@ public class MaskBit {
return MASK_BIT_MAP.getKey(mask);
}
+ /**
+ * 根据掩码位获取掩码IP(Long型)
+ *
+ * @param maskBit 掩码位
+ * @return 掩码IP(Long型)
+ * @since 6.0.0
+ */
+ public static long getMaskIpLong(final int maskBit) {
+ Assert.isTrue(MASK_BIT_MAP.containsKey(maskBit), "非法的掩码位数：{}", maskBit);
+ return (IPV4_NUM_MAX << (IPV4_MASK_BIT_MAX - maskBit)) & IPV4_NUM_MAX;
+ }
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
index 97ffdc4d0..75c5dc584 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
@@ -1,7 +1,8 @@
package cn.hutool.core.net.multipart;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.text.StrUtil;
import java.io.BufferedOutputStream;
@@ -247,7 +248,7 @@ public class UploadFile {
return isAllow;
}
- final String fileNameExt = FileUtil.extName(this.getFileName());
+ final String fileNameExt = FileNameUtil.extName(this.getFileName());
for (final String fileExtension : setting.fileExts) {
if (fileNameExt.equalsIgnoreCase(fileExtension)) {
return isAllow;
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
index 88382709a..31bd3cc66 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
@@ -1,6 +1,6 @@
package cn.hutool.core.net.multipart;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.text.StrUtil;
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java
index fe62c62e5..4f8b72d9d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java
@@ -13,12 +13,13 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+
/**
* {@link SSLContext}构建器，可以自定义：
*
*
*
- * 继承{@link X509ExtendedTrustManager}的原因见：https://blog.csdn.net/ghaohao/article/details/79454913
+ * 新任所有信任管理器，默认信任所有客户端和服务端证书
+ * 继承{@link X509ExtendedTrustManager}的原因见：
+ * https://blog.csdn.net/ghaohao/article/details/79454913
*
* @author Looly
* @since 5.5.7
*/
-public class DefaultTrustManager extends X509ExtendedTrustManager {
+public class TrustAnyTrustManager extends X509ExtendedTrustManager {
/**
- * 默认的全局单例默认信任管理器，默认信任所有客户端和服务端证书
+ * 全局单例信任管理器，默认信任所有客户端和服务端证书
+ *
* @since 5.7.8
*/
- public static DefaultTrustManager INSTANCE = new DefaultTrustManager();
+ public static TrustAnyTrustManager INSTANCE = new TrustAnyTrustManager();
@Override
public X509Certificate[] getAcceptedIssuers() {
diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java
index 5c7de2ac7..e40212402 100644
--- a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java
@@ -4,7 +4,7 @@ import cn.hutool.core.bean.NullWrapperBean;
import cn.hutool.core.classloader.ClassLoaderUtil;
import cn.hutool.core.convert.BasicType;
import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.net.url.URLDecoder;
import cn.hutool.core.net.url.URLUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java b/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
index eae5f1bdb..5c284e18b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
@@ -12,6 +12,7 @@ import java.lang.reflect.Method;
* jdk8中如果直接调用{@link MethodHandles#lookup()}获取到的{@link MethodHandles.Lookup}在调用findSpecial和unreflectSpecial
* 时会出现权限不够问题，抛出"no private access for invokespecial"异常，因此针对JDK8及JDK9+分别封装lookup方法。
*
+ *
* replaceFun可以通过{@link Matcher}提取出匹配到的内容的不同部分，然后经过重新处理、组装变成新的内容放回原位。
- *
*
* replaceAll(this.content, "(\\d+)", parameters -> "-" + parameters.group(1) + "-")
* // 结果为："ZZZaaabbbccc中文-1234-"
@@ -921,7 +911,6 @@ public class ReUtil {
/**
* 替换所有正则匹配的文本，并使用自定义函数决定如何替换
* replaceFun可以通过{@link Matcher}提取出匹配到的内容的不同部分，然后经过重新处理、组装变成新的内容放回原位。
- *
*
* replaceAll(this.content, "(\\d+)", parameters -> "-" + parameters.group(1) + "-")
* // 结果为："ZZZaaabbbccc中文-1234-"
diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java b/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java
index 42604b5cb..a40b0375f 100755
--- a/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java
+++ b/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java
@@ -82,7 +82,7 @@ public interface RegexPool {
*
* @see 800
*/
- String TEL_400_800 = "0\\d{2,3}[\\- ]?[1-9]\\d{6,7}|[48]00[\\- ]?[1-9]\\d{6}";
+ String TEL_400_800 = "0\\d{2,3}[\\- ]?[1-9]\\d{6,7}|[48]00[\\- ]?[1-9]\\d{2}[\\- ]?\\d{4}";
/**
* 18位身份证号码
*/
diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
index e3659496c..af022870d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
@@ -1,12 +1,25 @@
package cn.hutool.core.stream;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Opt;
+import cn.hutool.core.math.NumberUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
-
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
import java.util.Objects;
+import java.util.OptionalDouble;
import java.util.Spliterator;
-import java.util.function.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -97,7 +110,7 @@ public class EasyStream{@code
+ * accept(t)
+ * return this;
+ * }
*/
default Builder
@@ -42,13 +42,13 @@ public class CharFinder extends TextFinder {
final int limit = getValidEndIndex();
if(negative){
for (int i = from; i > limit; i--) {
- if (NumberUtil.equals(c, text.charAt(i), caseInsensitive)) {
+ if (CharUtil.equals(c, text.charAt(i), caseInsensitive)) {
return i;
}
}
} else{
for (int i = from; i < limit; i++) {
- if (NumberUtil.equals(c, text.charAt(i), caseInsensitive)) {
+ if (CharUtil.equals(c, text.charAt(i), caseInsensitive)) {
return i;
}
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java b/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java
index e8646f27c..40f1e855f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java
@@ -16,9 +16,10 @@ public class LengthFinder extends TextFinder {
/**
* 构造
- * @param length 长度
+ * @param length 长度，必须大于0
*/
public LengthFinder(final int length) {
+ Assert.isTrue(length > 0, "Length must be great than 0");
this.length = length;
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java b/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java
index 6de946500..209058b6a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java
@@ -1,5 +1,7 @@
package cn.hutool.core.text.finder;
+import cn.hutool.core.regex.PatternPool;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -23,7 +25,7 @@ public class PatternFinder extends TextFinder {
* @param caseInsensitive 是否忽略大小写
*/
public PatternFinder(final String regex, final boolean caseInsensitive) {
- this(Pattern.compile(regex, caseInsensitive ? Pattern.CASE_INSENSITIVE : 0));
+ this(PatternPool.get(regex, caseInsensitive ? Pattern.CASE_INSENSITIVE : 0));
}
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
index b82bb0336..2c36dd4c4 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
@@ -125,7 +125,7 @@ public class SplitIter extends ComputeIter
- * 如果为空字符串或者null 则返回空集合
+ * 如果提供的字符串为{@code null}，则返回一个空的{@link ArrayList}
+ * 如果提供的字符串为""，则当ignoreEmpty时返回空的{@link ArrayList}，否则返回只有一个""元素的{@link ArrayList}
*
* @param text 被切分的字符串
* @param separator 分隔符字符串
@@ -310,8 +316,10 @@ public class SplitUtil {
* @since 3.2.1
*/
public static List
* 有时候在线程池内访问第三方接口，只希望固定并发数去访问，并且不希望丢弃任务时使用此策略，队列满的时候会处于阻塞状态(例如刷库的场景)
- *
+ *
* 1. 核心线程数与最大线程数为nThreads指定的大小
* 2. 默认使用LinkedBlockingQueue，默认队列大小为1024
- * 3. 如果isBlocked为{code true}，当执行拒绝策略的时候会处于阻塞状态，直到能添加到队列中或者被{@link Thread#interrupt()}中断
+ * 3. 如果isBlocked为{@code true}，当执行拒绝策略的时候会处于阻塞状态，直到能添加到队列中或者被{@link Thread#interrupt()}中断
*
*
* @param nThreads 线程池大小
@@ -159,7 +159,7 @@ public class ThreadUtil {
*
* 1. 核心线程数与最大线程数为nThreads指定的大小
* 2. 默认使用LinkedBlockingQueue
- * 3. 如果isBlocked为{code true}，当执行拒绝策略的时候会处于阻塞状态，直到能添加到队列中或者被{@link Thread#interrupt()}中断
+ * 3. 如果isBlocked为{@code true}，当执行拒绝策略的时候会处于阻塞状态，直到能添加到队列中或者被{@link Thread#interrupt()}中断
*
*
* @param nThreads 线程池大小
diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java
index aa0cf12df..38e9eb05f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java
+++ b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java
@@ -30,10 +30,13 @@ import java.util.function.Predicate;
* 也可以将已有的树转换为集合，例如：
* {@code final List
*
+ *
* 此方法会匹配单一对象，如果此对象为{@code null}则返回false
* 如果此对象为非数组，理解为此对象为数组的第一个元素，则返回true
- * 如果此对象为数组对象，数组长度大于0情况下返回true，否则返回false
+ * 如果此对象为数组对象，数组长度大于0的情况下返回true，否则返回false
*
* @param array 数组
* @return 是否为非空
@@ -596,15 +588,19 @@ public class ArrayUtil extends PrimitiveArrayUtil {
int length = 0;
for (final T[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
+
final T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length);
+ if (length == 0) {
+ return result;
+ }
length = 0;
for (final T[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -629,7 +625,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
* 包装 {@link System#arraycopy(Object, int, Object, int, int)}
* 数组复制，源数组和目标数组都是从位置0开始复制
*
- * @param
* 数组复制
*
- * @param
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @param
- * 当设置为0时，页码0表示第一页，开始位置为0
- * 当设置为1时，页码1表示第一页，开始位置为0
- *
- *
- * @param customFirstPageNo 自定义的首页页码，为0或者1
- */
- synchronized public static void setFirstPageNo(final int customFirstPageNo) {
- firstPageNo = customFirstPageNo;
- }
-
- /**
- * 设置首页页码为1
- *
- *
- * 当设置为1时，页码1表示第一页，开始位置为0
- *
- */
- public static void setOneAsFirstPageNo() {
- setFirstPageNo(1);
- }
-
- /**
- * 将页数和每页条目数转换为开始位置
- * 此方法用于不包括结束位置的分页方法
- * 例如：
- *
- *
- * 页码：0，每页10 =》 0
- * 页码：1，每页10 =》 10
- * ……
- *
- *
- *
- * 页码：1，每页10 =》 0
- * 页码：2，每页10 =》 10
- * ……
- *
- *
- * @param pageNo 页码（从0计数）
- * @param pageSize 每页条目数
- * @return 开始位置
- */
- public static int getStart(int pageNo, int pageSize) {
- if (pageNo < firstPageNo) {
- pageNo = firstPageNo;
- }
-
- if (pageSize < 1) {
- pageSize = 0;
- }
-
- return (pageNo - firstPageNo) * pageSize;
- }
-
- /**
- * 将页数和每页条目数转换为结束位置
- * 此方法用于不包括结束位置的分页方法
- * 例如：
- *
- *
- * 页码：0，每页10 =》 9
- * 页码：1，每页10 =》 19
- * ……
- *
- *
- *
- * 页码：1，每页10 =》 9
- * 页码：2，每页10 =》 19
- * ……
- *
- *
- * @param pageNo 页码（从0计数）
- * @param pageSize 每页条目数
- * @return 开始位置
- * @since 5.2.5
- */
- public static int getEnd(final int pageNo, final int pageSize) {
- final int start = getStart(pageNo, pageSize);
- return getEndByStart(start, pageSize);
- }
-
- /**
- * 将页数和每页条目数转换为开始位置和结束位置
- * 此方法用于包括结束位置的分页方法
- * 例如：
- *
- *
- * 页码：0，每页10 =》 [0, 10]
- * 页码：1，每页10 =》 [10, 20]
- * ……
- *
- *
- *
- * 页码：1，每页10 =》 [0, 10]
- * 页码：2，每页10 =》 [10, 20]
- * ……
- *
- *
- * @param pageNo 页码（从0计数）
- * @param pageSize 每页条目数
- * @return 第一个数为开始位置，第二个数为结束位置
- */
- public static int[] transToStartEnd(final int pageNo, final int pageSize) {
- final int start = getStart(pageNo, pageSize);
- return new int[]{start, getEndByStart(start, pageSize)};
- }
-
- /**
- * 将页数和每页条目数转换为开始位置和结束位置
- * 此方法用于包括结束位置的分页方法
- * 例如：
- *
- *
- * 页码：0，每页10 =》 [0, 10]
- * 页码：1，每页10 =》 [10, 20]
- * ……
- *
- *
- *
- * 页码：1，每页10 =》 [0, 10]
- * 页码：2，每页10 =》 [10, 20]
- * ……
- *
- *
- * @param pageNo 页码（从0计数）
- * @param pageSize 每页条目数
- * @return {@link Segment}
- * @since 5.5.3
- */
- public static Segment
- * 来自：https://github.com/iceroot/iceroot/blob/master/src/main/java/com/icexxx/util/IceUtil.java
- * 通过传入的信息，生成一个分页列表显示
- *
- * @param pageNo 当前页
- * @param totalPage 总页数
- * @param displayCount 每屏展示的页数
- * @return 分页条
- */
- public static int[] rainbow(final int pageNo, final int totalPage, final int displayCount) {
- // displayCount % 2
- final boolean isEven = (displayCount & 1) == 0;
- final int left = displayCount >> 1;
- int right = displayCount >> 1;
-
- int length = displayCount;
- if (isEven) {
- right++;
- }
- if (totalPage < displayCount) {
- length = totalPage;
- }
- final int[] result = new int[length];
- if (totalPage >= displayCount) {
- if (pageNo <= left) {
- for (int i = 0; i < result.length; i++) {
- result[i] = i + 1;
- }
- } else if (pageNo > totalPage - right) {
- for (int i = 0; i < result.length; i++) {
- result[i] = i + totalPage - displayCount + 1;
- }
- } else {
- for (int i = 0; i < result.length; i++) {
- result[i] = i + pageNo - left + (isEven ? 1 : 0);
- }
- }
- } else {
- for (int i = 0; i < result.length; i++) {
- result[i] = i + 1;
- }
- }
- return result;
-
- }
-
- /**
- * 分页彩虹算法(默认展示10页)
- * 来自：https://github.com/iceroot/iceroot/blob/master/src/main/java/com/icexxx/util/IceUtil.java
- *
- * @param currentPage 当前页
- * @param pageCount 总页数
- * @return 分页条
- */
- public static int[] rainbow(final int currentPage, final int pageCount) {
- return rainbow(currentPage, pageCount, 10);
- }
-
- //------------------------------------------------------------------------- Private method start
-
- /**
- * 根据起始位置获取结束位置
- *
- * @param start 起始位置
- * @param pageSize 每页条目数
- * @return 结束位置
- */
- private static int getEndByStart(final int start, int pageSize) {
- if (pageSize < 1) {
- pageSize = 0;
- }
- return start + pageSize;
- }
-
- //------------------------------------------------------------------------- Private method end
-}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
index 6e6fa42a2..32dce00d9 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
@@ -18,8 +18,7 @@ public class PrimitiveArrayUtil {
*/
public static final int INDEX_NOT_FOUND = -1;
- // ---------------------------------------------------------------------- isEmpty
-
+ // region ----- isEmpty
/**
* 数组是否为空
*
@@ -99,8 +98,9 @@ public class PrimitiveArrayUtil {
public static boolean isEmpty(final boolean[] array) {
return array == null || array.length == 0;
}
+ // endregion
- // ---------------------------------------------------------------------- isNotEmpty
+ // region ----- isNotEmpty
/**
* 数组是否为非空
@@ -181,8 +181,9 @@ public class PrimitiveArrayUtil {
public static boolean isNotEmpty(final boolean[] array) {
return false == isEmpty(array);
}
+ // endregion
- // ---------------------------------------------------------------------- resize
+ // region ----- resize
/**
* 生成一个新的重新设置大小的数组
@@ -203,8 +204,9 @@ public class PrimitiveArrayUtil {
}
return newArray;
}
+ // endregion
- // ---------------------------------------------------------------------- addAll
+ // region ----- addAll
/**
* 将多个数组合并在一起
@@ -222,7 +224,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final byte[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -230,7 +232,7 @@ public class PrimitiveArrayUtil {
final byte[] result = new byte[length];
length = 0;
for (final byte[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -254,7 +256,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final int[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -262,7 +264,7 @@ public class PrimitiveArrayUtil {
final int[] result = new int[length];
length = 0;
for (final int[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -286,7 +288,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final long[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -294,7 +296,7 @@ public class PrimitiveArrayUtil {
final long[] result = new long[length];
length = 0;
for (final long[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -318,7 +320,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final double[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -326,7 +328,7 @@ public class PrimitiveArrayUtil {
final double[] result = new double[length];
length = 0;
for (final double[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -350,7 +352,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final float[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -358,7 +360,7 @@ public class PrimitiveArrayUtil {
final float[] result = new float[length];
length = 0;
for (final float[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -382,7 +384,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final char[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -390,7 +392,7 @@ public class PrimitiveArrayUtil {
final char[] result = new char[length];
length = 0;
for (final char[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -414,7 +416,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final boolean[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -422,7 +424,7 @@ public class PrimitiveArrayUtil {
final boolean[] result = new boolean[length];
length = 0;
for (final boolean[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -446,7 +448,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (final short[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -454,15 +456,16 @@ public class PrimitiveArrayUtil {
final short[] result = new short[length];
length = 0;
for (final short[] array : arrays) {
- if (null != array) {
+ if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
}
return result;
}
+ // endregion
- // ---------------------------------------------------------------------- split
+ // region ----- split
/**
* 拆分byte数组为几个等份（最后一份按照剩余长度分配空间）
@@ -472,7 +475,7 @@ public class PrimitiveArrayUtil {
* @return 拆分后的数组
*/
public static byte[][] split(final byte[] array, final int len) {
- int amount = array.length / len;
+ final int amount = array.length / len;
final int remainder = array.length % len;
// 兼容切片长度大于原数组长度的情况
final boolean hasRemainder = remainder > 0;
@@ -493,8 +496,9 @@ public class PrimitiveArrayUtil {
}
return arrays;
}
+ // endregion
- // ---------------------------------------------------------------------- indexOf、LastIndexOf、contains
+ // region ----- indexOf、LastIndexOf、contains
/**
* 返回数组中指定元素所在位置，未找到返回{@link #INDEX_NOT_FOUND}
@@ -505,7 +509,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final long[] array, final long value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -524,7 +528,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final long[] array, final long value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -555,7 +559,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final int[] array, final int value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -574,7 +578,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final int[] array, final int value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -605,7 +609,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final short[] array, final short value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -624,7 +628,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final short[] array, final short value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -655,7 +659,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final char[] array, final char value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -674,7 +678,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final char[] array, final char value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -705,7 +709,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final byte[] array, final byte value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -724,7 +728,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final byte[] array, final byte value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -755,7 +759,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final double[] array, final double value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -774,7 +778,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final double[] array, final double value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -805,7 +809,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final float[] array, final float value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -824,7 +828,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final float[] array, final float value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -855,7 +859,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(final boolean[] array, final boolean value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -874,7 +878,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(final boolean[] array, final boolean value) {
- if (null != array) {
+ if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -895,8 +899,9 @@ public class PrimitiveArrayUtil {
public static boolean contains(final boolean[] array, final boolean value) {
return indexOf(array, value) > INDEX_NOT_FOUND;
}
+ // endregion
- // ------------------------------------------------------------------- Wrap and unwrap
+ // region ----- Wrap and unwrap
/**
* 将原始类型数组包装为包装类型
@@ -1250,8 +1255,9 @@ public class PrimitiveArrayUtil {
}
return array;
}
+ // endregion
- // ------------------------------------------------------------------- sub
+ // region ----- sub
/**
* 获取子数组
@@ -1548,8 +1554,9 @@ public class PrimitiveArrayUtil {
}
return Arrays.copyOfRange(array, start, end);
}
+ // endregion
- // ------------------------------------------------------------------- remove
+ // region ----- remove
/**
* 移除数组中对应位置的元素
@@ -1693,7 +1700,7 @@ public class PrimitiveArrayUtil {
return result;
}
- // ---------------------------------------------------------------------- removeEle
+ // region ----- removeEle
/**
* 移除数组中指定的元素
@@ -1814,8 +1821,9 @@ public class PrimitiveArrayUtil {
public static boolean[] removeEle(final boolean[] array, final boolean element) throws IllegalArgumentException {
return remove(array, indexOf(array, element));
}
+ // endregion
- // ---------------------------------------------------------------------- reverse
+ // region ----- reverse
/**
* 反转数组，会变更原数组
@@ -2088,8 +2096,9 @@ public class PrimitiveArrayUtil {
public static boolean[] reverse(final boolean[] array) {
return reverse(array, 0, array.length);
}
+ // endregion
- // ------------------------------------------------------------------------------------------------------------ min and max
+ // region ------------------------------------------- min and max
/**
* 取最小值
@@ -2370,8 +2379,9 @@ public class PrimitiveArrayUtil {
}
return max;
}
+ // endregion
- // ---------------------------------------------------------------------- shuffle
+ // region ----- shuffle
/**
* 打乱数组顺序，会变更原数组
@@ -2636,8 +2646,9 @@ public class PrimitiveArrayUtil {
return array;
}
+ // endregion
- // ---------------------------------------------------------------------- swap
+ // region ----- swap
/**
* 交换数组中两个位置的值
@@ -2791,7 +2802,7 @@ public class PrimitiveArrayUtil {
return array;
}
- // ---------------------------------------------------------------------- asc and desc
+ // region ----- asc and desc
/**
* 检查数组是否升序，即{@code array[i] <= array[i+1]}
@@ -3111,7 +3122,257 @@ public class PrimitiveArrayUtil {
return false;
}
}
-
return true;
}
+ // endregion
+
+ // region ----- startWith
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final boolean[] array, final boolean[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final byte[] array, final byte[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final char[] array, final char[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final double[] array, final double[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final float[] array, final float[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final int[] array, final int[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final long[] array, final long[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * array数组是否以prefix开头
+ *
+ *
+ *
+ * @param array 数组
+ * @param prefix 前缀
+ * @return 是否开头
+ */
+ public static boolean startWith(final short[] array, final short[] prefix) {
+ if (array == prefix) {
+ return true;
+ }
+ if(isEmpty(array)){
+ return isEmpty(prefix);
+ }
+ if (prefix.length > array.length) {
+ return false;
+ }
+
+ for (int i = 0; i < prefix.length; i++) {
+ if (array[i] != prefix[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+ // endregion
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
index 42d56fb77..ffab70fcf 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
@@ -1,9 +1,10 @@
package cn.hutool.core.util;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert;
@@ -181,7 +182,8 @@ public class XmlUtil {
* @return XML文档对象
* @since 3.0.9
*/
- public static Document readXML(final String pathOrContent) {
+ public static Document readXML(String pathOrContent) {
+ pathOrContent = StrUtil.trim(pathOrContent);
if (StrUtil.startWith(pathOrContent, '<')) {
return parseXml(pathOrContent);
}
@@ -985,10 +987,10 @@ public class XmlUtil {
public static