fix getKeyType bug

xlorne · xlorne · commit d04e84893ff3 · 2024-10-28T08:31:11.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -13,11 +13,11 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.0.dev2</version>
+    <version>3.3.1</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.0.dev2</version>
+    <version>3.3.1</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.0.dev2</version>
+        <version>3.3.1</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java
@@ -139,16 +139,30 @@ public void addFilter(String key, List<String> value) {
         private Class<?> getKeyType(String key) {
             String[] keys = key.split("\\.");
             Class<?> keyClass = clazz;
+
             for (String k : keys) {
-                Field[] fields = keyClass.getDeclaredFields();
+                keyClass = findFieldInHierarchy(keyClass, k);
+
+                if (keyClass == null) {
+                    throw new IllegalArgumentException("Field " + k + " not found in class hierarchy.");
+                }
+            }
+            return keyClass;
+        }
+
+        private Class<?> findFieldInHierarchy(Class<?> clazz, String fieldName) {
+            Class<?> currentClass = clazz;
+
+            while (currentClass != null) {
+                Field[] fields = currentClass.getDeclaredFields();
                 for (Field field : fields) {
-                    if (field.getName().equals(k)) {
-                        keyClass = field.getType();
-                        break;
+                    if (field.getName().equals(fieldName)) {
+                        return field.getType();
                     }
                 }
+                currentClass = currentClass.getSuperclass(); // 向上查找父类
             }
-            return keyClass;
+            return null;
         }
 
     }
diff --git a/springboot-starter/src/test/java/com/codingapi/springboot/framework/dto/request/SearchRequestTest.java b/springboot-starter/src/test/java/com/codingapi/springboot/framework/dto/request/SearchRequestTest.java
@@ -0,0 +1,70 @@
+package com.codingapi.springboot.framework.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.util.PropertiesUtil;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SearchRequestTest {
+
+
+
+    @Test
+    void test(){
+        Class<?> type = getKeyType(Demo.class,"deleted");
+        System.out.println(type);
+    }
+
+    private Class<?> getKeyType(Class<?> clazz, String key) {
+        String[] keys = key.split("\\.");
+        Class<?> keyClass = clazz;
+
+        for (String k : keys) {
+            keyClass = findFieldInHierarchy(keyClass, k);
+
+            if (keyClass == null) {
+                throw new IllegalArgumentException("Field " + k + " not found in class hierarchy.");
+            }
+        }
+        return keyClass;
+    }
+
+    private Class<?> findFieldInHierarchy(Class<?> clazz, String fieldName) {
+        Class<?> currentClass = clazz;
+
+        while (currentClass != null) {
+            Field[] fields = currentClass.getDeclaredFields();
+            for (Field field : fields) {
+                if (field.getName().equals(fieldName)) {
+                    return field.getType();
+                }
+            }
+            currentClass = currentClass.getSuperclass(); // 向上查找父类
+        }
+        return null;
+    }
+
+
+    @Setter
+    @Getter
+    public class Demo extends BaseEntity{
+
+        private long id;
+        private String name;
+
+    }
+
+    @Setter
+    @Getter
+    public class BaseEntity{
+
+        private int state;
+        private boolean deleted;
+    }
+}
