From 5fb8f1b8576c2117154511b555910e9e025bf2ca Mon Sep 17 00:00:00 2001 From: lvcn <13819193282@139.com> Date: Thu, 30 Sep 2021 17:20:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20typo,=20removeEqual=E5=AF=B9value?= =?UTF-8?q?=E4=B8=BAnull=E6=83=85=E5=86=B5=E6=9C=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/lang/Dict.java | 5 +++-- .../test/java/cn/hutool/core/lang/DictTest.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java index ac384c9ca..168dfba4a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Objects; /** * 字典对象,扩充了HashMap中的方法 @@ -74,7 +75,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * 根据给定的键值对数组创建Dict对象,传入参数必须为key,value,key,value... * *

奇数参数必须为key,key最后会转换为String类型。

- *

奇数参数必须为value,可以为任意类型。

+ *

偶数参数必须为value,可以为任意类型。

* *
 	 * Dict dict = Dict.of(
@@ -291,7 +292,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett
 			}
 
 			final Object value = this.get(entry.getKey());
-			if (null != value && value.equals(entry.getValue())) {
+			if (Objects.equals(value, entry.getValue())) {
 				this.remove(entry.getKey());
 			}
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
index 77e2a3fa7..81762662d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
@@ -43,4 +43,19 @@ public class DictTest {
 		Assert.assertEquals("#00FF00", dict.get("GREEN"));
 		Assert.assertEquals("#0000FF", dict.get("BLUE"));
 	}
+
+	@Test
+	public void removeEqualTest(){
+		Dict dict = Dict.of(
+			"key1", null
+		);
+
+		Dict dict2 = Dict.of(
+			"key1", null
+		);
+
+		dict.removeEqual(dict2);
+
+		Assert.assertTrue(dict.isEmpty());
+	}
 }