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

Simplified previous commit

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-10-23 16:32:09 +02:00
parent 72e96a3b2e
commit 551a6a4dd0
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,24 +211,16 @@ public class BinderFactoryAutoConfiguration {
public MessageConverterConfigurer messageConverterConfigurer(
BindingServiceProperties bindingServiceProperties,
@Qualifier(IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME) CompositeMessageConverter compositeMessageConverter,
Environment environment) {
Environment environment, BinderTypeRegistry binderTypeRegistry) {
MessageConverterConfigurer messageConverterConfigurer = null;
if (StringUtils.hasText(environment.getProperty("spring.cloud.stream.function.definition"))) {
try {
ClassUtils.forName("org.apache.kafka.streams.kstream.KStream", ClassUtils.getDefaultClassLoader());
messageConverterConfigurer = new MessageConverterConfigurer(bindingServiceProperties, compositeMessageConverter);
}
catch (Exception e) {
// ignore
}
if (binderTypeRegistry.getAll().keySet().contains("kstream") || !environment.containsProperty("spring.cloud.stream.function.definition")) {
return new MessageConverterConfigurer(bindingServiceProperties, compositeMessageConverter);
}
else {
messageConverterConfigurer = new MessageConverterConfigurer(bindingServiceProperties, compositeMessageConverter);
}
return messageConverterConfigurer;
return null;
}
@Bean
public SubscribableChannelBindingTargetFactory channelFactory(
CompositeMessageChannelConfigurer compositeMessageChannelConfigurer) {