From cc6234bd27129b718f2e9e235982d7a9203fb01c Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Mon, 18 Mar 2024 11:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DClassUtil.getTypeArgument()?=
 =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E6=B3=9B=E5=9E=8B=E5=AD=98=E5=9C=A8null?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/hutool/core/reflect/TypeUtil.java |  5 +--
 .../hutool/core/reflect/Issue3516Test.java    | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java

diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
index ffceb4ed7..a94d168b2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
@@ -343,8 +343,9 @@ public class TypeUtil {
 		final Type[] genericInterfaces = clazz.getGenericInterfaces();
 		if (ArrayUtil.isNotEmpty(genericInterfaces)) {
 			for (final Type genericInterface : genericInterfaces) {
-				if (genericInterface instanceof ParameterizedType) {
-					result.add((ParameterizedType) genericInterface);
+				final ParameterizedType parameterizedType = toParameterizedType(genericInterface);
+				if(null != parameterizedType){
+					result.add(parameterizedType);
 				}
 			}
 		}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java
new file mode 100644
index 000000000..214da9a64
--- /dev/null
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java
@@ -0,0 +1,34 @@
+package org.dromara.hutool.core.reflect;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Type;
+import java.util.function.Function;
+
+public class Issue3516Test {
+
+	@Test
+	public void getTypeArgumentTest() {
+		final Type typeArgument = TypeUtil.getTypeArgument(Demo.class, 0);
+		Assertions.assertEquals(B.class, typeArgument);
+	}
+
+	static class Demo implements A2B{
+		@Override
+		public A apply(final B b) {
+			return new A();
+		}
+	}
+
+	static class A {
+		private String name;
+	}
+
+	static class B {
+		private String name;
+	}
+
+	interface A2B extends Function<B, A> {
+	}
+}