diff --git a/CHANGELOG.md b/CHANGELOG.md index ae65a09bb..6219ce04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * 【core 】 增加XmlUtil.setNamespaceAware,getByPath支持UniversalNamespaceCache * 【aop 】 增加Spring-cglib支持,改为SPI实现 * 【json 】 增加JSONUtil.parseXXX增加JSONConfig参数 +* 【core 】 RandomUtil.randomNumber改为返回char ### Bug修复 * 【json 】 修复解析JSON字符串时配置无法传递问题 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java index f15665bf7..e2b47675a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java @@ -1,5 +1,14 @@ package cn.hutool.core.util; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.exceptions.UtilException; +import cn.hutool.core.lang.UUID; +import cn.hutool.core.lang.WeightRandom; +import cn.hutool.core.lang.WeightRandom.WeightObj; + import java.awt.Color; import java.math.BigDecimal; import java.math.RoundingMode; @@ -14,15 +23,6 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.UUID; -import cn.hutool.core.lang.WeightRandom; -import cn.hutool.core.lang.WeightRandom.WeightObj; - /** * 随机工具类 * @@ -487,7 +487,7 @@ public class RandomUtil { * @return 随机数字字符 * @since 3.1.2 */ - public static int randomNumber() { + public static char randomNumber() { return randomChar(BASE_NUMBER); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java index 99553f241..4193ba412 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java @@ -3,9 +3,6 @@ package cn.hutool.core.util; import org.junit.Assert; import org.junit.Test; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.HexUtil; - /** * HexUtil单元测试 * @author Looly diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java index b37e10098..c17eac233 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java @@ -35,4 +35,10 @@ public class RandomUtilTest { public void randomBooleanTest() { Console.log(RandomUtil.randomBoolean()); } + + @Test + public void randomNumberTest() { + final char c = RandomUtil.randomNumber(); + Assert.assertTrue(c <= '9'); + } }