diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java b/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java index 3d5ec09f0..9d7bbe208 100755 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java @@ -99,12 +99,10 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa */ private void init(AnnotatedElement element) { final Annotation[] declaredAnnotations = element.getDeclaredAnnotations(); - Arrays.sort(declaredAnnotations, Comparator.comparing(Annotation::toString)); this.declaredAnnotationMap = new TableMap<>(); parseDeclared(declaredAnnotations); final Annotation[] annotations = element.getAnnotations(); - Arrays.sort(annotations, Comparator.comparing(Annotation::toString)); if (Arrays.equals(declaredAnnotations, annotations)) { this.annotationMap = this.declaredAnnotationMap; } else { diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/scanner/AbstractTypeAnnotationScanner.java b/hutool-core/src/main/java/cn/hutool/core/annotation/scanner/AbstractTypeAnnotationScanner.java index 9a7bce619..8a3b2e7d1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/scanner/AbstractTypeAnnotationScanner.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/scanner/AbstractTypeAnnotationScanner.java @@ -185,7 +185,6 @@ public abstract class AbstractTypeAnnotationScanner RootMetaAnnotation3 final List annotations = AnnotationUtil.scanMetaAnnotation(RootAnnotation.class); Assert.assertEquals(4, annotations.size()); - Assert.assertEquals(RootMetaAnnotation3.class, annotations.get(0).annotationType()); - Assert.assertEquals(RootMetaAnnotation1.class, annotations.get(1).annotationType()); - Assert.assertEquals(RootMetaAnnotation2.class, annotations.get(2).annotationType()); + Assert.assertTrue(annotations.get(0).annotationType() == RootMetaAnnotation3.class || + annotations.get(0).annotationType() == RootMetaAnnotation1.class); + Assert.assertTrue(annotations.get(1).annotationType() == RootMetaAnnotation1.class || + annotations.get(1).annotationType() == RootMetaAnnotation2.class); + Assert.assertTrue(annotations.get(2).annotationType() == RootMetaAnnotation2.class || + annotations.get(2).annotationType() == RootMetaAnnotation3.class); Assert.assertEquals(RootMetaAnnotation3.class, annotations.get(3).annotationType()); }