From 5455ccb8dc3e219e870a3f421b643c43778fcc65 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 19 Dec 2019 10:55:17 -0500
Subject: [PATCH] Fix AbstractMethodAnnPP.postProcess() complexity

---
 ...AbstractMethodAnnotationPostProcessor.java | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index 6e13e74a62..a03b993ce2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -160,21 +160,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 		producerOrRouter(annotations, handler);
 
 		if (!handler.equals(sourceHandler)) {
-			String handlerBeanName = generateHandlerBeanName(beanName, method);
-			if (handler instanceof ReplyProducingMessageHandlerWrapper
-					&& StringUtils.hasText(MessagingAnnotationUtils.endpointIdValue(method))) {
-				handlerBeanName = handlerBeanName + ".wrapper";
-			}
-			if (handler instanceof IntegrationObjectSupport) {
-				((IntegrationObjectSupport) handler).setComponentName(
-						handlerBeanName.substring(0,
-								handlerBeanName.indexOf(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX)));
-			}
-			this.beanFactory.registerSingleton(handlerBeanName, handler);
-			handler = (MessageHandler) this.beanFactory.initializeBean(handler, handlerBeanName);
-			if (handler instanceof DisposableBean && this.disposables != null) {
-				this.disposables.add((DisposableBean) handler);
-			}
+			handler = registerHandlerBean(beanName, method, handler);
 		}
 
 		handler = annotated(method, handler);
@@ -189,6 +175,25 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 		}
 	}
 
+	private MessageHandler registerHandlerBean(String beanName, Method method, MessageHandler handler) {
+		String handlerBeanName = generateHandlerBeanName(beanName, method);
+		if (handler instanceof ReplyProducingMessageHandlerWrapper
+				&& StringUtils.hasText(MessagingAnnotationUtils.endpointIdValue(method))) {
+			handlerBeanName = handlerBeanName + ".wrapper";
+		}
+		if (handler instanceof IntegrationObjectSupport) {
+			((IntegrationObjectSupport) handler).setComponentName(
+					handlerBeanName.substring(0,
+							handlerBeanName.indexOf(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX)));
+		}
+		this.beanFactory.registerSingleton(handlerBeanName, handler);
+		handler = (MessageHandler) this.beanFactory.initializeBean(handler, handlerBeanName);
+		if (handler instanceof DisposableBean && this.disposables != null) {
+			this.disposables.add((DisposableBean) handler);
+		}
+		return handler;
+	}
+
 
 	private void orderable(Method method, MessageHandler handler) {
 		if (handler instanceof Orderable) {