From 06e091fc4a223aa99b4505f48fc4fedfdc1b39ff Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 23 Apr 2023 22:40:36 +0800 Subject: [PATCH] fix code --- .../dromara/hutool/core/array/ArrayUtil.java | 16 +-- .../hutool/core/array/ArrayWrapper.java | 111 +++++++++++------- .../dromara/hutool/core/bean/BeanPath.java | 2 +- .../dromara/hutool/core/codec/HexUtil.java | 2 +- .../org/dromara/hutool/core/codec/Morse.java | 2 +- .../hutool/core/codec/PercentCodec.java | 2 +- .../dromara/hutool/core/codec/PunyCode.java | 2 +- .../dromara/hutool/core/compress/ZipUtil.java | 2 +- .../core/convert/AbstractConverter.java | 2 +- .../dromara/hutool/core/convert/Convert.java | 2 +- .../core/convert/impl/EntryConverter.java | 2 +- .../core/{util => data}/IdcardUtil.java | 3 +- .../dromara/hutool/core/data/MaskingUtil.java | 2 +- .../hutool/core/{lang => data}/id/IdUtil.java | 2 +- .../hutool/core/{lang => data}/id/NanoId.java | 2 +- .../core/{lang => data}/id/ObjectId.java | 2 +- .../hutool/core/{lang => data}/id/Pid.java | 2 +- .../core/{lang => data}/id/Snowflake.java | 2 +- .../hutool/core/{lang => data}/id/UUID.java | 2 +- .../core/{lang => data}/id/package-info.java | 2 +- .../hutool/core/data/package-info.java | 2 +- .../date/format/parser/ISO8601DateParser.java | 2 +- .../date/format/parser/NormalDateParser.java | 2 +- .../hutool/core/exception/ExceptionUtil.java | 2 +- .../dromara/hutool/core/io/LineReader.java | 2 +- .../hutool/core/io/buffer/BufferUtil.java | 2 +- .../hutool/core/io/file/FileNameUtil.java | 2 +- .../dromara/hutool/core/io/file/FileUtil.java | 2 +- .../dromara/hutool/core/io/file/Tailer.java | 2 +- .../hutool/core/io/watch/WatchMonitor.java | 2 +- .../org/dromara/hutool/core/lang/Console.java | 2 +- .../hutool/core/lang/ConsoleTable.java | 2 +- .../dromara/hutool/core/lang/EnumItem.java | 10 ++ .../dromara/hutool/core/lang/Validator.java | 2 +- .../lang/generator/ObjectIdGenerator.java | 2 +- .../lang/generator/SnowflakeGenerator.java | 2 +- .../core/lang/generator/UUIDGenerator.java | 2 +- .../hutool/core/lang/package-info.java | 16 ++- .../hutool/core/lang/page/PageInfo.java | 4 +- .../hutool/core/lang/range/BoundedRange.java | 3 +- .../core/lang/{ => range}/DefaultSegment.java | 2 +- .../hutool/core/lang/{ => range}/Segment.java | 3 +- .../hutool/core/math/NumberValidator.java | 2 +- .../org/dromara/hutool/core/net/Ipv4Util.java | 2 +- .../org/dromara/hutool/core/net/NetUtil.java | 2 +- .../hutool/core/net/url/URLDecoder.java | 2 +- .../hutool/core/net/url/URLEncoder.java | 2 +- .../dromara/hutool/core/net/url/UrlPath.java | 2 +- .../hutool/core/reflect/ClassDescUtil.java | 2 +- .../hutool/core/reflect/ClassScanner.java | 2 +- .../hutool/core/reflect/ClassUtil.java | 2 +- .../hutool/core/text/CharSequenceUtil.java | 1 - .../hutool/core/{util => text}/CharUtil.java | 5 +- .../dromara/hutool/core/text/NamingCase.java | 2 - .../dromara/hutool/core/text/StrTrimer.java | 2 - .../hutool/core/text/StrValidator.java | 1 - .../dromara/hutool/core/text/UnicodeUtil.java | 1 - .../hutool/core/text/dfa/FoundWord.java | 2 +- .../text/escape/NumericEntityUnescaper.java | 2 +- .../hutool/core/text/finder/CharFinder.java | 2 +- .../text/placeholder/PlaceholderParser.java | 2 +- .../hutool/core/text/split/SplitUtil.java | 2 +- .../org/dromara/hutool/core/tree/MapTree.java | 2 +- .../dromara/hutool/core/util/RuntimeUtil.java | 3 +- .../core/{util => array}/ArrayUtilTest.java | 35 ++++-- .../hutool/core/array/ArrayWrapperTest.java | 4 +- .../core/{util => data}/IdcardUtilTest.java | 14 ++- .../dromara/hutool/core/lang/NanoIdTest.java | 2 +- .../hutool/core/lang/ObjectIdTest.java | 2 +- .../hutool/core/lang/SnowflakeTest.java | 4 +- .../dromara/hutool/core/lang/UUIDTest.java | 2 +- .../hutool/core/lang/ValidatorTest.java | 2 +- .../core/{util => text}/CharUtilTest.java | 14 ++- .../hutool/core/text/NamingCaseTest.java | 1 - .../dromara/hutool/core/text/StrUtilTest.java | 1 - .../hutool/core/util/BooleanUtilTest.java | 12 ++ .../hutool/core/util/ByteUtilTest.java | 12 ++ .../hutool/core/util/ClassUtilTest.java | 12 ++ .../dromara/hutool/core/util/CloneTest.java | 12 ++ .../hutool/core/util/DefaultCloneTest.java | 12 ++ .../hutool/core/util/EnumUtilTest.java | 13 ++ .../hutool/core/util/HashUtilTest.java | 13 ++ .../dromara/hutool/core/util/HexUtilTest.java | 13 ++ .../dromara/hutool/core/util/IdUtilTest.java | 16 ++- .../hutool/core/util/JNDIUtilTest.java | 13 ++ .../dromara/hutool/core/util/JdkUtilTest.java | 13 ++ .../hutool/core/util/ModifierUtilTest.java | 12 ++ .../hutool/core/util/NumberUtilTest.java | 12 ++ .../dromara/hutool/core/util/ObjUtilTest.java | 13 ++ .../hutool/core/util/RandomUtilTest.java | 13 ++ .../dromara/hutool/core/util/ReUtilTest.java | 12 ++ .../hutool/core/util/ReferenceUtilTest.java | 13 ++ .../hutool/core/util/RuntimeUtilTest.java | 13 ++ .../hutool/core/util/TypeUtilTest.java | 12 ++ .../dromara/hutool/core/util/XmlUtilTest.java | 13 ++ .../dromara/hutool/core/util/ZipUtilTest.java | 14 +++ .../org/dromara/hutool/cron/Scheduler.java | 4 +- .../dromara/hutool/cron/TaskTableTest.java | 2 +- .../org/dromara/hutool/cron/demo/TestJob.java | 2 +- .../org/dromara/hutool/crypto/KeyUtil.java | 2 +- .../main/java/org/dromara/hutool/db/Page.java | 2 +- .../org/dromara/hutool/db/sql/Condition.java | 2 +- .../hutool/db/sql/ConditionBuilder.java | 2 +- .../dromara/hutool/extra/ftp/AbstractFtp.java | 2 +- .../dromara/hutool/extra/mail/MailUtil.java | 2 +- .../template/engine/enjoy/EnjoyEngine.java | 2 +- .../dromara/hutool/http/html/HTMLFilter.java | 2 +- .../dromara/hutool/json/InternalJSONUtil.java | 2 +- .../org/dromara/hutool/json/JSONParser.java | 2 +- .../dromara/hutool/json/JSONStrFormatter.java | 2 +- .../hutool/json/writer/JSONWriter.java | 2 +- .../hutool/json/xml/JSONXMLSerializer.java | 2 +- .../dromara/hutool/json/xml/JSONXMLUtil.java | 2 +- .../org/dromara/hutool/poi/csv/CsvConfig.java | 2 +- .../org/dromara/hutool/poi/csv/CsvParser.java | 2 +- .../hutool/poi/csv/CsvWriteConfig.java | 2 +- .../org/dromara/hutool/poi/csv/CsvWriter.java | 2 +- .../dromara/hutool/poi/excel/ExcelWriter.java | 2 +- .../excel/cell/values/NumericCellValue.java | 2 +- .../hutool/poi/excel/sax/ExcelSaxUtil.java | 2 +- .../hutool/poi/excel/ExcelWriteTest.java | 2 +- .../org/dromara/hutool/setting/Setting.java | 2 +- .../dromara/hutool/setting/SettingLoader.java | 2 +- .../hutool/setting/toml/TomlReader.java | 3 +- .../hutool/setting/toml/TomlWriter.java | 2 +- .../dromara/hutool/setting/PropsUtilTest.java | 22 ---- .../hutool/setting/{ => props}/PropsTest.java | 17 ++- .../hutool/setting/props/PropsUtilTest.java | 34 ++++++ .../setting/{ => toml}/Issue3008Test.java | 14 ++- .../captcha/generator/MathGenerator.java | 2 +- 130 files changed, 575 insertions(+), 203 deletions(-) rename hutool-core/src/main/java/org/dromara/hutool/core/{util => data}/IdcardUtil.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/IdUtil.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/NanoId.java (98%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/ObjectId.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/Pid.java (97%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/Snowflake.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/UUID.java (99%) rename hutool-core/src/main/java/org/dromara/hutool/core/{lang => data}/id/package-info.java (93%) rename hutool-core/src/main/java/org/dromara/hutool/core/lang/{ => range}/DefaultSegment.java (96%) rename hutool-core/src/main/java/org/dromara/hutool/core/lang/{ => range}/Segment.java (94%) rename hutool-core/src/main/java/org/dromara/hutool/core/{util => text}/CharUtil.java (98%) rename hutool-core/src/test/java/org/dromara/hutool/core/{util => array}/ArrayUtilTest.java (95%) rename hutool-core/src/test/java/org/dromara/hutool/core/{util => data}/IdcardUtilTest.java (88%) rename hutool-core/src/test/java/org/dromara/hutool/core/{util => text}/CharUtilTest.java (75%) delete mode 100644 hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java rename hutool-setting/src/test/java/org/dromara/hutool/setting/{ => props}/PropsTest.java (86%) create mode 100644 hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java rename hutool-setting/src/test/java/org/dromara/hutool/setting/{ => toml}/Issue3008Test.java (54%) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java index cc93affa9..a3f973e71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java @@ -356,7 +356,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { /** * 返回数组中第一个匹配规则的值的位置 * - * @param 数组元素类型 + * @param 数组元素类型 * @param matcher 匹配接口，实现此接口自定义匹配规则 * @param beginIndexInclude 检索开始的位置，不能为负数 * @param array 数组 @@ -364,11 +364,12 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @since 5.7.3 */ @SuppressWarnings("unchecked") - public static int matchIndex(final int beginIndexInclude, final Predicate matcher, final T... array) { + public static int matchIndex(final int beginIndexInclude, final Predicate matcher, final E... array) { if (isEmpty(array)) { return INDEX_NOT_FOUND; } - return ArrayWrapper.of(array).matchIndex(beginIndexInclude, matcher); + final ArrayWrapper arrayWrapper = ArrayWrapper.of(array); + return arrayWrapper.matchIndex(beginIndexInclude, matcher); } /** @@ -590,7 +591,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @return 新数组或原有数组 * @since 5.7.23 */ - public static A replace(final A array, final int index, final Object values) { + public static A replace(final A array, final int index, final A values) { if (isEmpty(array)) { return ofArray(values, null == array ? null : array.getClass().getComponentType()); } @@ -1174,14 +1175,15 @@ public class ArrayUtil extends PrimitiveArrayUtil { * 获取数组对象中指定index的值，支持负数，例如-1表示倒数第一个值
* 如果数组下标越界，返回null * - * @param 数组元素类型 + * @param 数组元素类型 * @param array 数组对象 * @param index 下标，支持负数 * @return 值 * @since 4.0.6 */ - public static T get(final Object array, final int index) { - return ArrayWrapper.of(array).get(index); + @SuppressWarnings("unchecked") + public static E get(final Object array, final int index) { + return (E) ArrayWrapper.of(array).get(index); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java index 3e43521f7..f069d5507 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java @@ -1,5 +1,6 @@ package org.dromara.hutool.core.array; +import org.dromara.hutool.core.collection.iter.ArrayIter; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.func.Wrapper; @@ -8,6 +9,7 @@ import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Array; import java.util.Arrays; import java.util.Comparator; +import java.util.Iterator; import java.util.function.Predicate; import java.util.function.UnaryOperator; @@ -15,12 +17,13 @@ import java.util.function.UnaryOperator; * 数组包装，提供一系列数组方法 * * @param 数组类型 + * @param 数组元素类型 * @author looly * @since 6.0.0 */ -public class ArrayWrapper implements Wrapper { +public class ArrayWrapper implements Wrapper, Iterable { - private final Class componentType; + private final Class componentType; private A array; private int length; @@ -33,8 +36,8 @@ public class ArrayWrapper implements Wrapper { * @return ArrayWrapper */ @SuppressWarnings("unchecked") - public static ArrayWrapper of(final Class componentType, final int length) { - return (ArrayWrapper) of(Array.newInstance(componentType, length)); + public static ArrayWrapper of(final Class componentType, final int length) { + return (ArrayWrapper) of(Array.newInstance(componentType, length)); } /** @@ -42,9 +45,10 @@ public class ArrayWrapper implements Wrapper { * * @param array 数组（非空） * @param 数组类型 + * @param 元素类型 * @return ArrayWrapper */ - public static ArrayWrapper of(final A array) { + public static ArrayWrapper of(final A array) { return new ArrayWrapper<>(array); } @@ -53,12 +57,13 @@ public class ArrayWrapper implements Wrapper { * * @param array 数组对象（非空） */ + @SuppressWarnings("unchecked") public ArrayWrapper(final A array) { Assert.notNull(array, "Array must be not null!"); if (!ArrayUtil.isArray(array)) { throw new IllegalArgumentException("Object is not a array!"); } - this.componentType = array.getClass().getComponentType(); + this.componentType = (Class) array.getClass().getComponentType(); setNewArray(array); } @@ -124,12 +129,11 @@ public class ArrayWrapper implements Wrapper { * 获取数组对象中指定index的值，支持负数，例如-1表示倒数第一个值
* 如果数组下标越界，返回null * - * @param 数组元素类型 * @param index 下标，支持负数，-1表示最后一个元素 * @return 值 */ @SuppressWarnings("unchecked") - public E get(int index) { + public E get(int index) { final int length = this.length; if (index < 0) { index += length; @@ -145,21 +149,19 @@ public class ArrayWrapper implements Wrapper { /** * 返回数组中第一个非空元素 * - * @param 数组元素类型 * @return 第一个非空元素，如果 不存在非空元素 或 数组为空，返回{@code null} */ - public E firstNonNull() { + public E firstNonNull() { return firstMatch(ObjUtil::isNotNull); } /** * 返回数组中第一个匹配规则的值 * - * @param 元素类型 * @param matcher 匹配接口，实现此接口自定义匹配规则 * @return 第一个匹配元素，如果 不存在匹配元素 或 数组为空，返回 {@code null} */ - public E firstMatch(final Predicate matcher) { + public E firstMatch(final Predicate matcher) { final int index = matchIndex(matcher); if (index == ArrayUtil.INDEX_NOT_FOUND) { return null; @@ -184,7 +186,7 @@ public class ArrayWrapper implements Wrapper { * @param matcher 匹配接口，实现此接口自定义匹配规则 * @return 第一个匹配元素的位置，{@link ArrayUtil#INDEX_NOT_FOUND}表示未匹配到 */ - public int matchIndex(final Predicate matcher) { + public int matchIndex(final Predicate matcher) { return matchIndex(0, matcher); } @@ -206,7 +208,7 @@ public class ArrayWrapper implements Wrapper { * @param offset 检索开始的位置，不能为负数 * @return 第一个匹配元素的位置，{@link ArrayUtil#INDEX_NOT_FOUND}表示未匹配到 */ - public int matchIndex(final int offset, final Predicate matcher) { + public int matchIndex(final int offset, final Predicate matcher) { if (null == matcher && offset < this.length) { return offset; } @@ -238,7 +240,7 @@ public class ArrayWrapper implements Wrapper { * @param matcher 匹配接口，实现此接口自定义匹配规则 * @return 最后一个匹配元素的位置，{@link ArrayUtil#INDEX_NOT_FOUND}表示未匹配到 */ - public int matchLastIndex(final Predicate matcher) { + public int matchLastIndex(final Predicate matcher) { return matchLastIndex(length - 1, matcher); } @@ -249,7 +251,7 @@ public class ArrayWrapper implements Wrapper { * @param offset 从后向前查找时的起始位置，一般为{@code array.length - 1} * @return 最后一个匹配元素的位置，{@link ArrayUtil#INDEX_NOT_FOUND}表示未匹配到 */ - public int matchLastIndex(final int offset, final Predicate matcher) { + public int matchLastIndex(final int offset, final Predicate matcher) { if (null == matcher && offset >= 0) { return offset; } @@ -270,7 +272,7 @@ public class ArrayWrapper implements Wrapper { * @param value 新元素或新数组 * @return this */ - public ArrayWrapper setOrAppend(final int index, final Object value) { + public ArrayWrapper setOrAppend(final int index, final E value) { if (index < this.length) { Array.set(array, index, value); } else { @@ -284,11 +286,34 @@ public class ArrayWrapper implements Wrapper { * 将新元素添加到已有数组中
* 添加新元素会生成一个新的数组，不影响原数组 * - * @param newElements 新元素或新数组 + * @param element 新元素或新数组 * @return 新数组 */ - public ArrayWrapper append(final Object newElements) { - return insert(this.length, newElements); + public ArrayWrapper append(final E element) { + return insert(this.length, element); + } + + /** + * 将新数组追加到已有数组中
+ * 追加新数组会生成一个新的数组，不影响原数组 + * + * @param array 需要追加的数组数组 + * @return 新数组 + */ + public ArrayWrapper appendArray(final A array) { + return insertArray(this.length, array); + } + + /** + * 将新元素插入到已有数组中的某个位置 + * 如果插入位置为负数，从原数组从后向前计数，若大于原数组长度，则空白处用默认值填充
+ * + * @param index 插入位置，支持负数。此位置为对应此位置元素之前的空档 + * @param element 元素 + * @return 新数组 + */ + public ArrayWrapper insert(final int index, final E element) { + return insertArray(index, createSingleElementArray(element)); } /** @@ -296,22 +321,17 @@ public class ArrayWrapper implements Wrapper { * 如果插入位置为负数，从原数组从后向前计数，若大于原数组长度，则空白处用默认值填充
* * @param index 插入位置，支持负数。此位置为对应此位置元素之前的空档 - * @param arrayToAppend 新元素 + * @param arrayToInsert 新元素数组 * @return 新数组 */ @SuppressWarnings({"unchecked", "SuspiciousSystemArraycopy"}) - public ArrayWrapper insert(int index, Object arrayToAppend) { - if (!ArrayUtil.isArray(arrayToAppend)) { - // 用户传入单个元素则创建单元素数组 - arrayToAppend = createSingleElementArray(arrayToAppend); - } - - final int appendLength = ArrayUtil.length(arrayToAppend); + public ArrayWrapper insertArray(int index, A arrayToInsert) { + final int appendLength = ArrayUtil.length(arrayToInsert); if (0 == appendLength) { return this; } if (isEmpty()) { - setNewArray((A) Convert.convert(array.getClass(), arrayToAppend)); + setNewArray((A) Convert.convert(array.getClass(), arrayToInsert)); return this; } @@ -323,14 +343,14 @@ public class ArrayWrapper implements Wrapper { // 已有数组的元素类型 // 如果 已有数组的元素类型是 原始类型，则需要转换 新元素数组 为该类型，避免ArrayStoreException if (this.componentType.isPrimitive()) { - arrayToAppend = Convert.convert(array.getClass(), arrayToAppend); + arrayToInsert = (A) Convert.convert(array.getClass(), arrayToInsert); } final A result = (A) Array.newInstance(this.componentType, Math.max(len, index) + appendLength); // 原数组到index位置 System.arraycopy(array, 0, result, 0, Math.min(len, index)); // 新增的数组追加 - System.arraycopy(arrayToAppend, 0, result, index, appendLength); + System.arraycopy(arrayToInsert, 0, result, index, appendLength); if (index < len) { // 原数组剩余部分 System.arraycopy(array, index, result, index + appendLength, len - index); @@ -350,16 +370,11 @@ public class ArrayWrapper implements Wrapper { * * * @param index 位置 - * @param values 新值 + * @param values 新值或新数组 * @return this */ @SuppressWarnings({"unchecked", "SuspiciousSystemArraycopy"}) - public ArrayWrapper replace(final int index, Object values) { - if (!ArrayUtil.isArray(values)) { - // 用户传入单个元素则创建单元素数组 - values = createSingleElementArray(values); - } - + public ArrayWrapper replace(final int index, final A values) { final int valuesLength = ArrayUtil.length(values); if (0 == valuesLength) { return this; @@ -369,11 +384,11 @@ public class ArrayWrapper implements Wrapper { } if (index < 0) { // 从头部追加 - return insert(0, values); + return insertArray(0, values); } if (index >= length) { // 超出长度，尾部追加 - return append(values); + return appendArray(values); } // 在原数组范围内 @@ -397,7 +412,7 @@ public class ArrayWrapper implements Wrapper { * @param editor 编辑器接口，为 {@code null}则返回原数组 * @return this */ - public ArrayWrapper edit(final UnaryOperator editor) { + public ArrayWrapper edit(final UnaryOperator editor) { if (null == array || null == editor) { return this; } @@ -495,7 +510,7 @@ public class ArrayWrapper implements Wrapper { * @throws NullPointerException 如果数组元素含有null值 * @since 6.0.0 */ - public boolean isSorted(final Comparator comparator) { + public boolean isSorted(final Comparator comparator) { if (isEmpty()) { return false; } @@ -528,7 +543,7 @@ public class ArrayWrapper implements Wrapper { * @param isDESC 是否反序 * @return 是否有序 */ - public boolean isSorted(final Comparator comparator, final boolean isDESC) { + public boolean isSorted(final Comparator comparator, final boolean isDESC) { if (null == comparator) { return false; } @@ -546,6 +561,11 @@ public class ArrayWrapper implements Wrapper { return true; } + @Override + public Iterator iterator() { + return new ArrayIter<>(this.array); + } + @Override public String toString() { final A array = this.array; @@ -599,9 +619,10 @@ public class ArrayWrapper implements Wrapper { * @param value 元素值 * @return 数组 */ - private Object createSingleElementArray(final Object value) { + @SuppressWarnings("unchecked") + private A createSingleElementArray(final E value) { // 插入单个元素 - final Object newInstance = Array.newInstance(this.componentType, 1); + final A newInstance = (A) Array.newInstance(this.componentType, 1); Array.set(newInstance, 0, value); return newInstance; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java index ac61c6de3..06e3ce33b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java @@ -20,7 +20,7 @@ import org.dromara.hutool.core.math.NumberUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.Serializable; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java index e5a9b58a7..1e6409173 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.codec.binary.Base16Codec; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.awt.Color; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java index 2c6dd466f..a6fb18aba 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java @@ -15,7 +15,7 @@ package org.dromara.hutool.core.codec; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.HashMap; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java index 0b5e6006a..753834024 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.CharPool; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java index c6e341fb0..97fb1ff6e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java index 9a512a72d..efa9f29e5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java @@ -25,7 +25,7 @@ import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; import org.dromara.hutool.core.io.stream.LimitedInputStream; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java index 1be4cf73d..97bcdf8f1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java @@ -14,7 +14,7 @@ package org.dromara.hutool.core.convert; import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java index 163625d1c..1c11798eb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java @@ -23,7 +23,7 @@ import org.dromara.hutool.core.reflect.TypeReference; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.UnicodeUtil; import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java index 1078e4190..68bebf473 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java @@ -21,7 +21,7 @@ import org.dromara.hutool.core.reflect.ConstructorUtil; import org.dromara.hutool.core.reflect.TypeReference; import org.dromara.hutool.core.reflect.TypeUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java index 53ddab476..585cdecf5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.util; +package org.dromara.hutool.core.data; import org.dromara.hutool.core.date.DatePattern; import org.dromara.hutool.core.date.DateTime; @@ -19,6 +19,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.regex.PatternPool; import org.dromara.hutool.core.lang.Validator; import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java index 0c9064ac4..1a4d430e8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.data; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * 数据脱敏（Data Masking）工具类，对某些敏感信息（比如，身份证号、手机号、卡号、姓名、地址、邮箱等 ）屏蔽敏感数据。
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java index a83cea0f9..fd7d97e13 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java index aabe58c11..5343dd56e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.util.RandomUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java index e6d899840..7c22b21f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.RandomUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java index e29a6cec6..14e30569b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java index b8b8e035b..b80861da2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.date.SystemClock; import org.dromara.hutool.core.lang.Assert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java index 867e4f616..f3c7caf51 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; import org.dromara.hutool.core.util.RandomUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java index 313846c32..5847a539a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.7.5 */ -package org.dromara.hutool.core.lang.id; +package org.dromara.hutool.core.data.id; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java index e9b74b3ce..e6c72e2a8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java @@ -13,7 +13,7 @@ /** * 数据相关封装和工具类
* 在Hutool中，“数据”是指社会属性的内容
- * 如电话、统一社会信用代码、密码、坐标系、数据脱敏等。 + * 如ID、电话、统一社会信用代码、密码、坐标系、数据脱敏等。 * * @author looly */ diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java index 4d9341095..ddf8e9de5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java @@ -18,7 +18,7 @@ import org.dromara.hutool.core.date.DateTime; import org.dromara.hutool.core.date.format.DefaultDateBasic; import org.dromara.hutool.core.regex.ReUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * ISO8601日期字符串（JDK的Date对象toString默认格式）解析，支持格式； diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java index 0e0133f47..9c5cd9194 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.date.DatePattern; import org.dromara.hutool.core.date.DateTime; import org.dromara.hutool.core.date.format.DefaultDateBasic; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * 标准日期字符串解析，支持格式； diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java index db691fd95..ae5da1aa7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.reflect.ConstructorUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java index 4ae832d70..5e305d371 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java @@ -14,7 +14,7 @@ package org.dromara.hutool.core.io; import org.dromara.hutool.core.collection.iter.ComputeIter; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java index d384ec342..1dad7fbf9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java @@ -14,7 +14,7 @@ package org.dromara.hutool.core.io.buffer; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java index 30631ea1d..d306c62c0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.net.url.URLUtil; import org.dromara.hutool.core.regex.ReUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.SystemUtil; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java index 624632062..6e82fe8c5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java @@ -29,7 +29,7 @@ import org.dromara.hutool.core.regex.ReUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.core.util.SystemUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java index cf1d3ddb2..6de943a4f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java @@ -18,7 +18,7 @@ import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java index 10c0b7889..fb5cb9021 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.io.file.PathUtil; import org.dromara.hutool.core.io.watch.watchers.WatcherChain; import org.dromara.hutool.core.net.url.URLUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java index b2978548d..5413552e8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.lang; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import java.util.Scanner; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java index 6e4387888..10039ac31 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.lang; import org.dromara.hutool.core.convert.Convert; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java index 5522c956a..a537c4426 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java @@ -24,6 +24,11 @@ import java.io.Serializable; */ public interface EnumItem> extends Serializable { + /** + * 枚举名称 + * + * @return 名称 + */ String name(); /** @@ -35,6 +40,11 @@ public interface EnumItem> extends Serializable { return name(); } + /** + * int值 + * + * @return int值 + */ int intVal(); /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java index 7127754ab..cfe309c7d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java @@ -22,7 +22,7 @@ import org.dromara.hutool.core.math.NumberUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.core.regex.ReUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.IdcardUtil; +import org.dromara.hutool.core.data.IdcardUtil; import java.net.MalformedURLException; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java index 5bbececd0..3cc305aa5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.lang.generator; -import org.dromara.hutool.core.lang.id.ObjectId; +import org.dromara.hutool.core.data.id.ObjectId; /** * ObjectId生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java index d79ffe09a..8f276e4e2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.lang.generator; -import org.dromara.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.data.id.Snowflake; /** * Snowflake生成器
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java index 4cb151179..3efadc22f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.lang.generator; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; /** * UUID生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java index aeb23ef34..6b027150a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java @@ -11,9 +11,21 @@ */ /** - * 语言特性包，包括大量便捷的数据结构，例如验证器Validator，分布式ID生成器Snowflake等 + * 语言特性包，包括大量便捷的数据结构，包括： + *
    + *
  • ANSI：ANSI编码
    • + *
  • Builder：构建器
    • + *
  • Caller：查找调用者
    • + *
  • Copier：拷贝（复制）
    • + *
  • Generator：生成器
    • + *
  • Getter：getXXX抽象
    • + *
  • Intern：规范化表示形式
    • + *
  • Loader：加载器的抽象
    • + *
  • Mutable：可变值对象封装
    • + *
  • Range：区间和边界封装
    • + *
  • Tuple：元组
    • + *
* * @author looly - * */ package org.dromara.hutool.core.lang; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java index d36f0ccfc..f79b8ed5c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java @@ -13,8 +13,8 @@ package org.dromara.hutool.core.lang.page; import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.DefaultSegment; -import org.dromara.hutool.core.lang.Segment; +import org.dromara.hutool.core.lang.range.DefaultSegment; +import org.dromara.hutool.core.lang.range.Segment; import org.dromara.hutool.core.math.NumberUtil; /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java index cb70f4c6c..df9e7bd64 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java @@ -22,7 +22,8 @@ import java.util.function.Predicate; * 作为{@link Predicate}使用时，可检验指定值是否在区间中，即指定值是否同时满足上下界的{@link Bound#test}方法。 * *

区间的类型，支持通过工厂方法创建下述几种类型的区间：

- * + *
+ * *
区间
区间 数学定义 工厂方法 *
{@code (a, b)} {@code {x | a < x < b}} {@link #open} *
{@code [a, b]} {@code {x | a <= x <= b}}{@link #close} diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java index a9da46e8c..74fa2c564 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang; +package org.dromara.hutool.core.lang.range; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java index 6a0edbdfc..a10f0db8c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java @@ -10,9 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang; +package org.dromara.hutool.core.lang.range; import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.math.NumberUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java index 5a8ae6080..476a398ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java @@ -14,7 +14,7 @@ package org.dromara.hutool.core.math; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * 数字检查器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java index 91dba63a6..07ba4cf78 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java @@ -19,7 +19,7 @@ import org.dromara.hutool.core.lang.Singleton; import org.dromara.hutool.core.regex.PatternPool; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java index 7e4182322..f575d7ea1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java @@ -19,7 +19,7 @@ import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.JNDIUtil; import org.dromara.hutool.core.util.RandomUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java index 4dc29ee3c..94bc98b5e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java @@ -14,7 +14,7 @@ package org.dromara.hutool.core.net.url; import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java index a4640c43a..33db8ff23 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.net.url; import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java index 5bcb0fd69..85bf960d0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java index 2055912ee..83ad81744 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.map.TripleTable; import org.dromara.hutool.core.text.StrTrimer; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.lang.reflect.Executable; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java index acd3e7e9f..68e2a4170 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java @@ -21,7 +21,7 @@ import org.dromara.hutool.core.io.resource.ResourceUtil; import org.dromara.hutool.core.net.url.URLDecoder; import org.dromara.hutool.core.net.url.URLUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.SystemUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java index 3f8942d92..695ea7edf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java @@ -23,7 +23,7 @@ import org.dromara.hutool.core.net.url.URLUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java index 88238fefd..0a564bc25 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java @@ -29,7 +29,6 @@ import org.dromara.hutool.core.text.replacer.RangeReplacerByStr; import org.dromara.hutool.core.text.replacer.SearchReplacer; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java index 597f62520..a5dfaa83b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java @@ -10,10 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.util; - -import org.dromara.hutool.core.text.ASCIIStrCache; -import org.dromara.hutool.core.text.CharPool; +package org.dromara.hutool.core.text; /** * 字符工具类
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java index 9cd35b55d..ae5fc619d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java @@ -12,8 +12,6 @@ package org.dromara.hutool.core.text; -import org.dromara.hutool.core.util.CharUtil; - /** * 命名规则封装，主要是针对驼峰风格命名、连接符命名等的封装 * diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java index 23b99bd3c..308f03d5d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java @@ -12,8 +12,6 @@ package org.dromara.hutool.core.text; -import org.dromara.hutool.core.util.CharUtil; - import java.io.Serializable; import java.util.function.Predicate; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java index 242237c24..8006d84ee 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java @@ -14,7 +14,6 @@ package org.dromara.hutool.core.text; import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java index ebff088b7..ecc041dab 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java @@ -12,7 +12,6 @@ package org.dromara.hutool.core.text; -import org.dromara.hutool.core.util.CharUtil; import org.dromara.hutool.core.codec.HexUtil; /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java index cb6c425df..8d133f80b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java @@ -12,7 +12,7 @@ package org.dromara.hutool.core.text.dfa; -import org.dromara.hutool.core.lang.DefaultSegment; +import org.dromara.hutool.core.lang.range.DefaultSegment; /** *

diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java index d68dd3f3e..d57c2394b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.text.escape; import org.dromara.hutool.core.text.replacer.StrReplacer; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * 形如'的反转义器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java index b8955b56d..2b0ccb69d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java @@ -13,7 +13,7 @@ package org.dromara.hutool.core.text.finder; import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; /** * 字符查找器
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java index 3672d18e9..f94bae730 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java @@ -15,7 +15,7 @@ package org.dromara.hutool.core.text.placeholder; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrValidator; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.Objects; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java index c6cde1851..4da8c7f53 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java @@ -18,7 +18,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.regex.PatternPool; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.finder.*; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java index 0cee702b6..92b6d8e65 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.ObjUtil; import java.io.PrintWriter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java index ef7b389a4..4f9f79a65 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java @@ -16,7 +16,8 @@ import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.id.Pid; +import org.dromara.hutool.core.data.id.Pid; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import java.io.File; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java index fff4307cd..b0411b585 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java @@ -1,7 +1,20 @@ -package org.dromara.hutool.core.util; +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.core.array; -import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,16 +29,15 @@ import java.util.*; @SuppressWarnings("ConstantValue") public class ArrayUtilTest { + @SuppressWarnings("DataFlowIssue") @Test public void isEmptyTest() { final int[] a = {}; Assertions.assertTrue(ArrayUtil.isEmpty(a)); Assertions.assertTrue(ArrayUtil.isEmpty((Object) a)); final int[] b = null; - //noinspection ConstantConditions Assertions.assertTrue(ArrayUtil.isEmpty(b)); final Object c = null; - //noinspection ConstantConditions Assertions.assertTrue(ArrayUtil.isEmpty(c)); Object d = new Object[]{"1", "2", 3, 4D}; @@ -35,9 +47,7 @@ public class ArrayUtilTest { isEmpty = ArrayUtil.isEmpty(d); Assertions.assertTrue(isEmpty); d = null; - //noinspection ConstantConditions isEmpty = ArrayUtil.isEmpty(d); - //noinspection ConstantConditions Assertions.assertTrue(isEmpty); // Object数组 @@ -518,9 +528,9 @@ public class ArrayUtilTest { } @Test - public void replaceTest2(){ + public void replaceTest2() { int[] a = new int[0]; - a = ArrayUtil.replace(a, 0, 1); + a = ArrayUtil.replace(a, 0, new int[]{1}); Assertions.assertEquals(1, a.length); } @@ -710,22 +720,23 @@ public class ArrayUtilTest { b = ArrayUtil.startWith(new String[]{"1"}, new String[]{"1"}); Assertions.assertTrue(b); - b = ArrayUtil.startWith((String[])null, null); + b = ArrayUtil.startWith((String[]) null, null); Assertions.assertTrue(b); } + @SuppressWarnings({"RedundantArrayCreation", "ConfusingArgumentToVarargsMethod"}) @Test public void startWithTest2() { boolean b = ArrayUtil.startWith(new int[]{}, new int[]{}); Assertions.assertTrue(b); - b = ArrayUtil.startWith(new int[]{1,2,3}, new int[]{1}); + b = ArrayUtil.startWith(new int[]{1, 2, 3}, new int[]{1}); Assertions.assertTrue(b); b = ArrayUtil.startWith(new int[]{1}, new int[]{1}); Assertions.assertTrue(b); - b = ArrayUtil.startWith((int[])null, null); + b = ArrayUtil.startWith((int[]) null, null); Assertions.assertTrue(b); } @@ -741,7 +752,7 @@ public class ArrayUtilTest { final byte[] bytes1 = Arrays.copyOfRange(a.getBytes(CharsetUtil.UTF_8), 1, 1 + 4); Assertions.assertEquals(new String(bytes1), - new String(a.getBytes(CharsetUtil.UTF_8), 1, 4)); + new String(a.getBytes(CharsetUtil.UTF_8), 1, 4)); } @Test diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java index 1390b68a6..821218bc0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java @@ -7,7 +7,7 @@ public class ArrayWrapperTest { @Test void getSubTest() { - ArrayWrapper array = ArrayWrapper.of(new int[]{1, 2, 3, 4, 5}); + ArrayWrapper array = ArrayWrapper.of(new int[]{1, 2, 3, 4, 5}); int[] sub = array.getSub(1, 4); Assertions.assertArrayEquals(new int[]{2, 3, 4}, sub); @@ -18,7 +18,7 @@ public class ArrayWrapperTest { @Test void getSubStepTest() { - ArrayWrapper array = ArrayWrapper.of(new int[]{1, 2, 3, 4, 5}); + ArrayWrapper array = ArrayWrapper.of(new int[]{1, 2, 3, 4, 5}); int[] sub = array.getSub(1, 4, 2); Assertions.assertArrayEquals(new int[]{2, 4}, sub); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java index 595d082a1..0a62a0bc9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java @@ -1,4 +1,16 @@ -package org.dromara.hutool.core.util; +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.core.data; import org.dromara.hutool.core.date.DateTime; import org.dromara.hutool.core.date.DateUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java index 7d6daea90..efde1081f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java @@ -1,6 +1,6 @@ package org.dromara.hutool.core.lang; -import org.dromara.hutool.core.lang.id.NanoId; +import org.dromara.hutool.core.data.id.NanoId; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java index c0d61f0be..fa92d438f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java @@ -1,6 +1,6 @@ package org.dromara.hutool.core.lang; -import org.dromara.hutool.core.lang.id.ObjectId; +import org.dromara.hutool.core.data.id.ObjectId; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java index 97833cc74..89f1fa417 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java @@ -2,8 +2,8 @@ package org.dromara.hutool.core.lang; import org.dromara.hutool.core.collection.ConcurrentHashSet; import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.id.IdUtil; -import org.dromara.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.data.id.IdUtil; +import org.dromara.hutool.core.data.id.Snowflake; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java index cedb8191f..cb66c1a64 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.core.lang; import org.dromara.hutool.core.collection.ConcurrentHashSet; -import org.dromara.hutool.core.lang.id.UUID; +import org.dromara.hutool.core.data.id.UUID; import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java index 8d375e475..dd54b2525 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java @@ -2,7 +2,7 @@ package org.dromara.hutool.core.lang; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.exception.ValidateException; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.core.regex.PatternPool; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.CharsetUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java similarity index 75% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java index 234d8fe5a..f7161a844 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java @@ -1,4 +1,16 @@ -package org.dromara.hutool.core.util; +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java index 215c9b33f..e51274ee4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java @@ -1,7 +1,6 @@ package org.dromara.hutool.core.text; import org.dromara.hutool.core.map.Dict; -import org.dromara.hutool.core.util.CharUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java index 604af7b63..5a79beec1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java @@ -2,7 +2,6 @@ package org.dromara.hutool.core.text; import org.dromara.hutool.core.map.Dict; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java index a1d8b6c11..9c7f063f5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java index 3a7f186f2..38f5d71ee 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java index 921a7168a..6bfd3224c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.reflect.ClassUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java index a5abe20aa..29fe211f6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.exception.CloneException; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java index 17fd4cde5..90393a124 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java index 8572dd38b..fc363694c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.util.EnumUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java index a56c1af0d..a3d1c89d3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.codec.hash.HashUtil; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java index fc4cd188e..32bfaff97 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java index 5f43b5414..ce2bedde4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.ConcurrentHashSet; @@ -5,8 +17,8 @@ import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.date.StopWatch; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.lang.id.IdUtil; -import org.dromara.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.data.id.IdUtil; +import org.dromara.hutool.core.data.id.Snowflake; import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java index 112378838..dd24cdc9e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java @@ -1,7 +1,20 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.iter.EnumerationIter; import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.JNDIUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java index e5a30edc9..b7302a795 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.JdkUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java index c47b428f7..029eed69e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.reflect.FieldUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java index 1b6dbb4c5..6d0b1abdb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.lang.Console; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java index 512a6e5b1..559154f02 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java @@ -1,8 +1,21 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.ListUtil; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; +import org.dromara.hutool.core.util.ObjUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java index 81fe78435..e9e6a65a0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java @@ -1,9 +1,22 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java index a3262395e..6e9f27110 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.collection.ListUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java index 9cdfc8a21..a3fa4288f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java @@ -1,7 +1,20 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.util.ReferenceUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java index 9865ce4e5..a5e49679f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.RuntimeUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java index 657951a88..e90014a5f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.reflect.FieldUtil; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java index 38ad38e27..27f0f2518 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.bean.BeanUtil; @@ -8,6 +20,7 @@ import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.map.MapBuilder; import org.dromara.hutool.core.map.MapUtil; import lombok.Data; +import org.dromara.hutool.core.util.XmlUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java index 073c0a17b..33fffaeeb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + package org.dromara.hutool.core.util; import org.dromara.hutool.core.compress.ZipReader; @@ -6,6 +18,8 @@ import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java index d880d5b2a..270b64fec 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java @@ -15,8 +15,8 @@ package org.dromara.hutool.cron; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.thread.ExecutorBuilder; import org.dromara.hutool.core.thread.ThreadFactoryBuilder; -import org.dromara.hutool.core.util.CharUtil; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.text.CharUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.cron.listener.TaskListener; import org.dromara.hutool.cron.listener.TaskListenerManager; diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java index 30d997bc2..abb5ca5a2 100644 --- a/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java +++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.cron; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.cron.pattern.CronPattern; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java index 4cad46790..4aef9e20c 100644 --- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java +++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java @@ -3,7 +3,7 @@ package org.dromara.hutool.cron.demo; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; /** * 测试定时任务，当触发到定时的时间点时，执行doTest方法 diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java index 20c6414e9..1425a6c63 100644 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java @@ -17,7 +17,7 @@ import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.RandomUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.crypto.asymmetric.AsymmetricAlgorithm; diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Page.java b/hutool-db/src/main/java/org/dromara/hutool/db/Page.java index e5f0454e0..06a387e04 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/Page.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/Page.java @@ -12,7 +12,7 @@ package org.dromara.hutool.db; -import org.dromara.hutool.core.lang.Segment; +import org.dromara.hutool.core.lang.range.Segment; import org.dromara.hutool.core.lang.page.PageInfo; import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.db.sql.Order; diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java index efd6f8986..2e8b01544 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java @@ -18,7 +18,7 @@ import org.dromara.hutool.core.math.NumberUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java index 30fc17a35..43493ef95 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java @@ -15,7 +15,7 @@ package org.dromara.hutool.db.sql; import org.dromara.hutool.core.lang.builder.Builder; import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import java.util.ArrayList; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java index 6a176436a..8b50173fd 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.file.FileNameUtil; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import java.io.Closeable; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java index 809352c70..cc74501ef 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java @@ -21,7 +21,7 @@ import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java index e713c7eaf..42c31d762 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java @@ -13,7 +13,7 @@ package org.dromara.hutool.extra.template.engine.enjoy; import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.extra.template.Template; import org.dromara.hutool.extra.template.TemplateConfig; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java index 8eb77c066..1308ae893 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java @@ -14,7 +14,7 @@ package org.dromara.hutool.http.html; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.core.map.SafeConcurrentHashMap; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java index 91fde68b9..d4ece0f47 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java @@ -26,7 +26,7 @@ import org.dromara.hutool.core.reflect.TypeUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.json.serialize.GlobalSerializeMapping; import org.dromara.hutool.json.serialize.JSONDeserializer; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java index d5a4ab1bf..ea75567a7 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java @@ -14,7 +14,7 @@ package org.dromara.hutool.json; import org.dromara.hutool.core.lang.mutable.Mutable; import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.util.function.Predicate; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java index a430ab78d..2c58bd425 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java @@ -12,7 +12,7 @@ package org.dromara.hutool.json; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; /** diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java index ad3db5aad..800f492de 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java @@ -15,7 +15,7 @@ package org.dromara.hutool.json.writer; import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.lang.mutable.MutableEntry; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.json.InternalJSONUtil; import org.dromara.hutool.json.JSON; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java index 0371fd058..69429f287 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java @@ -13,7 +13,7 @@ package org.dromara.hutool.json.xml; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.escape.EscapeUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.json.JSONArray; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java index 44f77eb52..7e54e3614 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java @@ -12,7 +12,7 @@ package org.dromara.hutool.json.xml; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.json.JSONException; import org.dromara.hutool.json.JSONObject; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java index 927756e10..37cc0c553 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java @@ -12,7 +12,7 @@ package org.dromara.hutool.poi.csv; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java index 82c21d6dd..9628dad74 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java @@ -18,7 +18,7 @@ import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.text.StrTrimer; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.ObjUtil; import java.io.Closeable; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java index 10295240f..168831818 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java @@ -12,7 +12,7 @@ package org.dromara.hutool.poi.csv; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import java.io.Serializable; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java index b776d9aa6..3e25c6d67 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java @@ -22,7 +22,7 @@ import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java index 1fd7c17f0..42501ee8c 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java @@ -19,7 +19,7 @@ import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.map.SafeConcurrentHashMap; import org.dromara.hutool.core.map.TableMap; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java index ad824f60c..fd2a65fb8 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java @@ -12,7 +12,7 @@ package org.dromara.hutool.poi.excel.cell.values; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.poi.excel.ExcelDateUtil; import org.dromara.hutool.poi.excel.cell.CellValue; import org.apache.poi.ss.usermodel.Cell; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java index 82fd55bee..92cc45cc6 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java @@ -16,7 +16,7 @@ import org.dromara.hutool.core.date.DateTime; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.exception.DependencyException; import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.poi.excel.ExcelDateUtil; diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java index e7c856fc4..ae86d8779 100644 --- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java @@ -4,7 +4,7 @@ import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.data.id.IdUtil; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.ObjUtil; diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java index a6973f92d..f379ef790 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java @@ -25,7 +25,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.func.LambdaUtil; import org.dromara.hutool.core.func.SerSupplier; import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.log.StaticLog; import org.dromara.hutool.setting.props.Props; diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java index 18af9b2b3..78b1ceae7 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java @@ -20,7 +20,7 @@ import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.regex.ReUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.SystemUtil; import org.dromara.hutool.log.Log; diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java index 66a05246f..41e87cb37 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java @@ -65,8 +65,9 @@ public class TomlReader { public Map read() { final Map map = nextTableContent(); - if (!hasNext() && pos > 0 && data.charAt(pos - 1) == '[') + if (!hasNext() && pos > 0 && data.charAt(pos - 1) == '['){ throw new SettingException("Invalid table declaration at line " + line + ": it never ends"); + } while (hasNext()) { char c = nextUseful(true); diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java index 9693fc96f..ee17dc33f 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java @@ -14,7 +14,7 @@ package org.dromara.hutool.setting.toml; import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.setting.SettingException; import java.io.IOException; diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java deleted file mode 100644 index aee292c8e..000000000 --- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.dromara.hutool.setting; - -import org.dromara.hutool.setting.props.PropsUtil; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import java.util.Objects; - -public class PropsUtilTest { - - @Test - public void getTest() { - final String driver = PropsUtil.get("test").getStr("driver"); - Assertions.assertEquals("com.mysql.jdbc.Driver", driver); - } - - @Test - public void getFirstFoundTest() { - final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver"); - Assertions.assertEquals("com.mysql.jdbc.Driver", driver); - } -} diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java similarity index 86% rename from hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java rename to hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java index 2ae0b31d2..7e10f3ba7 100644 --- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java +++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java @@ -1,8 +1,19 @@ -package org.dromara.hutool.setting; +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.setting.props; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.setting.props.Props; import lombok.Data; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java new file mode 100644 index 000000000..b809707ec --- /dev/null +++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.setting.props; + +import org.dromara.hutool.setting.props.PropsUtil; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.Objects; + +public class PropsUtilTest { + + @Test + public void getTest() { + final String driver = PropsUtil.get("test").getStr("driver"); + Assertions.assertEquals("com.mysql.jdbc.Driver", driver); + } + + @Test + public void getFirstFoundTest() { + final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver"); + Assertions.assertEquals("com.mysql.jdbc.Driver", driver); + } +} diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java similarity index 54% rename from hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java rename to hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java index 3bbffd161..536c6a9cf 100644 --- a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java +++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java @@ -1,4 +1,16 @@ -package org.dromara.hutool.setting; +/* + * Copyright (c) 2023 looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.setting.toml; import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.setting.props.Props; diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java index 0053ae4e0..ac012eb5c 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java @@ -13,7 +13,7 @@ package org.dromara.hutool.swing.captcha.generator; import org.dromara.hutool.core.math.Calculator; -import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.CharUtil; import org.dromara.hutool.core.util.RandomUtil; import org.dromara.hutool.core.text.StrUtil;