Merge branch '6.1.x'

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.TargetSource;
+import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -97,7 +99,13 @@ protected List<Advisor> findEligibleAdvisors(Class<?> beanClass, String beanName
 		List<Advisor> eligibleAdvisors = findAdvisorsThatCanApply(candidateAdvisors, beanClass, beanName);
 		extendAdvisors(eligibleAdvisors);
 		if (!eligibleAdvisors.isEmpty()) {
-			eligibleAdvisors = sortAdvisors(eligibleAdvisors);
+			try {
+				eligibleAdvisors = sortAdvisors(eligibleAdvisors);
+			}
+			catch (BeanCreationException ex) {
+				throw new AopConfigException("Advisor sorting failed with unexpected bean creation, probably due " +
+						"to custom use of the Ordered interface. Consider using the @Order annotation instead.", ex);
+			}
 		}
 		return eligibleAdvisors;
 	}

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorBeanRegistrationAotProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,15 +36,17 @@
  * Tests for {@link AspectJAdvisorBeanRegistrationAotProcessor}.
  *
  * @author Sebastien Deleuze
+ * @since 6.1
  */
 class AspectJAdvisorBeanRegistrationAotProcessorTests {
 
 	private final GenerationContext generationContext = new TestGenerationContext();
 
 	private final RuntimeHints runtimeHints = this.generationContext.getRuntimeHints();
 
+
 	@Test
-	void shouldProcessesAspectJClass() {
+	void shouldProcessAspectJClass() {
 		process(AspectJClass.class);
 		assertThat(reflection().onType(AspectJClass.class).withMemberCategory(MemberCategory.DECLARED_FIELDS))
 				.accepts(this.runtimeHints);

spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@@ -1052,16 +1052,16 @@ public static Object getValue(@Nullable Annotation annotation, @Nullable String
 			return null;
 		}
 		try {
-			Method method = annotation.annotationType().getDeclaredMethod(attributeName);
-			return invokeAnnotationMethod(method, annotation);
-		}
-		catch (NoSuchMethodException ex) {
-			return null;
+			for (Method method : annotation.annotationType().getDeclaredMethods()) {
+				if (method.getName().equals(attributeName) && method.getParameterCount() == 0) {
+					return invokeAnnotationMethod(method, annotation);
+				}
+			}
 		}
 		catch (Throwable ex) {
 			handleValueRetrievalFailure(annotation, ex);
-			return null;
 		}
+		return null;
 	}
 
 	/**