SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1772 remove temporary scope declaration

Browse Source 
Resolves #1772
This commit is contained in:
Oleg Zhurakousky
2019-08-07 09:20:30 +02:00
parent 4ca3ed142d
commit c35e362d10
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java
View File

@@ -66,7 +66,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Role;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.env.Environment;
import org.springframework.core.env.StandardEnvironment;
@@ -136,14 +135,11 @@ public class BinderFactoryAutoConfiguration {
@Bean(IntegrationContextUtils.MESSAGE_HANDLER_FACTORY_BEAN_NAME)
@Scope("prototype")
public static MessageHandlerMethodFactory messageHandlerMethodFactory(
@Qualifier(IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME) CompositeMessageConverter compositeMessageConverter,
@Nullable Validator validator, ConfigurableListableBeanFactory clbf) {
DefaultMessageHandlerMethodFactory messageHandlerMethodFactory = new DefaultMessageHandlerMethodFactory();
// CompositeMessageConverter messageConverter =
// compositeMessageConverterFactory.getMessageConverterForAllRegistered();
messageHandlerMethodFactory.setMessageConverter(compositeMessageConverter);
/*

10
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ContentTypeConfiguration.java
View File

@@ -39,14 +39,6 @@ import org.springframework.messaging.converter.MessageConverter;
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
class ContentTypeConfiguration {
// @Bean
// public CompositeMessageConverterFactory compositeMessageConverterFactory(
// ObjectProvider<ObjectMapper> objectMapperObjectProvider, List<MessageConverter> customMessageConverters) {
//
// return new CompositeMessageConverterFactory(customMessageConverters,
// objectMapperObjectProvider.getIfAvailable(ObjectMapper::new));
// }
@Bean(name = IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME)
public ConfigurableCompositeMessageConverter configurableCompositeMessageConverter(
ObjectProvider<ObjectMapper> objectMapperObjectProvider,
@@ -59,8 +51,6 @@ class ContentTypeConfiguration {
messageConverters.addAll(customMessageConverters);
return new ConfigurableCompositeMessageConverter(messageConverters);
}
}