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

Simplified MessageConverter configuration

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-07-31 08:28:34 +02:00
parent 14451272fe
commit 38981003b9
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -46,12 +46,12 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.lang.Nullable;
import org.springframework.messaging.converter.ByteArrayMessageConverter;
import org.springframework.messaging.converter.CompositeMessageConverter;
import org.springframework.messaging.converter.MappingJackson2MessageConverter;
import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.converter.StringMessageConverter;
import org.springframework.util.CollectionUtils;
/**
@@ -68,18 +68,29 @@ public class ContextFunctionCatalogAutoConfiguration {
static final String PREFERRED_MAPPER_PROPERTY = "spring.http.converters.preferred-json-mapper";
@Bean
public FunctionRegistry functionCatalog(@Nullable CompositeMessageConverter messageConverter,
Map<String, MessageConverter> additionalConverters) {
public FunctionRegistry functionCatalog(Map<String, MessageConverter> messageConverters) {
ConversionService conversionService = new DefaultConversionService();
if (messageConverter == null) {
List<MessageConverter> messageConverters = new ArrayList<>();
messageConverters.addAll(additionalConverters.values());
messageConverters.add(new MappingJackson2MessageConverter());
messageConverters.add(new ByteArrayMessageConverter());
messageConverters.add(new StringMessageConverter());
messageConverter = new CompositeMessageConverter(messageConverters);
}
CompositeMessageConverter messageConverter = null;
List<MessageConverter> mcList = new ArrayList<>();
boolean addDefaultConverters = true;
if (!CollectionUtils.isEmpty(messageConverters)) {
for (MessageConverter mc : messageConverters.values()) {
if (mc instanceof CompositeMessageConverter) {
mcList.addAll(((CompositeMessageConverter) mc).getConverters());
addDefaultConverters = false;
}
else {
mcList.add(mc);
}
}
}
if (addDefaultConverters) {
mcList.add(new MappingJackson2MessageConverter());
mcList.add(new ByteArrayMessageConverter());
mcList.add(new StringMessageConverter());
}
messageConverter = new CompositeMessageConverter(mcList);
return new BeanFactoryAwareFunctionRegistry(conversionService, messageConverter);
}