From 7932e73395032bc3d76f1ade3809383531d858e2 Mon Sep 17 00:00:00 2001 From: huangchengxing <841396397@qq.com> Date: Wed, 21 Sep 2022 19:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=BE=97=E7=B1=BB?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=A3=B0=E6=98=8E=E6=96=B9=E6=B3=95=E7=9A=84?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/annotation/AnnotationUtil.java | 11 ++------- .../HierarchicalAnnotatedElements.java | 4 ++-- .../cn/hutool/core/reflect/MethodUtil.java | 23 +++++++++++++++---- .../core/annotation/AnnotationUtilTest.java | 2 +- .../hutool/core/reflect/MethodUtilTest.java | 12 ++++++++++ 5 files changed, 35 insertions(+), 17 deletions(-) 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 eca5f86b5..b5dd123c5 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 @@ -27,11 +27,6 @@ import java.util.stream.Stream; */ public class AnnotationUtil { - /** - * 注解属性缓存 - */ - private static final Map, Method[]> ANNOTATION_ATTRIBUTES_CACHE = new WeakConcurrentMap<>(); - /** * 直接声明的注解缓存 */ @@ -324,11 +319,9 @@ public class AnnotationUtil { * @since 6.0.0 */ public static Method[] getAnnotationAttributes(final Class annotationType) { - return MapUtil.computeIfAbsent( - ANNOTATION_ATTRIBUTES_CACHE, annotationType, type -> Stream.of(annotationType.getDeclaredMethods()) + return Stream.of(MethodUtil.getDeclaredMethods(annotationType)) .filter(AnnotationUtil::isAnnotationAttribute) - .toArray(Method[]::new) - ); + .toArray(Method[]::new); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java b/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java index 152154b56..c159961b1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java @@ -2,6 +2,7 @@ package cn.hutool.core.annotation; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.reflect.ClassUtil; +import cn.hutool.core.reflect.MethodUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ArrayUtil; @@ -357,8 +358,7 @@ public class HierarchicalAnnotatedElements implements AnnotatedElement, Iterable if (!isMethod) { collectElement(mappings, type); } else { - // TODO 改为通过带缓存的反射工具类完成 - Stream.of(type.getDeclaredMethods()) + Stream.of(MethodUtil.getDeclaredMethods(type)) .filter(method -> isMatchMethod(methodSource, method)) .forEach(method -> collectElement(mappings, method)); } diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java index 6b212c9d2..f7368527f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java @@ -15,11 +15,7 @@ import cn.hutool.core.util.ArrayUtil; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.function.Predicate; /** @@ -33,6 +29,10 @@ public class MethodUtil { * 方法缓存 */ private static final WeakConcurrentMap, Method[]> METHODS_CACHE = new WeakConcurrentMap<>(); + /** + * 直接声明的方法缓存 + */ + private static final WeakConcurrentMap, Method[]> DECLARED_METHODS_CACHE = new WeakConcurrentMap<>(); // --------------------------------------------------------------------------------------------------------- method @@ -323,6 +323,19 @@ public class MethodUtil { (key) -> getMethodsDirectly(beanClass, true, true)); } + /** + * 获得类中所有直接声明方法，不包括其父类中的方法 + * + * @param beanClass 类，非{@code null} + * @return 方法列表 + * @throws SecurityException 安全检查异常 + */ + public static Method[] getDeclaredMethods(final Class beanClass) throws SecurityException { + Assert.notNull(beanClass); + return DECLARED_METHODS_CACHE.computeIfAbsent(beanClass, + key -> getMethodsDirectly(beanClass, false, Objects.equals(Object.class, beanClass))); + } + /** * 获得一个类中所有方法列表，直接反射获取，无缓存
* 接口获取方法和默认方法，获取的方法包括： 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 ebd3cdb44..a1f1eb380 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 @@ -127,7 +127,7 @@ public class AnnotationUtilTest { @Test public void testGetAnnotationAttributes() { Method[] methods = AnnotationUtil.getAnnotationAttributes(AnnotationForTest.class); - Assert.assertSame(methods, AnnotationUtil.getAnnotationAttributes(AnnotationForTest.class)); + Assert.assertArrayEquals(methods, AnnotationUtil.getAnnotationAttributes(AnnotationForTest.class)); Assert.assertEquals(1, methods.length); Assert.assertArrayEquals(AnnotationForTest.class.getDeclaredMethods(), methods); } diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java index 7322a9a70..5919e66c3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java @@ -81,6 +81,18 @@ public class MethodUtilTest { Assert.assertEquals(10, testClass.getA()); } + @Test + public void getDeclaredMethodsTest() { + Class type = ReflectUtilTest.TestBenchClass.class; + Method[] methods = type.getDeclaredMethods(); + Assert.assertArrayEquals(methods, MethodUtil.getDeclaredMethods(type)); + Assert.assertSame(MethodUtil.getDeclaredMethods(type), MethodUtil.getDeclaredMethods(type)); + + type = Object.class; + methods = type.getDeclaredMethods(); + Assert.assertArrayEquals(methods, MethodUtil.getDeclaredMethods(type)); + } + @Test @Ignore public void getMethodBenchTest() {