GH-2690: Add MessageHandlerMethodFactory beans

spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -67,6 +67,7 @@
 import org.springframework.integration.support.converter.DefaultDatatypeChannelMessageConverter;
 import org.springframework.integration.support.json.JacksonPresent;
 import org.springframework.integration.support.utils.IntegrationUtils;
+import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.ClassUtils;
 
@@ -122,8 +123,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 			registerGlobalChannelInterceptorProcessor();
 			registerDefaultDatatypeChannelMessageConverter();
 			registerArgumentResolverMessageConverter();
-			registerArgumentResolvers();
-			registerListCapableArgumentResolvers();
+			registerMessageHandlerMethodFactory();
+			registerListMessageHandlerMethodFactory();
 		}
 		else if (logger.isWarnEnabled()) {
 			logger.warn("BeanFactory is not a BeanDefinitionRegistry. " +
@@ -479,32 +480,32 @@ private void registerArgumentResolverMessageConverter() {
 		}
 	}
 
-	/**
-	 * Register the default
-	 * {@link org.springframework.integration.handler.support.HandlerMethodArgumentResolversHolder} for handler
-	 * method invocation.
-	 */
-	private void registerArgumentResolvers() {
-		if (!this.beanFactory.containsBean(IntegrationContextUtils.ARGUMENT_RESOLVERS_BEAN_NAME)) {
-			this.registry.registerBeanDefinition(IntegrationContextUtils.ARGUMENT_RESOLVERS_BEAN_NAME,
-					internalArgumentResolversBuilder(false));
+	private void registerMessageHandlerMethodFactory() {
+		if (!this.beanFactory.containsBean(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME)) {
+			BeanDefinitionBuilder messageHandlerMethodFactoryBuilder =
+					createMessageHandlerMethodFactoryBeanDefinition(false);
+			this.registry.registerBeanDefinition(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME,
+					messageHandlerMethodFactoryBuilder.getBeanDefinition());
 		}
 	}
 
-	/**
-	 * Register the default
-	 * {@link org.springframework.integration.handler.support.HandlerMethodArgumentResolversHolder} for handler
-	 * method invocation for lists.
-	 */
-	private void registerListCapableArgumentResolvers() {
-		if (!this.beanFactory.containsBean(IntegrationContextUtils.LIST_ARGUMENT_RESOLVERS_BEAN_NAME)) {
-			this.registry.registerBeanDefinition(IntegrationContextUtils.LIST_ARGUMENT_RESOLVERS_BEAN_NAME,
-					internalArgumentResolversBuilder(true));
+	private void registerListMessageHandlerMethodFactory() {
+		if (!this.beanFactory.containsBean(IntegrationContextUtils.LIST_MESSAGE_HANDLER_FACTORY_BEAN_NAME)) {
+			BeanDefinitionBuilder messageHandlerMethodFactoryBuilder =
+					createMessageHandlerMethodFactoryBeanDefinition(true);
+			this.registry.registerBeanDefinition(IntegrationContextUtils.LIST_MESSAGE_HANDLER_FACTORY_BEAN_NAME,
+					messageHandlerMethodFactoryBuilder.getBeanDefinition());
 		}
 	}
 
-	@SuppressWarnings("deprecation")
-	private BeanDefinition internalArgumentResolversBuilder(boolean listCapable) {
+	private BeanDefinitionBuilder createMessageHandlerMethodFactoryBeanDefinition(boolean listCapable) {
+		return BeanDefinitionBuilder.genericBeanDefinition(DefaultMessageHandlerMethodFactory.class)
+				.addPropertyReference("messageConverter",
+						IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME)
+				.addPropertyValue("customArgumentResolvers", buildArgumentResolvers(listCapable));
+	}
+
+	private ManagedList<BeanDefinition> buildArgumentResolvers(boolean listCapable) {
 		ManagedList<BeanDefinition> resolvers = new ManagedList<>();
 		resolvers.add(new RootBeanDefinition(PayloadExpressionArgumentResolver.class));
 		BeanDefinitionBuilder builder =
@@ -513,7 +514,6 @@ private BeanDefinition internalArgumentResolversBuilder(boolean listCapable) {
 		// TODO Validator ?
 		resolvers.add(builder.getBeanDefinition());
 		resolvers.add(new RootBeanDefinition(PayloadsArgumentResolver.class));
-		resolvers.add(new RootBeanDefinition(MapArgumentResolver.class));
 
 		if (listCapable) {
 			resolvers.add(
@@ -522,10 +522,8 @@ private BeanDefinition internalArgumentResolversBuilder(boolean listCapable) {
 							.getBeanDefinition());
 		}
 
-		return BeanDefinitionBuilder.genericBeanDefinition(
-				org.springframework.integration.handler.support.HandlerMethodArgumentResolversHolder.class)
-				.addConstructorArgValue(resolvers)
-				.getBeanDefinition();
+		resolvers.add(new RootBeanDefinition(MapArgumentResolver.class));
+		return resolvers;
 	}
 
 }

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java

@@ -101,14 +101,12 @@ public abstract class IntegrationContextUtils {
 	public static final String ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME =
 			"integrationArgumentResolverMessageConverter";
 
-	public static final String ARGUMENT_RESOLVERS_BEAN_NAME = "integrationArgumentResolvers";
-
-	public static final String LIST_ARGUMENT_RESOLVERS_BEAN_NAME = "integrationListArgumentResolvers";
-
 	public static final String DISPOSABLES_BEAN_NAME = "integrationDisposableAutoCreatedBeans";
 
 	public static final String MESSAGE_HANDLER_FACTORY_BEAN_NAME = "integrationMessageHandlerMethodFactory";
 
+	public static final String LIST_MESSAGE_HANDLER_FACTORY_BEAN_NAME = "integrationListMessageHandlerMethodFactory";
+
 	/**
 	 * @param beanFactory BeanFactory for lookup, must not be null.
 	 * @return The {@link MetadataStore} bean whose name is "metadataStore".

spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java

@@ -61,7 +61,7 @@ public ExpressionCommandMessageProcessor(@Nullable MethodFilter methodFilter, @N
 		}
 		if (methodFilter != null) {
 			MethodResolver methodResolver = new ExpressionCommandMethodResolver(methodFilter);
-			getEvaluationContext(false).setMethodResolvers(Collections.singletonList(methodResolver));
+			getEvaluationContext().setMethodResolvers(Collections.singletonList(methodResolver));
 		}
 	}