ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-07-01 12:28:07 +08:00
parent e9aa7b3279
commit 18b6ed1ed1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
View File

@ -305,7 +305,7 @@ public class TypeUtil {
if (type instanceof Class) { if (type instanceof Class) {
final ParameterizedType[] generics = getGenerics((Class<?>) type); final ParameterizedType[] generics = getGenerics((Class<?>) type);
if(generics.length > interfaceIndex){ if (generics.length > interfaceIndex) {
return generics[interfaceIndex]; return generics[interfaceIndex];
} }
} }
@ -315,6 +315,10 @@ public class TypeUtil {
/** /**
* 获取指定类所有泛型父类和泛型接口 * 获取指定类所有泛型父类和泛型接口
* <ul>
* <li>指定类及其所有的泛型父类</li>
* <li>指定类实现的直接泛型接口</li>
* </ul>
* *
* @param clazz 类 * @param clazz 类
* @return 泛型父类或接口数组 * @return 泛型父类或接口数组
@ -324,9 +328,9 @@ public class TypeUtil {
final List<ParameterizedType> result = ListUtil.of(false); final List<ParameterizedType> result = ListUtil.of(false);
// 泛型父类（父类及祖类优先级高） // 泛型父类（父类及祖类优先级高）
final Type genericSuper = clazz.getGenericSuperclass(); final Type genericSuper = clazz.getGenericSuperclass();
if(null != genericSuper && !Object.class.equals(genericSuper)){ if (null != genericSuper && !Object.class.equals(genericSuper)) {
final ParameterizedType parameterizedType = toParameterizedType(genericSuper); final ParameterizedType parameterizedType = toParameterizedType(genericSuper);
if(null != parameterizedType){ if (null != parameterizedType) {
result.add(parameterizedType); result.add(parameterizedType);
} }
} }

13
hutool-db/src/test/java/org/dromara/hutool/db/IssueI7GUKOTest.java
View File

@ -12,21 +12,28 @@
package org.dromara.hutool.db; package org.dromara.hutool.db;
import org.dromara.hutool.core.collection.CollUtil;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Set;
public class IssueI7GUKOTest { public class IssueI7GUKOTest {
@Test @Test
void entityTest() { void entityTest() {
final Entity entity = Entity.of("data") final Entity entity = Entity.of("data")
.set("sort", "test") .set("sort", "")
.set("pcode", "test") .set("pcode", "test")
.set("code", "test") .set("code", "")
.set("define", "test") .set("define", "test")
.set("icon", "test") .set("icon", "")
.set("label", "test") .set("label", "test")
.set("stu", "test"); .set("stu", "test");
Assertions.assertEquals("[sort, pcode, code, define, icon, label, stu]", entity.keySet().toString()); Assertions.assertEquals("[sort, pcode, code, define, icon, label, stu]", entity.keySet().toString());
final Set<String> keys = CollUtil.removeEmpty(entity.keySet());
Assertions.assertEquals("[sort, pcode, code, define, icon, label, stu]", keys.toString());
} }
} }