From 854bc31264c6bec421392aebb0d56eb103ebf8b2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 5 Mar 2019 09:35:19 +0100 Subject: [PATCH] Added name to MessageHandlerMethodFactory bean registration --- .../cloud/stream/config/BinderFactoryConfiguration.java | 2 +- .../cloud/stream/binder/tck/ContentTypeTckTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java index f76535aa3..88be6dfa5 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java @@ -113,7 +113,7 @@ public class BinderFactoryConfiguration { return parsedBinderConfigurations; } - @Bean + @Bean(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME) public static MessageHandlerMethodFactory messageHandlerMethodFactory( CompositeMessageConverterFactory compositeMessageConverterFactory, @Qualifier(IntegrationContextUtils.ARGUMENT_RESOLVERS_BEAN_NAME) HandlerMethodArgumentResolversHolder ahmar, diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java index d9269710a..4b7e7e27b 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java @@ -728,7 +728,7 @@ public class ContentTypeTckTests { @Test public void testWithTypelessMessageInputParameterAndServiceActivator() { ApplicationContext context = new SpringApplicationBuilder( - TypelessPayloadConfigurationSA.class).web(WebApplicationType.NONE) + TypelessMessageConfigurationSA.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); InputDestination source = context.getBean(InputDestination.class); OutputDestination target = context.getBean(OutputDestination.class);