ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复元注解扫描器在注解出现循环引用时无限递归的问题

Browse Source
This commit is contained in:
huangchengxing 2022-07-17 23:46:26 +08:00
parent dfb12eb22c
commit 4a3b8d843a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hutool-core/src/main/java/cn/hutool/core/annotation/scanner/MetaAnnotationScanner.java
View File

@ -1,16 +1,13 @@
package cn.hutool.core.annotation.scanner; package cn.hutool.core.annotation.scanner;
import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedElement;
import java.util.ArrayList; import java.util.*;
import java.util.Deque;
import java.util.List;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -84,6 +81,7 @@ public class MetaAnnotationScanner implements AnnotationScanner {
@Override @Override
public void scan(BiConsumer<Integer, Annotation> consumer, AnnotatedElement annotatedEle, Predicate<Annotation> filter) { public void scan(BiConsumer<Integer, Annotation> consumer, AnnotatedElement annotatedEle, Predicate<Annotation> filter) {
filter = ObjectUtil.defaultIfNull(filter, t -> true); filter = ObjectUtil.defaultIfNull(filter, t -> true);
Set<Class<? extends Annotation>> accessed = new HashSet<>();
final Deque<List<Class<? extends Annotation>>> deque = CollUtil.newLinkedList(CollUtil.newArrayList((Class<? extends Annotation>)annotatedEle)); final Deque<List<Class<? extends Annotation>>> deque = CollUtil.newLinkedList(CollUtil.newArrayList((Class<? extends Annotation>)annotatedEle));
int distance = 0; int distance = 0;
do { do {
@ -96,7 +94,14 @@ public class MetaAnnotationScanner implements AnnotationScanner {
for (final Annotation metaAnnotation : metaAnnotations) { for (final Annotation metaAnnotation : metaAnnotations) {
consumer.accept(distance, metaAnnotation); consumer.accept(distance, metaAnnotation);
} }
deque.addLast(CollStreamUtil.toList(metaAnnotations, Annotation::annotationType)); accessed.add(type);
List<Class<? extends Annotation>> next = metaAnnotations.stream()
.map(Annotation::annotationType)
.filter(t -> !accessed.contains(t))
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(next)) {
deque.addLast(next);
}
} }
distance++; distance++;
} while (includeSupperMetaAnnotation && !deque.isEmpty()); } while (includeSupperMetaAnnotation && !deque.isEmpty());