From bf1d562c3be45ca917ba07442d239376de6b188d Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 31 Jul 2019 11:31:18 -0400
Subject: [PATCH] Fix MergedAnnotations.SearchStrategy deprecations

https://github.com/spring-projects/spring-framework/commit/a6021cc96890e6f909fcf9f20d8ff6dabf596359
---
 .../aop/MethodAnnotationPublisherMetadataSource.java         | 5 +++--
 .../integration/expression/ControlBusMethodFilter.java       | 4 +++-
 .../integration/monitor/IntegrationJmxAttributeSource.java   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java
index a3cc7fc51c..b9373c2108 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java
@@ -46,6 +46,7 @@ import org.springframework.util.StringUtils;
  * @author Gareth Chapman
  * @author Cameron Mayfield
  * @author Chengchen Ji
+ * @author Gary Russell
  *
  * @since 2.0
  */
@@ -97,7 +98,7 @@ public class MethodAnnotationPublisherMetadataSource implements PublisherMetadat
 				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 class MethodAnnotationPublisherMetadataSource implements PublisherMetadat
 	@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);
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java
index f169bb3008..47757d41c6 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java
@@ -42,11 +42,13 @@ import org.springframework.util.ReflectionUtils;
  *
  * @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 @@ public class ControlBusMethodFilter implements MethodFilter {
 		}
 
 		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()
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationJmxAttributeSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationJmxAttributeSource.java
index 7de67f38ac..9ba5e26b68 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationJmxAttributeSource.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationJmxAttributeSource.java
@@ -59,7 +59,7 @@ public class IntegrationJmxAttributeSource extends AnnotationJmxAttributeSource
 	@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()) {