From bb85c4092439ac634cb6e53994ea980fd64878b6 Mon Sep 17 00:00:00 2001
From: wenbei <569063716@qq.com>
Date: Tue, 26 Jul 2022 12:33:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=20Convert.toMap=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=B3=A8=E9=87=8A=EF=BC=8C=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=202.=E5=88=A0=E9=99=A4mapToMapWithSelfTypeTe?=
 =?UTF-8?q?st=E6=96=B9=E6=B3=95=E5=A4=9A=E4=BD=99=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/convert/Convert.java  | 10 +++++-----
 .../java/cn/hutool/core/convert/ConvertToBeanTest.java |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java
index 7bc2a5b88..47f089630 100755
--- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java
+++ b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java
@@ -601,7 +601,7 @@ public class Convert {
 	}
 
 	/**
-	 * 转换为Map，若value原本就是Map，则使用原始类型若不是
+	 * 转换为Map，若value原本就是Map，则转为原始类型，若不是则默认转为HashMap
 	 *
 	 * @param <K> 键类型
 	 * @param <V> 值类型
@@ -613,10 +613,10 @@ public class Convert {
 	 */
 	@SuppressWarnings("unchecked")
 	public static <K, V> Map<K, V> toMap(Class<K> keyType, Class<V> valueType, Object value) {
-		if(value instanceof Map){
-			return toMap((Class<? extends Map>) value.getClass(), keyType, valueType,value);
-		}else{
-			return toMap(HashMap.class, keyType, valueType,value);
+		if (value instanceof Map) {
+			return toMap((Class<? extends Map>) value.getClass(), keyType, valueType, value);
+		} else {
+			return toMap(HashMap.class, keyType, valueType, value);
 		}
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
index f37bb9e3a..acbb34a07 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
@@ -70,7 +70,6 @@ public class ConvertToBeanTest {
 	}
 	@Test
 	public void mapToMapWithSelfTypeTest() {
-
 		CaseInsensitiveMap<String, Integer> caseInsensitiveMap = new CaseInsensitiveMap<>();
 		caseInsensitiveMap.put("jerry", 1);
 		caseInsensitiveMap.put("Jerry", 2);