fix ObjectAnnotationFieldUtils bug

Author: xlorne

springboot-starter-script/src/main/java/com/codingapi/springboot/script/scanner/GroovyMetadataScannerUtils.java

@@ -1,19 +1,19 @@
 package com.codingapi.springboot.script.scanner;
 
+import com.codingapi.springboot.framework.reflect.ObjectAnnotationFieldUtils;
 import com.codingapi.springboot.script.GroovyScript;
 import com.codingapi.springboot.script.annotation.ScriptField;
 import com.codingapi.springboot.script.annotation.ScriptFunction;
 import com.codingapi.springboot.script.annotation.ScriptParameter;
 import com.codingapi.springboot.script.annotation.ScriptType;
-import com.codingapi.springboot.script.strategy.ScriptTypeMappingContext;
 import com.codingapi.springboot.script.meta.GroovyField;
 import com.codingapi.springboot.script.meta.GroovyFunction;
 import com.codingapi.springboot.script.meta.GroovyMetadata;
 import com.codingapi.springboot.script.meta.GroovyType;
 import com.codingapi.springboot.script.strategy.GroovyMetadataGenerateStrategyContext;
 import com.codingapi.springboot.script.strategy.GroovyTypeFixStrategyContext;
+import com.codingapi.springboot.script.strategy.ScriptTypeMappingContext;
 import lombok.Getter;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -294,17 +294,6 @@ private void loadMethods() {
             }
         }
 
-        /**
-         * 是否简单数据结构
-         */
-        private boolean isSimpleType() {
-            return this.clazz.isPrimitive()
-                    || ClassUtils.isPrimitiveOrWrapper(this.clazz)
-                    || this.clazz == String.class
-                    || this.clazz.isEnum()
-                    || Number.class.isAssignableFrom(this.clazz)
-                    || CharSequence.class.isAssignableFrom(this.clazz);
-        }
 
 
         /**
@@ -318,7 +307,7 @@ public void scanner() {
             }
 
             // 简单数据类型不处理
-            if (this.isSimpleType()) {
+            if (ObjectAnnotationFieldUtils.isSimpleType(this.clazz)) {
                 return;
             }
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/reflect/ObjectAnnotationFieldUtils.java

@@ -31,6 +31,20 @@ public static <T> AnnotationTargetFieldResult<T> findFieldAnnotationValue(Object
     }
 
 
+    /**
+     * 是否简单数据结构
+     * @param fieldType 字段类型
+     */
+    public static boolean isSimpleType(Class<?> fieldType) {
+        return fieldType.isPrimitive()
+                || ClassUtils.isPrimitiveOrWrapper(fieldType)
+                || fieldType == String.class
+                || fieldType.isEnum()
+                || Number.class.isAssignableFrom(fieldType)
+                || CharSequence.class.isAssignableFrom(fieldType);
+    }
+
+
     /**
      * 注解目标字段持有对象
      * @param <T> 字段类型
@@ -131,6 +145,9 @@ public ObjectAnnotationScanner(Object target, AnnotationTargetFieldHolder<T> val
          * 扫描对象
          */
         public void scanner() {
+            if(ObjectAnnotationFieldUtils.isSimpleType(this.targetClass)) {
+                return;
+            }
             if (this.target instanceof Collection<?>) {
                 for (Object item : (Collection) this.target) {
                     ObjectAnnotationScanner<T> scanner = new ObjectAnnotationScanner<>(item, this.valueHolder);
@@ -164,7 +181,7 @@ private void scannerFields() {
                 Object value = ReflectionUtils.getField(field, target);
                 Class<?> fieldTypeClass = field.getType();
                 if (value != null) {
-                    if (isSimpleType(fieldTypeClass)) {
+                    if (ObjectAnnotationFieldUtils.isSimpleType(fieldTypeClass)) {
                         Annotation annotation = field.getAnnotation(this.valueHolder.getAnnotationClass());
                         if (annotation != null) {
                             this.valueHolder.addFiled(field, target, (T) value);
@@ -176,18 +193,5 @@ private void scannerFields() {
                 }
             });
         }
-
-        /**
-         * 是否简单数据结构
-         * @param fieldType 字段类型
-         */
-        private boolean isSimpleType(Class<?> fieldType) {
-            return fieldType.isPrimitive()
-                    || ClassUtils.isPrimitiveOrWrapper(fieldType)
-                    || fieldType == String.class
-                    || fieldType.isEnum()
-                    || Number.class.isAssignableFrom(fieldType)
-                    || CharSequence.class.isAssignableFrom(fieldType);
-        }
     }
 }

springboot-starter/src/test/java/com/codingapi/springboot/framework/reflect/FieldAttribute.java

@@ -0,0 +1,17 @@
+package com.codingapi.springboot.framework.reflect;
+
+import lombok.Data;
+
+/**
+ * 附加属性
+ */
+@Data
+public class FieldAttribute {
+    // 属性key
+    @MyScript
+    private String key;
+    // 属性名称
+    private String label;
+    // 属性值
+    private Object value;
+}

springboot-starter/src/test/java/com/codingapi/springboot/framework/reflect/MyScript.java

@@ -0,0 +1,9 @@
+package com.codingapi.springboot.framework.reflect;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface MyScript {
+}

springboot-starter/src/test/java/com/codingapi/springboot/framework/reflect/ObjectAnnotationFieldUtilsTest.java

@@ -0,0 +1,40 @@
+package com.codingapi.springboot.framework.reflect;
+
+import com.alibaba.fastjson.JSONObject;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ObjectAnnotationFieldUtilsTest {
+
+    @Test
+    void findFieldAnnotationValue() {
+        String attribute2 = """
+                {
+                   "key":"123",
+                   "label":"123",
+                   "value":[
+                      {
+                        "data":"123"
+                      },
+                      {
+                        "data":"123"
+                      }
+                   ]
+                }
+                """;
+
+
+        FieldAttribute attributeObj1 =  new FieldAttribute();
+        FieldAttribute attributeObj2 =  JSONObject.parseObject(attribute2,FieldAttribute.class);
+
+
+        List<String> keys1 = ObjectAnnotationFieldUtils.findFieldAnnotationValue(attributeObj1,MyScript.class, String.class).getValues();
+        assertEquals(0,keys1.size());
+
+        List<String> keys2 = ObjectAnnotationFieldUtils.findFieldAnnotationValue(attributeObj2,MyScript.class, String.class).getValues();
+        assertEquals(1,keys2.size());
+    }
+}