From f9b29c5f2a086c2de2899208696b9a7c9d6d123f Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 12 Jul 2021 20:22:30 +0800 Subject: [PATCH] add NanoId --- CHANGELOG.md | 1 + hutool-all/pom.xml | 4 +- hutool-aop/pom.xml | 4 +- hutool-bloomFilter/pom.xml | 8 +- hutool-bom/pom.xml | 4 +- hutool-cache/pom.xml | 8 +- hutool-captcha/pom.xml | 8 +- .../main/java/cn/hutool/core/lang/NanoId.java | 104 -------- .../java/cn/hutool/core/lang/id/NanoId.java | 103 ++++++++ .../cn/hutool/core/lang/id/package-info.java | 7 + .../main/java/cn/hutool/core/util/IdUtil.java | 31 +-- .../java/cn/hutool/core/lang/NanoIdTest.java | 247 ++++++++---------- hutool-cron/pom.xml | 8 +- hutool-db/pom.xml | 4 +- hutool-dfa/pom.xml | 8 +- hutool-extra/pom.xml | 4 +- hutool-http/pom.xml | 4 +- hutool-json/pom.xml | 4 +- hutool-jwt/pom.xml | 4 +- hutool-log/pom.xml | 4 +- hutool-poi/pom.xml | 5 +- hutool-script/pom.xml | 3 +- hutool-setting/pom.xml | 4 +- hutool-socket/pom.xml | 6 +- hutool-system/pom.xml | 4 +- pom.xml | 10 +- 26 files changed, 294 insertions(+), 307 deletions(-) delete mode 100644 hutool-core/src/main/java/cn/hutool/core/lang/NanoId.java create mode 100644 hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java create mode 100755 hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java diff --git a/CHANGELOG.md b/CHANGELOG.md index de9a705f4..434d8b8c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ### 🐣新特性 * 【core 】 DateUtil增加ceiling重载，可选是否归零毫秒 * 【core 】 IterUtil增加firstMatch方法 +* 【core 】 增加NanoId ### 🐞Bug修复 * 【core 】 修复FileUtil.normalize处理上级路径的问题（issue#I3YPEH@Gitee） diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index e49f4eada..4977b7aa6 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index 3b12e990b..b26bf1051 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 9061a6120..f15c7580a 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 jar - + cn.hutool hutool-parent @@ -13,7 +15,7 @@ hutool-bloomFilter ${project.artifactId} Hutool 布隆过滤器 - + cn.hutool diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index a30ea004d..fa9b8326b 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 pom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 8667fc623..6c93bbd83 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 jar - + cn.hutool hutool-parent @@ -13,7 +15,7 @@ hutool-cache ${project.artifactId} Hutool 缓存 - + cn.hutool diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index ac155a06e..61d79e1f0 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 jar - + cn.hutool hutool-parent @@ -13,7 +15,7 @@ hutool-captcha ${project.artifactId} Hutool 验证码工具 - + cn.hutool diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/NanoId.java b/hutool-core/src/main/java/cn/hutool/core/lang/NanoId.java deleted file mode 100644 index aa3f70d28..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/lang/NanoId.java +++ /dev/null @@ -1,104 +0,0 @@ -package cn.hutool.core.lang; - -import java.security.SecureRandom; -import java.util.Random; - -/** - * A class for generating unique String IDs. - * - * The implementations of the core logic in this class are based on NanoId, a JavaScript - * library by Andrey Sitnik released under the MIT license. (https://github.com/ai/nanoid) - * - * @author David Klebanoff - */ -public final class NanoId { - - /** - * NanoIdUtils instances should NOT be constructed in standard programming. - * Instead, the class should be used as NanoIdUtils.randomNanoId();. - */ - private NanoId() { - //Do Nothing - } - - /** - * The default random number generator used by this class. - * Creates cryptographically strong NanoId Strings. - */ - public static final SecureRandom DEFAULT_NUMBER_GENERATOR = new SecureRandom(); - - /** - * The default alphabet used by this class. - * Creates url-friendly NanoId Strings using 64 unique symbols. - */ - public static final char[] DEFAULT_ALPHABET = - "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray(); - - /** - * The default size used by this class. - * Creates NanoId Strings with slightly more unique values than UUID v4. - */ - public static final int DEFAULT_SIZE = 21; - - /** - * Static factory to retrieve a url-friendly, pseudo randomly generated, NanoId String. - * - * The generated NanoId String will have 21 symbols. - * - * The NanoId String is generated using a cryptographically strong pseudo random number - * generator. - * - * @return A randomly generated NanoId String. - */ - public static String randomNanoId() { - return randomNanoId(DEFAULT_NUMBER_GENERATOR, DEFAULT_ALPHABET, DEFAULT_SIZE); - } - - /** - * Static factory to retrieve a NanoId String. - * - * The string is generated using the given random number generator. - * - * @param random The random number generator. - * @param alphabet The symbols used in the NanoId String. - * @param size The number of symbols in the NanoId String. - * @return A randomly generated NanoId String. - */ - public static String randomNanoId(final Random random, final char[] alphabet, final int size) { - - if (random == null) { - throw new IllegalArgumentException("random cannot be null."); - } - - if (alphabet == null) { - throw new IllegalArgumentException("alphabet cannot be null."); - } - - if (alphabet.length == 0 || alphabet.length >= 256) { - throw new IllegalArgumentException("alphabet must contain between 1 and 255 symbols."); - } - - if (size <= 0) { - throw new IllegalArgumentException("size must be greater than zero."); - } - - final int mask = (2 << (int) Math.floor(Math.log(alphabet.length - 1) / Math.log(2))) - 1; - final int step = (int) Math.ceil(1.6 * mask * size / alphabet.length); - - final StringBuilder idBuilder = new StringBuilder(); - - while (true) { - final byte[] bytes = new byte[step]; - random.nextBytes(bytes); - for (int i = 0; i < step; i++) { - final int alphabetIndex = bytes[i] & mask; - if (alphabetIndex < alphabet.length) { - idBuilder.append(alphabet[alphabetIndex]); - if (idBuilder.length() == size) { - return idBuilder.toString(); - } - } - } - } - } -} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java new file mode 100644 index 000000000..67045b9e4 --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java @@ -0,0 +1,103 @@ +package cn.hutool.core.lang.id; + +import cn.hutool.core.util.RandomUtil; + +import java.security.SecureRandom; +import java.util.Random; + +/** + * NanoId，一个小型、安全、对 URL友好的唯一字符串 ID 生成器，特点： + * + *
    + *
  • 安全：它使用加密、强大的随机 API，并保证符号的正确分配
    • + *
  • 体积小：只有 258 bytes 大小（压缩后）、无依赖
    • + *
  • 紧凑：它使用比 UUID (A-Za-z0-9_~)更多的符号
    • + *
+ * + *

+ * 此实现的逻辑基于JavaScript的NanoId实现，见：https://github.com/ai/nanoid + * + * @author David Klebanoff + */ +public class NanoId { + + /** + * 默认随机数生成器，使用{@link SecureRandom}确保健壮性 + */ + private static final SecureRandom DEFAULT_NUMBER_GENERATOR = RandomUtil.getSecureRandom(); + + /** + * 默认随机字母表，使用URL安全的Base64字符 + */ + private static final char[] DEFAULT_ALPHABET = + "_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray(); + + /** + * 默认长度 + */ + public static final int DEFAULT_SIZE = 21; + + /** + * 生成伪随机的NanoId字符串，长度为默认的{@link #DEFAULT_SIZE}，使用密码安全的伪随机生成器 + * + * @return 伪随机的NanoId字符串 + */ + public static String randomNanoId() { + return randomNanoId(DEFAULT_SIZE); + } + + /** + * 生成伪随机的NanoId字符串 + * + * @param size ID长度 + * @return 伪随机的NanoId字符串 + */ + public static String randomNanoId(int size) { + return randomNanoId(null, null, size); + } + + /** + * 生成伪随机的NanoId字符串 + * + * @param random 随机数生成器 + * @param alphabet 随机字母表 + * @param size ID长度 + * @return 伪随机的NanoId字符串 + */ + public static String randomNanoId(Random random, char[] alphabet, int size) { + if (random == null) { + random = DEFAULT_NUMBER_GENERATOR; + } + + if (alphabet == null) { + alphabet = DEFAULT_ALPHABET; + } + + if (alphabet.length == 0 || alphabet.length >= 256) { + throw new IllegalArgumentException("Alphabet must contain between 1 and 255 symbols."); + } + + if (size <= 0) { + throw new IllegalArgumentException("Size must be greater than zero."); + } + + final int mask = (2 << (int) Math.floor(Math.log(alphabet.length - 1) / Math.log(2))) - 1; + final int step = (int) Math.ceil(1.6 * mask * size / alphabet.length); + + final StringBuilder idBuilder = new StringBuilder(); + + while (true) { + final byte[] bytes = new byte[step]; + random.nextBytes(bytes); + for (int i = 0; i < step; i++) { + final int alphabetIndex = bytes[i] & mask; + if (alphabetIndex < alphabet.length) { + idBuilder.append(alphabet[alphabetIndex]); + if (idBuilder.length() == size) { + return idBuilder.toString(); + } + } + } + } + } +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java new file mode 100755 index 000000000..13e9d2e8b --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java @@ -0,0 +1,7 @@ +/** + * 提供各种ID生成 + * + * @author looly + * @since 5.7.5 + */ +package cn.hutool.core.lang.id; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java index 3fd6fd81c..77897aef0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java @@ -1,14 +1,13 @@ package cn.hutool.core.util; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.*; +import cn.hutool.core.lang.ObjectId; +import cn.hutool.core.lang.Singleton; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.lang.UUID; +import cn.hutool.core.lang.id.NanoId; import cn.hutool.core.net.NetUtil; -import java.util.Random; - -import static cn.hutool.core.lang.NanoId.DEFAULT_ALPHABET; -import static cn.hutool.core.lang.NanoId.DEFAULT_NUMBER_GENERATOR; - /** * ID生成器工具类，此工具类中主要封装： * @@ -241,24 +240,26 @@ public class IdUtil { */ return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1); } - // ------------------------------------------------------------------- NanoId + + // ------------------------------------------------------------------- NanoId /** * 获取随机NanoId * * @return 随机NanoId + * @since 5.7.5 */ - public static String randomNanoId() { + public static String nanoId() { return NanoId.randomNanoId(); } + /** - * Static factory to retrieve a NanoId String. + * 获取随机NanoId * - * The string is generated using the given random number generator. - * - * @param size The number of symbols in the NanoId String. - * @return A randomly generated NanoId String. + * @param size ID中的字符数量 + * @return 随机NanoId + * @since 5.7.5 */ - public static String randomNanoId(final int size){ - return NanoId.randomNanoId(DEFAULT_NUMBER_GENERATOR, DEFAULT_ALPHABET, size); + public static String nanoId(int size){ + return NanoId.randomNanoId(size); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java index ab74b71a2..a6cf6f34a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java @@ -1,12 +1,9 @@ package cn.hutool.core.lang; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; +import cn.hutool.core.lang.id.NanoId; +import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.results.ResultMatchers; -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; import java.security.SecureRandom; import java.util.HashMap; import java.util.HashSet; @@ -20,182 +17,154 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * Tests for NanoIdUtils. + * Tests for NanoId. * - * @author David Klebanoff + * @author David Klebanoff, Looly * @see NanoId */ public class NanoIdTest { - @Test - public void NanoId_VerifyClassIsFinal_Verified() { - if ((NanoId.class.getModifiers() & Modifier.FINAL) != Modifier.FINAL) { - fail("The class is not final"); - } - } + @Test + public void nanoIdVerify100KRandomNanoIdsAreUniqueVerifiedTest() { - @Test - public void NanoId_VerifyConstructorsArePrivate_Verified() { - for (final Constructor constructor : NanoId.class.getConstructors()) { - if ((constructor.getModifiers() & Modifier.PRIVATE) != Modifier.PRIVATE) { - fail("The class has a non-private constructor."); - } - } - } + //It's not much, but it's a good sanity check I guess. + final int idCount = 100000; + final Set ids = new HashSet<>(idCount); - @Test - public void NanoId_Verify100KRandomNanoIdsAreUnique_Verified() { + for (int i = 0; i < idCount; i++) { + final String id = NanoId.randomNanoId(); + if (ids.contains(id) == false) { + ids.add(id); + } else { + fail("Non-unique ID generated: " + id); + } + } - //It's not much, but it's a good sanity check I guess. - final int idCount = 100000; - final Set ids = new HashSet<>(idCount); + } - for (int i = 0; i < idCount; i++) { - final String id = NanoId.randomNanoId(); - if (ids.contains(id) == false) { - ids.add(id); - } else { - fail("Non-unique ID generated: " + id); - } - } + @Test + public void nanoIdSeededRandomSuccessTest() { - } + //With a seed provided, we can know which IDs to expect, and subsequently verify that the + // provided random number generator is being used as expected. + final Random random = new Random(12345); - @Test - public void NanoId_SeededRandom_Success() { + final char[] alphabet = + ("_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray(); - //With a seed provided, we can know which IDs to expect, and subsequently verify that the - // provided random number generator is being used as expected. - final Random random = new Random(12345); + final int size = 21; - final char[] alphabet = - ("_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray(); + final String[] expectedIds = new String[]{"kutqLNv1wDmIS56EcT3j7", "U497UttnWzKWWRPMHpLD7", + "7nj2dWW1gjKLtgfzeI8eC", "I6BXYvyjszq6xV7L9k2A9", "uIolcQEyyQIcn3iM6Odoa"}; - final int size = 21; + for (final String expectedId : expectedIds) { + final String generatedId = NanoId.randomNanoId(random, alphabet, size); + assertEquals(expectedId, generatedId); + } - final String[] expectedIds = new String[] {"kutqLNv1wDmIS56EcT3j7", "U497UttnWzKWWRPMHpLD7", - "7nj2dWW1gjKLtgfzeI8eC", "I6BXYvyjszq6xV7L9k2A9", "uIolcQEyyQIcn3iM6Odoa" }; + } - for (final String expectedId : expectedIds) { - final String generatedId = NanoId.randomNanoId(random, alphabet, size); - assertEquals(expectedId, generatedId); - } + @Test + public void nanoIdVariousAlphabetsSuccessTest() { - } + //Test ID generation with various alphabets consisting of 1 to 255 unique symbols. + for (int symbols = 1; symbols <= 255; symbols++) { - @Test - public void NanoId_VariousAlphabets_Success() { + final char[] alphabet = new char[symbols]; + for (int i = 0; i < symbols; i++) { + alphabet[i] = (char) i; + } - //Test ID generation with various alphabets consisting of 1 to 255 unique symbols. - for (int symbols = 1; symbols <= 255; symbols++) { + final String id = NanoId + .randomNanoId(null, alphabet, NanoId.DEFAULT_SIZE); - final char[] alphabet = new char[symbols]; - for (int i = 0; i < symbols; i++) { - alphabet[i] = (char) i; - } + //Create a regex pattern that only matches to the characters in the alphabet + final StringBuilder patternBuilder = new StringBuilder(); + patternBuilder.append("^["); + for (final char character : alphabet) { + patternBuilder.append(Pattern.quote(String.valueOf(character))); + } + patternBuilder.append("]+$"); - final String id = NanoId - .randomNanoId(NanoId.DEFAULT_NUMBER_GENERATOR, alphabet, - NanoId.DEFAULT_SIZE); + assertTrue(id.matches(patternBuilder.toString())); + } - //Create a regex pattern that only matches to the characters in the alphabet - final StringBuilder patternBuilder = new StringBuilder(); - patternBuilder.append("^["); - for (final char character : alphabet) { - patternBuilder.append(Pattern.quote(String.valueOf(character))); - } - patternBuilder.append("]+$"); + } - assertTrue(id.matches(patternBuilder.toString())); - } + @Test + public void nanoIdVariousSizesSuccessTest() { - } + //Test ID generation with all sizes between 1 and 1,000. + for (int size = 1; size <= 1000; size++) { - @Test - public void NanoId_VariousSizes_Success() { + final String id = NanoId.randomNanoId(size); - //Test ID generation with all sizes between 1 and 1,000. - for (int size = 1; size <= 1000; size++) { + assertEquals(size, id.length()); + } - final String id = NanoId.randomNanoId(NanoId.DEFAULT_NUMBER_GENERATOR, - NanoId.DEFAULT_ALPHABET, size); + } - assertEquals(size, id.length()); - } + @Test + public void nanoIdWellDistributedSuccess() { - } + //Test if symbols in the generated IDs are well distributed. - @Test - public void NanoId_WellDistributed_Success() { + final int idCount = 100000; + final int idSize = 20; + final char[] alphabet = "abcdefghijklmnopqrstuvwxyz".toCharArray(); - //Test if symbols in the generated IDs are well distributed. + final Map charCounts = new HashMap<>(); - final int idCount = 100000; - final int idSize = 20; - final char[] alphabet = "abcdefghijklmnopqrstuvwxyz".toCharArray(); + for (int i = 0; i < idCount; i++) { - final Map charCounts = new HashMap<>(); + final String id = NanoId + .randomNanoId(null, alphabet, idSize); - for (int i = 0; i < idCount; i++) { + for (int j = 0; j < id.length(); j++) { + final String value = String.valueOf(id.charAt(j)); - final String id = NanoId - .randomNanoId(NanoId.DEFAULT_NUMBER_GENERATOR, alphabet, idSize); + final Long charCount = charCounts.get(value); + if (charCount == null) { + charCounts.put(value, 1L); + } else { + charCounts.put(value, charCount + 1); + } + } + } - for (int j = 0; j < id.length(); j++) { - final String value = String.valueOf(id.charAt(j)); + //Verify the distribution of characters is pretty even + for (final Long charCount : charCounts.values()) { + final double distribution = (charCount * alphabet.length / (double) (idCount * idSize)); + Assert.assertTrue(distribution >= 0.95 && distribution <= 1.05); + } - final Long charCount = charCounts.get(value); - if (charCount == null) { - charCounts.put(value, 1L); - } else { - charCounts.put(value, charCount + 1); - } - } - } + } - //Verify the distribution of characters is pretty even - for (final Long charCount : charCounts.values()) { - final double distribution = (charCount * alphabet.length / (double) (idCount * idSize)); - MatcherAssert.assertThat(distribution, Matchers.closeTo(1.0, 0.05)); - } + @Test(expected = IllegalArgumentException.class) + public void randomNanoIdEmptyAlphabetExceptionThrownTest() { + NanoId.randomNanoId(new SecureRandom(), new char[]{}, 10); + } - } + @Test(expected = IllegalArgumentException.class) + public void randomNanoId256AlphabetExceptionThrownTest() { - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_NullRandom_ExceptionThrown() { - NanoId.randomNanoId(null, new char[] {'a', 'b', 'c'}, 10); - } + //The alphabet is composed of 256 unique characters + final char[] largeAlphabet = new char[256]; + for (int i = 0; i < 256; i++) { + largeAlphabet[i] = (char) i; + } - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_NullAlphabet_ExceptionThrown() { - NanoId.randomNanoId(new SecureRandom(), null, 10); - } + NanoId.randomNanoId(new SecureRandom(), largeAlphabet, 20); - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_EmptyAlphabet_ExceptionThrown() { - NanoId.randomNanoId(new SecureRandom(), new char[] {}, 10); - } + } - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_256Alphabet_ExceptionThrown() { + @Test(expected = IllegalArgumentException.class) + public void randomNanoIdNegativeSizeExceptionThrown() { + NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, -10); + } - //The alphabet is composed of 256 unique characters - final char[] largeAlphabet = new char[256]; - for (int i = 0; i < 256; i++) { - largeAlphabet[i] = (char) i; - } - - NanoId.randomNanoId(new SecureRandom(), largeAlphabet, 20); - - } - - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_NegativeSize_ExceptionThrown() { - NanoId.randomNanoId(new SecureRandom(), new char[] {'a', 'b', 'c'}, -10); - } - - @Test(expected = IllegalArgumentException.class) - public void randomNanoId_ZeroSize_ExceptionThrown() { - NanoId.randomNanoId(new SecureRandom(), new char[] {'a', 'b', 'c'}, 0); - } + @Test(expected = IllegalArgumentException.class) + public void randomNanoIdZeroSizeExceptionThrown() { + NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, 0); + } } diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index eb4bf7b18..fadd667e3 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 jar - + cn.hutool hutool-parent @@ -13,7 +15,7 @@ hutool-cron ${project.artifactId} Hutool 定时任务 - + cn.hutool diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index d806929e1..04d0dc98a 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index bcf4f42f0..e90626734 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 jar - + cn.hutool hutool-parent @@ -13,7 +15,7 @@ hutool-dfa ${project.artifactId} Hutool 基于DFA的关键词查找 - + cn.hutool diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index baa7c47b1..e7f0045dc 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 8d1f85443..edcb956f4 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 32ba503eb..236a90b5e 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index 89aa55591..536df3578 100644 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 jar diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index c60eac4ef..f01417c2f 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index c3eedb154..0cb52c0e6 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 jar diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 1da6bd444..f6c4d900d 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index b60d56c6c..e18fcfa0e 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 952857f3f..d7e1ae1ad 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar @@ -15,7 +15,7 @@ hutool-socket ${project.artifactId} Hutool套接字，包括BIO、NIO、AIO封装 - + cn.hutool diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 1b9a7345b..7e568c8cc 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 jar diff --git a/pom.xml b/pom.xml index 8cadcf1d2..8220386a4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 pom @@ -55,12 +55,6 @@ ${junit.version} test - - org.hamcrest - java-hamcrest - 2.0.0.0 - test - org.projectlombok lombok