lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly 2022-07-17 18:43:58 +08:00
parent 49e40132ac
commit 94d5889b1c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java
View File

@ -138,7 +138,9 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa
// 直接注解 // 直接注解
for (final Annotation annotation : annotations) { for (final Annotation annotation : annotations) {
annotationType = annotation.annotationType(); annotationType = annotation.annotationType();
if (false == META_ANNOTATIONS.contains(annotationType)) { if (false == META_ANNOTATIONS.contains(annotationType)
// issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用
&& false == declaredAnnotationMap.containsKey(annotationType)) {
if(test(annotation)){ if(test(annotation)){
declaredAnnotationMap.put(annotationType, annotation); declaredAnnotationMap.put(annotationType, annotation);
} }
@ -157,7 +159,9 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa
Class<? extends Annotation> annotationType; Class<? extends Annotation> annotationType;
for (final Annotation annotation : annotations) { for (final Annotation annotation : annotations) {
annotationType = annotation.annotationType(); annotationType = annotation.annotationType();
if (false == META_ANNOTATIONS.contains(annotationType)) { if (false == META_ANNOTATIONS.contains(annotationType)
// issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用
&& false == declaredAnnotationMap.containsKey(annotationType)) {
if(test(annotation)){ if(test(annotation)){
annotationMap.put(annotationType, annotation); annotationMap.put(annotationType, annotation);
} }

4
hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
View File

@ -11,14 +11,14 @@ public class AnnotationUtilTest {
public void getCombinationAnnotationsTest(){ public void getCombinationAnnotationsTest(){
final Annotation[] annotations = AnnotationUtil.getAnnotations(ClassWithAnnotation.class, true); final Annotation[] annotations = AnnotationUtil.getAnnotations(ClassWithAnnotation.class, true);
Assert.assertNotNull(annotations); Assert.assertNotNull(annotations);
Assert.assertEquals(3, annotations.length); Assert.assertEquals(2, annotations.length);
} }
@Test @Test
public void getCombinationAnnotationsWithClassTest(){ public void getCombinationAnnotationsWithClassTest(){
final AnnotationForTest[] annotations = AnnotationUtil.getCombinationAnnotations(ClassWithAnnotation.class, AnnotationForTest.class); final AnnotationForTest[] annotations = AnnotationUtil.getCombinationAnnotations(ClassWithAnnotation.class, AnnotationForTest.class);
Assert.assertNotNull(annotations); Assert.assertNotNull(annotations);
Assert.assertEquals(2, annotations.length); Assert.assertEquals(1, annotations.length);
Assert.assertEquals("测试", annotations[0].value()); Assert.assertEquals("测试", annotations[0].value());
} }