diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java index f16aeb605..4c726d99e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java @@ -7,11 +7,12 @@ import cn.hutool.core.annotation.scanner.TypeAnnotationScanner; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Opt; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.lang.func.Func1; +import cn.hutool.core.lang.func.LambdaUtil; +import cn.hutool.core.util.*; import java.lang.annotation.*; +import java.lang.invoke.SerializedLambda; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -229,6 +230,28 @@ public class AnnotationUtil { return ReflectUtil.invoke(annotation, method); } + /** + * 获取指定注解属性的值
+ * 如果无指定的属性方法返回null + * + * @param 注解类型 + * @param 注解类型值 + * @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission + * @param propertyName 属性名,例如注解中定义了name()方法,则 此处传入name + * @return 注解对象 + * @throws UtilException 调用注解中的方法时执行异常 + */ + public static R getAnnotationValue(AnnotatedElement annotationEle, Func1 propertyName) { + if(propertyName == null) { + return null; + }else { + final SerializedLambda lambda = LambdaUtil.resolve(propertyName); + final String instantiatedMethodType = lambda.getInstantiatedMethodType(); + Class annotationClass = ClassUtil.loadClass(StrUtil.sub(instantiatedMethodType, 2, StrUtil.indexOf(instantiatedMethodType, ';'))); + return getAnnotationValue(annotationEle,annotationClass, lambda.getImplMethodName()); + } + } + /** * 获取指定注解中所有属性值
* 如果无指定的属性方法返回null diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java index f109e836d..2bbffc784 100755 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java @@ -26,4 +26,6 @@ public @interface AnnotationForTest { @Alias("value") String retry() default ""; + + String[] names() default ""; } diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java index 0e5803c1e..83646e85b 100755 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java @@ -1,5 +1,7 @@ package cn.hutool.core.annotation; +import cn.hutool.core.lang.Console; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; import org.junit.Assert; import org.junit.Test; @@ -34,6 +36,12 @@ public class AnnotationUtilTest { } + @Test + public void getAnnotationValueTest2() { + String[] names = AnnotationUtil.getAnnotationValue(ClassWithAnnotation.class, AnnotationForTest::names); + Assert.assertTrue(ArrayUtil.equals(names, new String[]{"测试1", "测试2"})); + } + @Test public void getAnnotationSyncAlias() { // 直接获取 @@ -45,7 +53,7 @@ public class AnnotationUtilTest { Assert.assertTrue(AnnotationUtil.isSynthesizedAnnotation(annotation)); } - @AnnotationForTest("测试") + @AnnotationForTest(value = "测试", names = {"测试1", "测试2"}) @RepeatAnnotationForTest static class ClassWithAnnotation{ public void test(){