Fix MergedAnnotations.SearchStrategy deprecations

spring-projects/spring-framework@a6021cc

Author: garyrussell

spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java

@@ -46,6 +46,7 @@
  * @author Gareth Chapman
  * @author Cameron Mayfield
  * @author Chengchen Ji
+ * @author Gary Russell
  *
  * @since 2.0
  */
@@ -97,7 +98,7 @@ public Expression getExpressionForPayload(Method method) {
 				method1 -> {
 					Expression payloadExpression = null;
 					MergedAnnotation<Payload> payloadMergedAnnotation =
-							MergedAnnotations.from(method, MergedAnnotations.SearchStrategy.EXHAUSTIVE)
+							MergedAnnotations.from(method, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY)
 									.get(Payload.class);
 					if (payloadMergedAnnotation.isPresent()) {
 						String payloadExpressionString = payloadMergedAnnotation.getString("expression");
@@ -170,7 +171,7 @@ public Map<String, Expression> getExpressionsForHeaders(Method method) {
 	@Nullable
 	private String getAnnotationValue(AnnotatedElement element, String attributeName) {
 		MergedAnnotations mergedAnnotations =
-				MergedAnnotations.from(element, MergedAnnotations.SearchStrategy.EXHAUSTIVE);
+				MergedAnnotations.from(element, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY);
 		String value = null;
 		for (Class<? extends Annotation> annotationType : this.annotationTypes) {
 			MergedAnnotation<? extends Annotation> mergedAnnotation = mergedAnnotations.get(annotationType);

spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java

@@ -42,11 +42,13 @@
  *
  * @author Mark Fisher
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 4.0
  */
 public class ControlBusMethodFilter implements MethodFilter {
 
+	@Override
 	public List<Method> filter(List<Method> methods) {
 		List<Method> supportedMethods = new ArrayList<>();
 		for (Method method : methods) {
@@ -73,7 +75,7 @@ private boolean accept(Method method) {
 		}
 
 		MergedAnnotations mergedAnnotations =
-				MergedAnnotations.from(method, MergedAnnotations.SearchStrategy.EXHAUSTIVE,
+				MergedAnnotations.from(method, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY,
 						RepeatableContainers.none(), AnnotationFilter.PLAIN);
 
 		return mergedAnnotations.get(ManagedAttribute.class).isPresent()

spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationJmxAttributeSource.java

@@ -59,7 +59,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	@Override
 	public ManagedResource getManagedResource(Class<?> beanClass) throws InvalidMetadataException {
 		MergedAnnotation<IntegrationManagedResource> ann =
-				MergedAnnotations.from(beanClass, MergedAnnotations.SearchStrategy.EXHAUSTIVE)
+				MergedAnnotations.from(beanClass, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY)
 						.get(IntegrationManagedResource.class)
 						.withNonMergedAttributes();
 		if (!ann.isPresent()) {