From fc827e1f929e3a5a77738e42f246c9c298f8a78b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 31 Jul 2019 10:14:02 -0400 Subject: [PATCH] GH-3004: Revert scope of handler factories See https://github.com/spring-projects/spring-integration/issues/3004 https://github.com/spring-projects/spring-framework/issues/23352 is now resolved so the `DefaultMessageHandlerMethodFactory` can be singletons. --- .../config/DefaultConfiguringBeanFactoryPostProcessor.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java index c943677845..a1cc2c3f08 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java @@ -38,7 +38,6 @@ import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.beans.factory.config.RuntimeBeanReference; @@ -518,8 +517,6 @@ class DefaultConfiguringBeanFactoryPostProcessor if (!this.beanFactory.containsBean(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME)) { BeanDefinitionBuilder messageHandlerMethodFactoryBuilder = createMessageHandlerMethodFactoryBeanDefinition(false); - // TODO: https://github.com/spring-projects/spring-framework/issues/23352 - messageHandlerMethodFactoryBuilder.setScope(ConfigurableBeanFactory.SCOPE_PROTOTYPE); this.registry.registerBeanDefinition(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME, messageHandlerMethodFactoryBuilder.getBeanDefinition()); } @@ -529,8 +526,6 @@ class DefaultConfiguringBeanFactoryPostProcessor if (!this.beanFactory.containsBean(IntegrationContextUtils.LIST_MESSAGE_HANDLER_FACTORY_BEAN_NAME)) { BeanDefinitionBuilder messageHandlerMethodFactoryBuilder = createMessageHandlerMethodFactoryBeanDefinition(true); - // TODO: https://github.com/spring-projects/spring-framework/issues/23352 - messageHandlerMethodFactoryBuilder.setScope(ConfigurableBeanFactory.SCOPE_PROTOTYPE); this.registry.registerBeanDefinition(IntegrationContextUtils.LIST_MESSAGE_HANDLER_FACTORY_BEAN_NAME, messageHandlerMethodFactoryBuilder.getBeanDefinition()); }