diff --git a/CHANGELOG.md b/CHANGELOG.md index a7917c07f..0e0fd1c54 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.0.M5 (2022-04-28) +# 5.8.0.M5 (2022-05-05) ### ❌不兼容特性 * 【extra 】 升级jakarta.validation-api到3.x,包名变更导致不能向下兼容 @@ -12,6 +12,7 @@ ### 🐣新特性 * 【core 】 Singleton增加部分方法(pr#609@Gitee) * 【core 】 BeanUtil增加beanToMap重载(pr#2292@Github) +* 【core 】 Assert增加对应的equals及notEquals方法(pr#612@Gitee) ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题(issue#I54TZ9@Gitee) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java index b0b347c02..ec0b69b27 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java @@ -1060,8 +1060,8 @@ public class Assert { * @param obj2 对象2 * @throws IllegalArgumentException obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2) { - isEquals(obj1, obj2, "({}) must be equals ({})", obj1, obj2); + public static void equals(Object obj1, Object obj2) { + equals(obj1, obj2, "({}) must be equals ({})", obj1, obj2); } /** @@ -1076,8 +1076,8 @@ public class Assert { * @param params 异常信息参数,用于替换"{}"占位符 * @throws IllegalArgumentException obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { - isEquals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); + public static void equals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { + equals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); } /** @@ -1089,7 +1089,7 @@ public class Assert { * @param 异常类型 * @throws X obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2, Supplier errorSupplier) throws X { + public static void equals(Object obj1, Object obj2, Supplier errorSupplier) throws X { if (ObjectUtil.notEqual(obj1, obj2)) { throw errorSupplier.get(); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java index be095d835..7ddde8d47 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java @@ -38,14 +38,14 @@ public class AssertTest { } @Test - public void isEqualsTest() { + public void equalsTest() { //String a="ab"; //final String b = new String("abc"); String a = null; final String b = null; - Assert.isEquals(a, b); - Assert.isEquals(a, b, "{}不等于{}", a, b); - Assert.isEquals(a, b, () -> new RuntimeException(StrUtil.format("{}和{}不相等", a, b))); + Assert.equals(a, b); + Assert.equals(a, b, "{}不等于{}", a, b); + Assert.equals(a, b, () -> new RuntimeException(StrUtil.format("{}和{}不相等", a, b))); } @Test @@ -53,7 +53,7 @@ public class AssertTest { //String c="19"; //final String d = new String("19"); String c = null; - final String d = null; + final String d = "null"; //Assert.notEquals(c,d); //Assert.notEquals(c,d,"{}等于{}",c,d); Assert.notEquals(c, d, () -> new RuntimeException(StrUtil.format("{}和{}相等", c, d)));