From 21f6554a0507967f63752ba0b8a1da2e4158204a Mon Sep 17 00:00:00 2001
From: yeshwanthsripathy <ys58@illinois.edu>
Date: Tue, 3 Oct 2023 18:52:31 -0500
Subject: [PATCH] Fixed flaky tests

---
 .../hutool/core/annotation/CombinationAnnotationElement.java   | 3 +++
 .../core/annotation/scanner/AbstractTypeAnnotationScanner.java | 1 +
 2 files changed, 4 insertions(+)

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 bfe8b8598..3d5ec09f0 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
@@ -7,6 +7,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.function.Predicate;
 
@@ -98,10 +99,12 @@ 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 8a3b2e7d1..9a7bce619 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,6 +185,7 @@ public abstract class AbstractTypeAnnotationScanner<T extends AbstractTypeAnnota
 				scanInterfaceIfNecessary(nextClassQueue, targetClass);
 				// 处理层级索引和注解
 				final Annotation[] targetAnnotations = getAnnotationsFromTargetClass(annotatedEle, index, targetClass);
+				Arrays.sort(targetAnnotations, Comparator.comparing(Annotation::toString).reversed());
 				for (final Annotation annotation : targetAnnotations) {
 					if (AnnotationUtil.isNotJdkMateAnnotation(annotation.annotationType()) && filter.test(annotation)) {
 						consumer.accept(index, annotation);