TypeUtil.getClass方法强转报错问题

hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java

@@ -40,7 +40,10 @@ public class TypeUtil {
 			} else if (type instanceof ParameterizedType) {
 				return (Class<?>) ((ParameterizedType) type).getRawType();
 			} else if (type instanceof TypeVariable) {
-				return (Class<?>) ((TypeVariable<?>) type).getBounds()[0];
+				Type[] bounds = ((TypeVariable<?>) type).getBounds();
+				if (bounds.length == 1) {
+					return getClass(bounds[0]);
+				}
 			} else if (type instanceof WildcardType) {
 				final Type[] upperBounds = ((WildcardType) type).getUpperBounds();
 				if (upperBounds.length == 1) {

hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java

@@ -1,13 +1,12 @@
 package cn.hutool.core.util;
 
-import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Data;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class TypeUtilTest {
 
@@ -31,6 +30,19 @@ public class TypeUtilTest {
 		Assert.assertEquals(Integer.class, returnType);
 	}
 
+	@Test
+	public void getClasses() {
+		Method method = ReflectUtil.getMethod(Parent.class, "getLevel");
+		Type returnType = TypeUtil.getReturnType(method);
+		Class clazz = TypeUtil.getClass(returnType);
+		Assert.assertEquals(Level1.class, clazz);
+
+		method = ReflectUtil.getMethod(Level1.class, "getId");
+		returnType = TypeUtil.getReturnType(method);
+		clazz = TypeUtil.getClass(returnType);
+		Assert.assertEquals(Object.class, clazz);
+	}
+
 	public static class TestClass {
 		public List<String> getList() {
 			return new ArrayList<>();
@@ -39,6 +51,7 @@ public class TypeUtilTest {
 		public Integer intTest(Integer integer) {
 			return 1;
 		}
+
 	}
 
 	@Test
@@ -61,8 +74,7 @@ public class TypeUtilTest {
 	@Test
 	public void getActualTypesTest() {
 		// 测试多层级泛型参数是否能获取成功
-		Type idType = TypeUtil.getActualType(Level3.class,
+		Type idType = TypeUtil.getActualType(Level3.class, ReflectUtil.getField(Level3.class, "id"));
-				ReflectUtil.getField(Level3.class, "id"));
 
 		Assert.assertEquals(Long.class, idType);
 	}
@@ -80,4 +92,9 @@ public class TypeUtilTest {
 		private T id;
 	}
 
+	@Data
+	public static class Parent<T extends Level1<B>, B extends Long> {
+		private T level;
+	}
+
 }