- * '你' =》\u4f60 + * 你 =》 \u4f60 ** * @param value int值，也可以是char @@ -278,7 +278,7 @@ public class HexUtil { * 转换的字符串如果u后不足4位，则前面用0填充，例如： * *
- * '你' =》'\u4f60' + * 你 =》 \u4f60 ** * @param ch char值 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java b/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java index 715a6a5cb..3fa9dc553 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java @@ -81,7 +81,7 @@ public class Base16Codec implements Encoder
- * 官方实现：https://github.com/jandrewrogers/MetroHash
- * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
- * Go语言实现：https://github.com/linvon/cuckoo-filter/blob/main/vendor/github.com/dgryski/go-metro/
- *
- * @author li
- */
-public class MetroHash implements Hash64
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ *
+ * @author Marius Posta
+ * @param
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ *
+ * @param
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ * @author Marius Posta
+ */
+public class MetroHash128 extends AbstractMetroHash
+ * 官方实现：https://github.com/jandrewrogers/MetroHash
+ * 官方文档：http://www.jandrewrogers.com/2015/05/27/metrohash/
+ * 来自：https://github.com/postamar/java-metrohash/
+ * @author Marius Posta
+ */
+public class MetroHash64 extends AbstractMetroHash
+ * 参考：https://github.com/postamar/java-metrohash
+ *
+ * @author postamar, looly
+ */
+package cn.hutool.core.codec.hash.metro;
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java
index c22c4cce7..9933dfb53 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java
@@ -95,6 +95,7 @@ public class LineIter extends ComputeIter
* see： http://git.oschina.net/yu120/sequence
* @author lry, looly
*/
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java b/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java
index 1d23e0389..11170f4ad 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java
@@ -573,17 +573,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mValue = value;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return mValue.length();
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
buffer.append(mValue);
@@ -610,9 +604,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mValues = values;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
int max = 0;
@@ -625,9 +616,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
return max;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
buffer.append(mValues[calendar.get(mField)]);
@@ -651,25 +639,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mField = field;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 4;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(mField));
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
if (value < 10) {
@@ -697,25 +676,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
UnpaddedMonthField() {
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 2;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(Calendar.MONTH) + 1);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
if (value < 10) {
@@ -750,25 +720,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mSize = size;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return mSize;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(mField));
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
appendFullDigits(buffer, value, mSize);
@@ -792,25 +753,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mField = field;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 2;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(mField));
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
if (value < 100) {
@@ -835,25 +787,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
TwoDigitYearField() {
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 2;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(Calendar.YEAR) % 100);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
appendDigits(buffer, value);
@@ -874,25 +817,16 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
TwoDigitMonthField() {
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 2;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
appendTo(buffer, calendar.get(Calendar.MONTH) + 1);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void appendTo(final Appendable buffer, final int value) throws IOException {
appendDigits(buffer, value);
@@ -916,17 +850,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mRule = rule;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return mRule.estimateLength();
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
int value = calendar.get(Calendar.HOUR);
@@ -936,9 +864,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mRule.appendTo(buffer, value);
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final int value) throws IOException {
mRule.appendTo(buffer, value);
@@ -962,17 +887,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mRule = rule;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return mRule.estimateLength();
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
int value = calendar.get(Calendar.HOUR_OF_DAY);
@@ -982,9 +901,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mRule.appendTo(buffer, value);
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final int value) throws IOException {
mRule.appendTo(buffer, value);
@@ -1103,9 +1019,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mDaylight = getTimeZoneDisplay(timeZone, true, style, locale);
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
// We have no access to the Calendar object that will be passed to
@@ -1114,9 +1027,6 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
return Math.max(mStandard.length(), mDaylight.length());
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
final TimeZone zone = calendar.getTimeZone();
@@ -1148,17 +1058,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mColon = colon;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return 5;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
@@ -1227,17 +1131,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
this.length = length;
}
- /**
- * {@inheritDoc}
- */
@Override
public int estimateLength() {
return length;
}
- /**
- * {@inheritDoc}
- */
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
int offset = calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
@@ -1298,17 +1196,11 @@ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter {
mLocale = locale;
}
- /**
- * {@inheritDoc}
- */
@Override
public int hashCode() {
return (mStyle * 31 + mLocale.hashCode()) * 31 + mTimeZone.hashCode();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean equals(final Object obj) {
if (this == obj) {
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java b/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java
index 25b966d54..e339f6fce 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java
@@ -19,6 +19,11 @@ public class AppendableWriter extends Writer implements Appendable {
private final boolean flushable;
private boolean closed;
+ /**
+ * 构造
+ *
+ * @param appendable {@link Appendable}
+ */
public AppendableWriter(final Appendable appendable) {
this.appendable = appendable;
this.flushable = appendable instanceof Flushable;
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java b/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
index aee176854..a167ad627 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java
@@ -1,7 +1,5 @@
package cn.hutool.core.io.file.visitor;
-import cn.hutool.core.lang.Console;
-
import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
@@ -17,6 +15,9 @@ import java.nio.file.attribute.BasicFileAttributes;
*/
public class DelVisitor extends SimpleFileVisitor
* 工具实现见博客：https://blog.starxg.com/2020/11/bit-status/
*
* @author huangxingguang，senssic
diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
index 063fab56b..4034e9f42 100644
--- a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
@@ -121,7 +121,7 @@ public class MethodHandleUtil {
* return "Quack";
* }
* }
- *
+ *
* Duck duck = (Duck) Proxy.newProxyInstance(
* ClassLoaderUtil.getClassLoader(),
* new Class[] { Duck.class },
@@ -167,7 +167,7 @@ public class MethodHandleUtil {
* return "Quack";
* }
* }
- *
+ *
* Duck duck = (Duck) Proxy.newProxyInstance(
* ClassLoaderUtil.getClassLoader(),
* new Class[] { Duck.class },
@@ -193,7 +193,7 @@ public class MethodHandleUtil {
* return "Quack";
* }
* }
- *
+ *
* Duck duck = (Duck) Proxy.newProxyInstance(
* ClassLoaderUtil.getClassLoader(),
* new Class[] { Duck.class },
diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
index 87ec9b9f0..3c015c1a9 100755
--- a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
@@ -893,7 +893,7 @@ public class ReUtil {
/**
* 替换所有正则匹配的文本，并使用自定义函数决定如何替换
*
*
* 其他系统内置的拒绝策略，见hutool定义的枚举 {@link RejectPolicy} 线程拒绝策略枚举.
*
* @author luozongle
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
index f16e7d81c..6825f0c07 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
@@ -1,7 +1,6 @@
package cn.hutool.core.util;
import cn.hutool.core.collection.SetUtil;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.StrUtil;
import java.util.Set;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java
index 1e675cae3..a58668b0e 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java
@@ -298,12 +298,12 @@ public class ByteUtil {
if (ByteOrder.LITTLE_ENDIAN == byteOrder) {
for (int i = (Long.BYTES - 1); i >= 0; i--) {
values <<= Byte.SIZE;
- values |= (bytes[i + start] & 0xff);
+ values |= (bytes[i + start] & 0xffL);
}
} else {
for (int i = 0; i < Long.BYTES; i++) {
values <<= Byte.SIZE;
- values |= (bytes[i + start] & 0xff);
+ values |= (bytes[i + start] & 0xffL);
}
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java
new file mode 100644
index 000000000..0f2da98b7
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java
@@ -0,0 +1,119 @@
+package cn.hutool.core.codec.hash.metro;
+
+import cn.hutool.core.codec.HexUtil;
+import cn.hutool.core.text.StrUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public class MetroHash128Test {
+ @Test
+ public void testEmpty() {
+ Assert.assertEquals("5F3CA3D41D1CB4606B14684C65FB6", h128(""));
+ }
+
+ @Test
+ public void test1Low() {
+ Assert.assertEquals("E84D9EA70174C3184AC6E55552310F85", h128("a"));
+ }
+
+ @Test
+ public void test1High() {
+ Assert.assertEquals("9A5BCED4C3CA98CADE13388E3C14C215", h128("é"));
+ }
+
+ @Test
+ public void test2Palindrome() {
+ Assert.assertEquals("3DDDF558587273E1FD034EC7CC917AC8", h128("aa"));
+ }
+
+ @Test
+ public void test2() {
+ Assert.assertEquals("458E6A18B65C38AD2552335402A068A2", h128("ab"));
+ }
+
+ @Test
+ public void test3PalindromeLow() {
+ Assert.assertEquals("19725A6E67A8DD1A84E3C844A20DA938", h128("aaa"));
+ }
+
+ @Test
+ public void test3PalindromeHigh() {
+ Assert.assertEquals("1DD9CC1D29B5080D5F9F171FB2C50CBB", h128("ééé"));
+ }
+
+ @Test
+ public void test3() {
+ Assert.assertEquals("89AB9CDB9FAF7BA71CD86385C1F801A5", h128("abc"));
+ }
+
+ @Test
+ public void test4Palindrome() {
+ Assert.assertEquals("AFD0BBB3764CA0539E46B914B8CB8911", h128("poop"));
+ }
+
+ @Test
+ public void test4() {
+ Assert.assertEquals("D11B6DB94FE20E3884F3829AD6613D19", h128("fart"));
+ }
+
+ @Test
+ public void test5() {
+ Assert.assertEquals("D45A3A74885F9C842081929D2E9A3A3B", h128("Hello"));
+ }
+
+ @Test
+ public void test12() {
+ Assert.assertEquals("A7CEC59B03A9053BA6009EEEC81E81F5", h128("Hello World!"));
+ }
+
+ @Test
+ public void test31() {
+ Assert.assertEquals("980CA7496A1B26D24E529DFB2B3A870",
+ h128("The Quick Brown Fox Jumped Over"));
+ }
+
+ @Test
+ public void test32() {
+ Assert.assertEquals("76663CEA442E22F86A6CB41FBA896B9B",
+ h128("The Quick Brown Fox Jumped Over "));
+ }
+
+ @Test
+ public void testLonger() {
+ Assert.assertEquals("7010B2D7C8A3515AE3CA4DBBD9ED30D0",
+ h128("The Quick Brown Fox Jumped Over The Lazy Dog"));
+ }
+
+ static final byte[] ENDIAN =
+ StrUtil.utf8Bytes("012345678901234567890123456789012345678901234567890123456789012");
+
+ @Test
+ public void testLittleEndian() {
+ final ByteBuffer output = ByteBuffer.allocate(16);
+ MetroHash128.of(0).apply(ByteBuffer.wrap(ENDIAN)).write(output, ByteOrder.LITTLE_ENDIAN);
+ Assert.assertEquals("C77CE2BFA4ED9F9B0548B2AC5074A297", hex(output.array()));
+ }
+
+ @Test
+ public void testBigEndian() {
+ final ByteBuffer output = ByteBuffer.allocate(16);
+ MetroHash128.of(0).apply(ByteBuffer.wrap(ENDIAN)).write(output, ByteOrder.BIG_ENDIAN);
+ Assert.assertEquals("97A27450ACB248059B9FEDA4BFE27CC7", hex(output.array()));
+ }
+
+ static String h128(final String input) {
+ final MetroHash128 mh = MetroHash128.of(0).apply(ByteBuffer.wrap(StrUtil.utf8Bytes(input)));
+ return hex(mh.getHigh()) + hex(mh.getLow());
+ }
+
+ private static String hex(final long value){
+ return HexUtil.toHex(value).toUpperCase();
+ }
+
+ private static String hex(final byte[] bytes){
+ return HexUtil.encodeHexStr(bytes).toUpperCase();
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java
new file mode 100644
index 000000000..906db1b80
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java
@@ -0,0 +1,118 @@
+package cn.hutool.core.codec.hash.metro;
+
+import cn.hutool.core.codec.HexUtil;
+import cn.hutool.core.text.StrUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * 来自：https://github.com/postamar/java-metrohash/blob/master/src/test/java/util/hash/MetroHashTest64.java
+ */
+public class MetroHash64Test {
+ @Test
+ public void testEmpty() {
+ Assert.assertEquals("705FB008071E967D", h64(""));
+ }
+
+ @Test
+ public void test1Low() {
+ Assert.assertEquals("AF6F242B7ED32BCB", h64("a"));
+ }
+
+ @Test
+ public void test1High() {
+ Assert.assertEquals("D51BA21D219C37B3", h64("é"));
+ }
+
+ @Test
+ public void test2Palindrome() {
+ Assert.assertEquals("3CF3A8F204CAE1B6", h64("aa"));
+ }
+
+ @Test
+ public void test2() {
+ Assert.assertEquals("CD2EA2738FC27D98", h64("ab"));
+ }
+
+ @Test
+ public void test3PalindromeLow() {
+ Assert.assertEquals("E59031D8D046D241", h64("aaa"));
+ }
+
+ @Test
+ public void test3PalindromeHigh() {
+ Assert.assertEquals("FE8325DC6F40511D", h64("ééé"));
+ }
+
+ @Test
+ public void test3() {
+ Assert.assertEquals("ED4F5524E6FAFFBB", h64("abc"));
+ }
+
+ @Test
+ public void test4Palindrome() {
+ Assert.assertEquals("CD77F739885CCB2C", h64("poop"));
+ }
+
+ @Test
+ public void test4() {
+ Assert.assertEquals("B642DCB026D9573C", h64("fart"));
+ }
+
+ @Test
+ public void test5() {
+ Assert.assertEquals("A611009FEE6AF8B", h64("Hello"));
+ }
+
+ @Test
+ public void test12() {
+ Assert.assertEquals("14BCB49B74E3B404", h64("Hello World!"));
+ }
+
+
+ @Test
+ public void test31() {
+ Assert.assertEquals("D27A7BFACC320E2F",
+ h64("The Quick Brown Fox Jumped Over"));
+ }
+
+ @Test
+ public void test32() {
+ Assert.assertEquals("C313A3A811EAB43B",
+ h64("The Quick Brown Fox Jumped Over "));
+ }
+
+ @Test
+ public void testLonger() {
+ Assert.assertEquals("C7047C2FCA234C05",
+ h64("The Quick Brown Fox Jumped Over The Lazy Dog"));
+ }
+
+ static final byte[] ENDIAN =
+ StrUtil.utf8Bytes("012345678901234567890123456789012345678901234567890123456789012");
+
+ @Test
+ public void testLittleEndian() {
+ final ByteBuffer output = ByteBuffer.allocate(8);
+ MetroHash64.of(0).apply(ByteBuffer.wrap(ENDIAN)).write(output, ByteOrder.LITTLE_ENDIAN);
+ Assert.assertEquals("6B753DAE06704BAD", hex(output.array()));
+ }
+
+ @Test
+ public void testBigEndian() {
+ final ByteBuffer output = ByteBuffer.allocate(8);
+ MetroHash64.of(0).apply(ByteBuffer.wrap(ENDIAN)).write(output, ByteOrder.BIG_ENDIAN);
+ Assert.assertEquals("AD4B7006AE3D756B", hex(output.array()));
+ }
+
+ private String h64(final String value) {
+ return HexUtil.toHex(MetroHash64.of(0).hash64(StrUtil.utf8Bytes(value))).toUpperCase();
+ }
+
+ private static String hex(final byte[] bytes){
+ return HexUtil.encodeHexStr(bytes).toUpperCase();
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java
old mode 100755
new mode 100644
similarity index 70%
rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/MetroHashTest.java
rename to hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java
index 3222ef0ea..a89dceced
--- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/MetroHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java
@@ -1,10 +1,11 @@
-package cn.hutool.core.codec.hash;
+package cn.hutool.core.codec.hash.metro;
-import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.codec.hash.CityHash;
import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.RandomUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -16,22 +17,32 @@ public class MetroHashTest {
@Test
public void testEmpty() {
- Assert.assertEquals("31290877cceaea29", HexUtil.toHex(MetroHash.INSTANCE.hash64(StrUtil.utf8Bytes(""), 0)));
+ Assert.assertEquals("705fb008071e967d", HexUtil.toHex(MetroHash64.of(0).hash64(StrUtil.utf8Bytes(""))));
+ }
+
+ @Test
+ public void test1Low() {
+ Assert.assertEquals("AF6F242B7ED32BCB", h64("a"));
+ }
+
+ @Test
+ public void test1High() {
+ Assert.assertEquals("D51BA21D219C37B3", h64("é"));
}
@Test
public void metroHash64Test() {
final byte[] str = "我是一段测试123".getBytes(CharsetUtil.UTF_8);
- final long hash64 = MetroHash.INSTANCE.hash64(str);
- Assert.assertEquals(62920234463891865L, hash64);
+ final long hash64 = MetroHash64.of(0).hash64(str);
+ Assert.assertEquals(147395857347476456L, hash64);
}
@Test
public void metroHash128Test() {
final byte[] str = "我是一段测试123".getBytes(CharsetUtil.UTF_8);
- final long[] hash128 = MetroHash.INSTANCE.hash128(str).getLongArray();
- Assert.assertEquals(4956592424592439349L, hash128[0]);
- Assert.assertEquals(6301214698325086246L, hash128[1]);
+ final long[] hash128 = MetroHash128.of(0).hash128(str).getLongArray();
+ Assert.assertEquals(228255164667538345L, hash128[0]);
+ Assert.assertEquals(-6394585948993412256L, hash128[1]);
}
/**
@@ -49,7 +60,7 @@ public class MetroHashTest {
final long startMetro = System.currentTimeMillis();
for (final String s : strArray) {
- MetroHash.INSTANCE.hash64(StrUtil.utf8Bytes(s));
+ MetroHash64.of(0).hash64(StrUtil.utf8Bytes(s));
}
final long endMetro = System.currentTimeMillis();
@@ -73,7 +84,7 @@ public class MetroHashTest {
final long startMetro = System.currentTimeMillis();
for (final String s : strArray) {
- MetroHash.INSTANCE.hash128(StrUtil.utf8Bytes(s));
+ MetroHash128.of(0).hash128(StrUtil.utf8Bytes(s));
}
final long endMetro = System.currentTimeMillis();
@@ -90,4 +101,8 @@ public class MetroHashTest {
}
return result;
}
+
+ private String h64(final String value) {
+ return HexUtil.toHex(MetroHash64.of(0).hash64(StrUtil.utf8Bytes(value))).toUpperCase();
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
index 8dd8414e6..4835f593a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
@@ -7,13 +7,7 @@ import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* {@link IterUtil} 单元测试
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java
index e3dbf228a..3ecf70dfe 100755
--- a/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.ListUtil;
import org.junit.Assert;
import org.junit.Test;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
index dd9ece7f6..b5117c06d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
@@ -11,17 +11,7 @@ import cn.hutool.core.util.RandomUtil;
import org.junit.Assert;
import org.junit.Test;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackReader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
+import java.io.*;
import java.util.List;
public class IoUtilTest {
diff --git a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java
similarity index 97%
rename from hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
rename to hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java
index 0703f1848..2b85eb912 100644
--- a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java
@@ -1,6 +1,5 @@
-package cn.hutool.core.builder;
+package cn.hutool.core.lang.builder;
-import cn.hutool.core.lang.builder.GenericBuilder;
import cn.hutool.core.text.StrUtil;
import lombok.Getter;
import lombok.Setter;
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java
index 0a7ea480e..d12996c0f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java
@@ -39,13 +39,13 @@ public class BoundTest {
// getValue
Assert.assertNull(bound.getValue());
// toString
- Assert.assertEquals("(" + "-\u221e", bound.descBound());
+ Assert.assertEquals("(" + "-∞", bound.descBound());
// compareTo
Assert.assertEquals(0, bound.compareTo(bound));
Assert.assertEquals(-1, bound.compareTo(Bound.atMost(1)));
Assert.assertEquals(BoundedRange.all(), bound.toRange());
- Assert.assertEquals("{x | x > -\u221e}", bound.toString());
+ Assert.assertEquals("{x | x > -∞}", bound.toString());
}
@Test
@@ -60,13 +60,13 @@ public class BoundTest {
// getValue
Assert.assertNull(bound.getValue());
// toString
- Assert.assertEquals("+\u221e" + ")", bound.descBound());
+ Assert.assertEquals("+∞" + ")", bound.descBound());
// compareTo
Assert.assertEquals(0, bound.compareTo(bound));
Assert.assertEquals(1, bound.compareTo(Bound.atMost(1)));
Assert.assertEquals(BoundedRange.all(), bound.toRange());
- Assert.assertEquals("{x | x < +\u221e}", bound.toString());
+ Assert.assertEquals("{x | x < +∞}", bound.toString());
}
@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java b/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java
index 7cdd9148f..2ec2ae206 100644
--- a/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java
@@ -1,6 +1,5 @@
package cn.hutool.core.reflect;
-import cn.hutool.core.reflect.ActualTypeMapperPool;
import org.junit.Assert;
import org.junit.Test;
@@ -9,7 +8,7 @@ import java.util.Map;
/**
* 见：https://gitee.com/dromara/hutool/pulls/447/files
- *
+ *
* TODO 同时继承泛型和实现泛型接口需要解析，此处为F
*/
public class ActualTypeMapperPoolTest {
diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java
index afc8a1c4f..7af584b4d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java
@@ -591,9 +591,7 @@ public class AbstractEnhancedWrappedStreamTest {
public void testMapMulti() {
Assert.assertEquals(
asList(1, 2, 3),
- wrap(1, 2, 3).mapMulti((t, builder) -> {
- builder.accept(t);
- }).toList()
+ wrap(1, 2, 3).mapMulti((t, builder) -> builder.accept(t)).toList()
);
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index 871749645..c24d3546b 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -59,6 +59,7 @@ public class CharSequenceUtilTest {
Assert.assertEquals("/", result);
}
+ @SuppressWarnings("UnnecessaryUnicodeEscape")
@Test
public void normalizeTest() {
// https://blog.csdn.net/oscar999/article/details/105326270
@@ -155,6 +156,7 @@ public class CharSequenceUtilTest {
Assert.assertNull(CharSequenceUtil.removeSuffixIgnoreCase(null, "ABCdef"));
}
+ @SuppressWarnings("ConstantValue")
@Test
public void trimToNullTest(){
String a = " ";
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/issueI5Q4HDTest.java b/hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java
similarity index 97%
rename from hutool-core/src/test/java/cn/hutool/core/text/dfa/issueI5Q4HDTest.java
rename to hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java
index 6cf936efd..1ce0184d7 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/issueI5Q4HDTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-public class issueI5Q4HDTest {
+public class IssueI5Q4HDTest {
@Test
public void matchAllTest(){
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
index a9f14d892..14334fc0b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
@@ -27,6 +27,7 @@ public class CharUtilTest {
Assert.assertTrue(CharUtil.isChar(a));
}
+ @SuppressWarnings("UnnecessaryUnicodeEscape")
@Test
public void isBlankCharTest(){
final char a = '\u00A0';
@@ -56,6 +57,7 @@ public class CharUtilTest {
Assert.assertEquals('⑳', CharUtil.toCloseByNumber(20));
}
+ @SuppressWarnings("UnnecessaryUnicodeEscape")
@Test
public void issueI5UGSQTest(){
char c = '\u3164';
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
index 0c71014de..14f5edfbe 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
@@ -9,6 +9,9 @@ import cn.hutool.core.text.StrUtil;
*/
public class AlwaysTrueMatcher implements PartMatcher {
+ /**
+ * 单例
+ */
public static AlwaysTrueMatcher INSTANCE = new AlwaysTrueMatcher();
@Override
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
index 43f3c1d85..ff9a73048 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
@@ -18,7 +18,7 @@ import cn.hutool.crypto.symmetric.PBKDF2;
import cn.hutool.crypto.symmetric.RC4;
import cn.hutool.crypto.symmetric.SymmetricCrypto;
import cn.hutool.crypto.symmetric.ZUC;
-import cn.hutool.crypto.symmetric.fpe.FPE;
+import cn.hutool.crypto.symmetric.FPE;
import org.bouncycastle.crypto.AlphabetMapper;
import javax.crypto.Cipher;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
index 5fe14ddd0..42d8161a0 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
@@ -116,7 +116,7 @@ public class Sign extends BaseAsymmetric
* 私钥和公钥同时为空时生成一对新的私钥和公钥
* 私钥和公钥同时为空时生成一对新的私钥和公钥
* 此类基于BouncyCastle实现。
*
* @author looly
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
index 6bfbb71c0..cc68a1408 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
@@ -1,6 +1,7 @@
package cn.hutool.crypto.symmetric.fpe;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.crypto.symmetric.FPE;
import org.bouncycastle.crypto.util.BasicAlphabetMapper;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
index 87056c748..359bc153e 100755
--- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
+++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
@@ -1,23 +1,10 @@
package cn.hutool.db;
-import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.func.SerFunction;
import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.handler.BeanListHandler;
-import cn.hutool.db.handler.EntityHandler;
-import cn.hutool.db.handler.EntityListHandler;
-import cn.hutool.db.handler.NumberHandler;
-import cn.hutool.db.handler.ResultSetUtil;
-import cn.hutool.db.handler.RsHandler;
-import cn.hutool.db.handler.StringHandler;
-import cn.hutool.db.sql.Condition;
+import cn.hutool.db.handler.*;
+import cn.hutool.db.sql.*;
import cn.hutool.db.sql.Condition.LikeType;
-import cn.hutool.db.sql.LogicalOperator;
-import cn.hutool.db.sql.Query;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.SqlExecutor;
-import cn.hutool.db.sql.SqlUtil;
-import cn.hutool.db.sql.QuoteWrapper;
import javax.sql.DataSource;
import java.io.Serializable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
index 85693af1b..74bb2d18d 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
@@ -29,7 +29,7 @@ public class PooledDataSource extends AbstractDataSource {
* 获得一个数据源
*
* @param group 数据源分组
- * @return {@link PooledDataSource}
+ * @return {@code PooledDataSource}
*/
synchronized public static PooledDataSource getDataSource(final String group) {
return new PooledDataSource(group);
@@ -38,7 +38,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 获得一个数据源，使用空分组
*
- * @return {@link PooledDataSource}
+ * @return {@code PooledDataSource}
*/
synchronized public static PooledDataSource getDataSource() {
return new PooledDataSource();
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java
index fa907241d..c9f221ef4 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java
@@ -7,7 +7,7 @@ import java.sql.SQLException;
/**
* 结果集处理接口
* 默认实现有：
* @see EntityHandler
* @see EntityListHandler
@@ -15,13 +15,13 @@ import java.sql.SQLException;
* @see EntitySetHandler
* @see NumberHandler
* @see PageResultHandler
- *
+ *
* @author Luxiaolei
*
*/
@FunctionalInterface
public interface RsHandler
*
* @param
* 例如：
- *
+ *
*
*
* 例如：
- *
+ *
*
*
*
*/
public class ContentTypeTest {
diff --git a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java b/hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java
similarity index 90%
rename from hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
rename to hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java
index 86270de53..5fd810889 100644
--- a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java
@@ -1,9 +1,8 @@
-package cn.hutool.http.body;
+package cn.hutool.http.client.body;
+import cn.hutool.core.io.resource.HttpResource;
import cn.hutool.core.io.resource.StringResource;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.http.client.body.MultipartBody;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
index 26da40e64..71a5b2693 100755
--- a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
@@ -460,6 +460,7 @@ public final class InternalJSONUtil {
* @param c 字符
* @return 转义后的字符串
*/
+ @SuppressWarnings("UnnecessaryUnicodeEscape")
private static String escape(final char c) {
switch (c) {
case '\b':
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
index 466c4a839..b3fa0e8dc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
@@ -10,7 +10,7 @@ import org.junit.Test;
* 测试在bean转换时使用BeanConverter，默认忽略转换失败的字段。
* 现阶段Converter的问题在于，无法更细粒度的控制转换失败的范围，例如Bean的一个字段为List，
* list任意一个item转换失败都会导致这个list为null。
- *
+ *
* TODO 需要在Converter中添加ConvertOption，用于更细粒度的控制转换规则
*/
public class Issue1200Test {
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java
rename to hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java
index c1aa1e08c..7e09aedd5 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java
@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
/**
* https://gitee.com/loolly/dashboard/issues?id=I1F8M2
*/
-public class IssueI1F8M2 {
+public class IssueI1F8M2Test {
@Test
public void toBeanTest() {
final String jsonStr = "{\"eventType\":\"fee\",\"fwdAlertingTime\":\"2020-04-22 16:34:13\",\"fwdAnswerTime\":\"\"}";
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java
similarity index 97%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java
rename to hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java
index aeea875a0..423bab1e2 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java
@@ -11,7 +11,7 @@ import java.util.List;
* 此问题原来出在BeanCopier中，判断循环引用使用了equals，并不严谨。
* 修复后使用==判断循环引用。
*/
-public class IssueI1H2VN {
+public class IssueI1H2VNTest {
@Test
public void toBeanTest() {
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java b/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java
rename to hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java
index d7927a4ec..da320e45f 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java
@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
/**
* 测试带毫秒的日期转换
*/
-public class IssueI3BS4S {
+public class IssueI3BS4STest {
@Test
public void toBeanTest(){
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java b/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java
rename to hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java
index 7c61f8a30..9d65c78af 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java
@@ -5,7 +5,7 @@ import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
-public class IssueI3EGJP {
+public class IssueI3EGJPTest {
@Test
public void hutoolMapToBean() {
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
index 6ad70ddb2..e87bda2b1 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
@@ -2,7 +2,6 @@ package cn.hutool.json;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.math.NumberUtil;
import cn.hutool.json.serialize.JSONStringer;
@@ -14,11 +13,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
public class JSONUtilTest {
diff --git a/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java b/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java
index 2243a32f5..bccee300e 100644
--- a/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java
@@ -12,9 +12,8 @@ public class GlobalValueWriterMappingTest {
@Before
public void init(){
- GlobalValueWriterMapping.put(CustomSubBean.class, (JSONValueWriter
*
* @param session 本次需要解码的session
* @param readBuffer 待处理的读buffer
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
index 1d6881a65..f7f5ad023 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
@@ -31,6 +31,7 @@ public enum ScaleType {
*/
AREA_AVERAGING(Image.SCALE_AREA_AVERAGING);
+ private final int value;
/**
* 构造
*
@@ -45,8 +46,6 @@ public enum ScaleType {
this.value = value;
}
- private final int value;
-
/**
* 获取值
*
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java
index cd228fafd..bc343c373 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java
@@ -10,8 +10,15 @@ import java.util.LinkedHashMap;
* @author Tom Xin
*/
public class Ansi4bitMapping extends AnsiLabMapping {
+
+ /**
+ * 单例
+ */
public static final Ansi4bitMapping INSTANCE = new Ansi4bitMapping();
+ /**
+ * 构造
+ */
public Ansi4bitMapping() {
ansiLabMap = new LinkedHashMap<>(16, 1);
ansiLabMap.put(Ansi4BitColor.BLACK, new LabColor(0x000000));
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java
index e380138ff..710d764f6 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java
@@ -38,8 +38,14 @@ public class Ansi8bitMapping extends AnsiLabMapping {
0x808080, 0x8a8a8a, 0x949494, 0x9e9e9e, 0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada,
0xe4e4e4, 0xeeeeee };
+ /**
+ * 单例
+ */
public static final Ansi8bitMapping INSTANCE = new Ansi8bitMapping();
+ /**
+ * 构造
+ */
public Ansi8bitMapping() {
ansiLabMap = new LinkedHashMap<>(256, 1);
for (int i = 0; i < ANSI_8BIT_COLOR_CODE_LOOKUP.length; i++) {
+ *
*
+ * @param intValue 季度int表示
+ * @return {@code Quarter}
* @see #Q1
* @see #Q2
* @see #Q3
* @see #Q4
- *
- * @param intValue 季度int表示
- * @return {@link Quarter}
*/
public static Quarter of(final int intValue) {
switch (intValue) {
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java b/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
index 5f9cf30f7..dd6f960e9 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java
@@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit;
* System.currentTimeMillis()的调用比new一个普通对象要耗时的多（具体耗时高出多少我还没测试过，有人说是100倍左右）
* System.currentTimeMillis()之所以慢是因为去跟系统打了一次交道
* 后台定时更新时钟，JVM退出时，线程自动回收
- *
+ *
*
*
* @param bound 边界
* @return 位置
*/
+ @SuppressWarnings("ComparatorMethodParameterNotUsed")
@Override
public int compareTo(final Bound
* 参数必须是 `偶数` 且 `大于等于0`！
- *
+ *
* replaceFun可以通过{@link Matcher}提取出匹配到的内容的不同部分，然后经过重新处理、组装变成新的内容放回原位。
- *
+ *
* replaceAll(this.content, "(\\d+)", parameters -> "-" + parameters.group(1) + "-")
* // 结果为："ZZZaaabbbccc中文-1234-"
@@ -912,7 +912,7 @@ public class ReUtil {
/**
* 替换所有正则匹配的文本，并使用自定义函数决定如何替换
* replaceFun可以通过{@link Matcher}提取出匹配到的内容的不同部分，然后经过重新处理、组装变成新的内容放回原位。
- *
+ *
* replaceAll(this.content, "(\\d+)", parameters -> "-" + parameters.group(1) + "-")
* // 结果为："ZZZaaabbbccc中文-1234-"
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java b/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
index cffdfa3ae..7fa9b3dd2 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
@@ -513,6 +513,13 @@ public class AntPathMatcher {
return builder.toString();
}
+ /**
+ * 提取参数
+ *
+ * @param pattern 模式
+ * @param path 路径
+ * @return 参数
+ */
public Map
* 有时候在线程池内访问第三方接口，只希望固定并发数去访问，并且不希望丢弃任务时使用此策略，队列满的时候会处于阻塞状态(例如刷库的场景)
- *
+ *
* 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做签名或验证
*
@@ -144,7 +144,7 @@ public class Sign extends BaseAsymmetric
* 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做签名或验证
*
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/fpe/FPE.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/fpe/FPE.java
rename to hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java
index 377f1cb92..e1902fb9f 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/fpe/FPE.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java
@@ -1,8 +1,7 @@
-package cn.hutool.crypto.symmetric.fpe;
+package cn.hutool.crypto.symmetric;
import cn.hutool.crypto.KeyUtil;
import cn.hutool.crypto.Padding;
-import cn.hutool.crypto.symmetric.AES;
import org.bouncycastle.crypto.AlphabetMapper;
import org.bouncycastle.jcajce.spec.FPEParameterSpec;
@@ -24,7 +23,7 @@ import java.io.Serializable;
*
* 此接口用于实现{@link ResultSet} 转换或映射为用户指定的pojo对象
- *
+ *
* 结果集处理后不需要关闭
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java b/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java
index cee36bc26..d0507f210 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java
+++ b/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java
@@ -10,64 +10,177 @@ import java.util.Map;
* @see java.sql.Types
*/
public enum JdbcType {
- ARRAY(java.sql.Types.ARRAY), //
- BIT(java.sql.Types.BIT), //
- TINYINT(java.sql.Types.TINYINT), //
- SMALLINT(java.sql.Types.SMALLINT), //
- INTEGER(java.sql.Types.INTEGER), //
- BIGINT(java.sql.Types.BIGINT), //
- FLOAT(java.sql.Types.FLOAT), //
- REAL(java.sql.Types.REAL), //
- DOUBLE(java.sql.Types.DOUBLE), //
- NUMERIC(java.sql.Types.NUMERIC), //
- DECIMAL(java.sql.Types.DECIMAL), //
- CHAR(java.sql.Types.CHAR), //
- VARCHAR(java.sql.Types.VARCHAR), //
- LONGVARCHAR(java.sql.Types.LONGVARCHAR), //
- DATE(java.sql.Types.DATE), //
- TIME(java.sql.Types.TIME), //
- TIMESTAMP(java.sql.Types.TIMESTAMP), //
- BINARY(java.sql.Types.BINARY), //
- VARBINARY(java.sql.Types.VARBINARY), //
- LONGVARBINARY(java.sql.Types.LONGVARBINARY), //
- NULL(java.sql.Types.NULL), //
- OTHER(java.sql.Types.OTHER), //
- BLOB(java.sql.Types.BLOB), //
- CLOB(java.sql.Types.CLOB), //
- BOOLEAN(java.sql.Types.BOOLEAN), //
- CURSOR(-10), // Oracle
- UNDEFINED(Integer.MIN_VALUE + 1000), //
- NVARCHAR(java.sql.Types.NVARCHAR), // JDK6
- NCHAR(java.sql.Types.NCHAR), // JDK6
- NCLOB(java.sql.Types.NCLOB), // JDK6
- STRUCT(java.sql.Types.STRUCT), //
- JAVA_OBJECT(java.sql.Types.JAVA_OBJECT), //
- DISTINCT(java.sql.Types.DISTINCT), //
- REF(java.sql.Types.REF), //
- DATALINK(java.sql.Types.DATALINK), //
- ROWID(java.sql.Types.ROWID), // JDK6
- LONGNVARCHAR(java.sql.Types.LONGNVARCHAR), // JDK6
- SQLXML(java.sql.Types.SQLXML), // JDK6
- DATETIMEOFFSET(-155), // SQL Server 2008
- TIME_WITH_TIMEZONE(2013), // JDBC 4.2 JDK8
- TIMESTAMP_WITH_TIMEZONE(2014); // JDBC 4.2 JDK8
-
- public final int typeCode;
-
/**
- * 构造
- *
- * @param code {@link java.sql.Types} 中对应的值
+ * {@link java.sql.Types#ARRAY}
*/
- JdbcType(final int code) {
- this.typeCode = code;
- }
+ ARRAY(java.sql.Types.ARRAY), //
+ /**
+ * {@link java.sql.Types#BIT}
+ */
+ BIT(java.sql.Types.BIT), //
+ /**
+ * {@link java.sql.Types#TINYINT}
+ */
+ TINYINT(java.sql.Types.TINYINT), //
+ /**
+ * {@link java.sql.Types#SMALLINT}
+ */
+ SMALLINT(java.sql.Types.SMALLINT), //
+ /**
+ * {@link java.sql.Types#INTEGER}
+ */
+ INTEGER(java.sql.Types.INTEGER), //
+ /**
+ * {@link java.sql.Types#BIGINT}
+ */
+ BIGINT(java.sql.Types.BIGINT), //
+ /**
+ * {@link java.sql.Types#FLOAT}
+ */
+ FLOAT(java.sql.Types.FLOAT), //
+ /**
+ * {@link java.sql.Types#REAL}
+ */
+ REAL(java.sql.Types.REAL), //
+ /**
+ * {@link java.sql.Types#DOUBLE}
+ */
+ DOUBLE(java.sql.Types.DOUBLE), //
+ /**
+ * {@link java.sql.Types#NUMERIC}
+ */
+ NUMERIC(java.sql.Types.NUMERIC), //
+ /**
+ * {@link java.sql.Types#DECIMAL}
+ */
+ DECIMAL(java.sql.Types.DECIMAL), //
+ /**
+ * {@link java.sql.Types#CHAR}
+ */
+ CHAR(java.sql.Types.CHAR), //
+ /**
+ * {@link java.sql.Types#VARCHAR}
+ */
+ VARCHAR(java.sql.Types.VARCHAR), //
+ /**
+ * {@link java.sql.Types#LONGVARCHAR}
+ */
+ LONGVARCHAR(java.sql.Types.LONGVARCHAR), //
+ /**
+ * {@link java.sql.Types#DATE}
+ */
+ DATE(java.sql.Types.DATE), //
+ /**
+ * {@link java.sql.Types#TIME}
+ */
+ TIME(java.sql.Types.TIME), //
+ /**
+ * {@link java.sql.Types#TIMESTAMP}
+ */
+ TIMESTAMP(java.sql.Types.TIMESTAMP), //
+ /**
+ * {@link java.sql.Types#BINARY}
+ */
+ BINARY(java.sql.Types.BINARY), //
+ /**
+ * {@link java.sql.Types#VARBINARY}
+ */
+ VARBINARY(java.sql.Types.VARBINARY), //
+ /**
+ * {@link java.sql.Types#LONGVARBINARY}
+ */
+ LONGVARBINARY(java.sql.Types.LONGVARBINARY), //
+ /**
+ * {@link java.sql.Types#NULL}
+ */
+ NULL(java.sql.Types.NULL), //
+ /**
+ * {@link java.sql.Types#OTHER}
+ */
+ OTHER(java.sql.Types.OTHER), //
+ /**
+ * {@link java.sql.Types#BLOB}
+ */
+ BLOB(java.sql.Types.BLOB), //
+ /**
+ * {@link java.sql.Types#CLOB}
+ */
+ CLOB(java.sql.Types.CLOB), //
+ /**
+ * {@link java.sql.Types#BOOLEAN}
+ */
+ BOOLEAN(java.sql.Types.BOOLEAN), //
+ /**
+ * Oracle Cursor
+ */
+ CURSOR(-10), // Oracle
+ /**
+ * UNDEFINED
+ */
+ UNDEFINED(Integer.MIN_VALUE + 1000), //
+ /**
+ * {@link java.sql.Types#NVARCHAR}
+ */
+ NVARCHAR(java.sql.Types.NVARCHAR), // JDK6
+ /**
+ * {@link java.sql.Types#NCHAR}
+ */
+ NCHAR(java.sql.Types.NCHAR), // JDK6
+ /**
+ * {@link java.sql.Types#NCLOB}
+ */
+ NCLOB(java.sql.Types.NCLOB), // JDK6
+ /**
+ * {@link java.sql.Types#STRUCT}
+ */
+ STRUCT(java.sql.Types.STRUCT),
+ /**
+ * {@link java.sql.Types#JAVA_OBJECT}
+ */
+ JAVA_OBJECT(java.sql.Types.JAVA_OBJECT),
+ /**
+ * {@link java.sql.Types#DISTINCT}
+ */
+ DISTINCT(java.sql.Types.DISTINCT),
+ /**
+ * {@link java.sql.Types#REF}
+ */
+ REF(java.sql.Types.REF),
+ /**
+ * {@link java.sql.Types#BOOLEAN}
+ */
+ DATALINK(java.sql.Types.DATALINK), //
+ /**
+ * {@link java.sql.Types#ROWID}
+ */
+ ROWID(java.sql.Types.ROWID), // JDK6
+ /**
+ * {@link java.sql.Types#LONGNVARCHAR}
+ */
+ LONGNVARCHAR(java.sql.Types.LONGNVARCHAR), // JDK6
+ /**
+ * {@link java.sql.Types#SQLXML}
+ */
+ SQLXML(java.sql.Types.SQLXML), // JDK6
+ /**
+ * SQL Server 2008 DateTimeOffset
+ */
+ DATETIMEOFFSET(-155), // SQL Server 2008
+ /**
+ * Time With TimeZone
+ */
+ TIME_WITH_TIMEZONE(2013), // JDBC 4.2 JDK8
+ /**
+ * TimeStamp With TimeZone
+ */
+ TIMESTAMP_WITH_TIMEZONE(2014); // JDBC 4.2 JDK8
// 此处无写操作，使用HashMap没有线程安全问题
private static final Map
* 4、将$Proxy0的实例返回给客户端。
* 5、当调用代理类的相应方法时，相当于调用 {@link InvocationHandler#invoke(Object, java.lang.reflect.Method, Object[])} 方法
- *
+ *
*
*
*
* @author Looly
- *
*/
public class TinyLog2 extends AbstractLog {
private static final long serialVersionUID = 1L;
- /** 堆栈增加层数，因为封装因此多了两层，此值用于正确获取当前类名 */
+ /**
+ * 堆栈增加层数，因为封装因此多了两层，此值用于正确获取当前类名
+ */
private static final int DEPTH = 5;
private final int level;
@@ -31,10 +32,21 @@ public class TinyLog2 extends AbstractLog {
Configuration.getLocale(),
Configuration.isEscapingEnabled()
);
+
+ /**
+ * 构造
+ *
+ * @param clazz class
+ */
public TinyLog2(final Class clazz) {
this(null == clazz ? StrUtil.NULL : clazz.getName());
}
+ /**
+ * 构造
+ *
+ * @param name 名称
+ */
public TinyLog2(final String name) {
this.name = name;
this.level = provider.getMinimumLevel().ordinal();
@@ -66,6 +78,7 @@ public class TinyLog2 extends AbstractLog {
public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) {
logIfEnabled(fqcn, Level.DEBUG, t, format, arguments);
}
+
// ------------------------------------------------------------------------- Info
@Override
public boolean isInfoEnabled() {
@@ -112,15 +125,17 @@ public class TinyLog2 extends AbstractLog {
/**
* 在对应日志级别打开情况下打印日志
- * @param fqcn 完全限定类名(Fully Qualified Class Name)，用于定位日志位置
- * @param level 日志级别
- * @param t 异常，null则检查最后一个参数是否为Throwable类型，是则取之，否则不打印堆栈
- * @param format 日志消息模板
+ *
+ * @param fqcn 完全限定类名(Fully Qualified Class Name)，用于定位日志位置
+ * @param level 日志级别
+ * @param t 异常，null则检查最后一个参数是否为Throwable类型，是则取之，否则不打印堆栈
+ * @param format 日志消息模板
* @param arguments 日志消息参数
*/
+ @SuppressWarnings("unused")
private void logIfEnabled(final String fqcn, final Level level, Throwable t, final String format, final Object... arguments) {
// fqcn 无效
- if(null == t){
+ if (null == t) {
t = getLastArgumentIfThrowable(arguments);
}
provider.log(DEPTH, null, level, t, formatter, StrUtil.toString(format), arguments);
@@ -136,26 +151,26 @@ public class TinyLog2 extends AbstractLog {
private Level toTinyLevel(final cn.hutool.log.level.Level level) {
final Level tinyLevel;
switch (level) {
- case TRACE:
- tinyLevel = Level.TRACE;
- break;
- case DEBUG:
- tinyLevel = Level.DEBUG;
- break;
- case INFO:
- tinyLevel = Level.INFO;
- break;
- case WARN:
- tinyLevel = Level.WARN;
- break;
- case ERROR:
- tinyLevel = Level.ERROR;
- break;
- case OFF:
- tinyLevel = Level.OFF;
- break;
- default:
- throw new Error(StrUtil.format("Can not identify level: {}", level));
+ case TRACE:
+ tinyLevel = Level.TRACE;
+ break;
+ case DEBUG:
+ tinyLevel = Level.DEBUG;
+ break;
+ case INFO:
+ tinyLevel = Level.INFO;
+ break;
+ case WARN:
+ tinyLevel = Level.WARN;
+ break;
+ case ERROR:
+ tinyLevel = Level.ERROR;
+ break;
+ case OFF:
+ tinyLevel = Level.OFF;
+ break;
+ default:
+ throw new Error(StrUtil.format("Can not identify level: {}", level));
}
return tinyLevel;
}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java
index 4ecf2dc90..0da6021a0 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java
@@ -2,10 +2,21 @@ package cn.hutool.poi.excel.style;
/**
* 对齐方式枚举
- *
+ *
* @author looly
* @since 4.1.0
*/
public enum Align {
- LEFT, RIGHT, CENTER
+ /**
+ * 左对齐
+ */
+ LEFT,
+ /**
+ * 右对齐
+ */
+ RIGHT,
+ /**
+ * 居中
+ */
+ CENTER
}
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java b/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java
index 828418714..fb2ec3a0c 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java
+++ b/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java
@@ -6,7 +6,7 @@ import cn.hutool.socket.aio.AioSession;
/**
* 消息解码器
- *
+ *
* @author looly
*
* @param