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

Disable NegotiatingMessageConverter

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-07-16 17:45:55 +02:00
parent 16f2cc85aa
commit 72ac946c52
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.core.convert.support.ConfigurableConversionService;
import org.springframework.messaging.converter.AbstractMessageConverter;
import org.springframework.messaging.converter.ByteArrayMessageConverter;
import org.springframework.messaging.converter.CompositeMessageConverter;
import org.springframework.messaging.converter.MessageConverter;
@@ -93,17 +92,24 @@ public class ContextFunctionCatalogAutoConfiguration {
}
}
// mcList = mcList.stream()
// .filter(c -> isConverterEligible(c))
// .map(converter -> {
// return converter instanceof AbstractMessageConverter
// ? NegotiatingMessageConverterWrapper.wrap((AbstractMessageConverter) converter)
// : converter;
// })
// .collect(Collectors.toList());
// mcList.add(NegotiatingMessageConverterWrapper.wrap(new JsonMessageConverter(jsonMapper)));
// mcList.add(NegotiatingMessageConverterWrapper.wrap(new ByteArrayMessageConverter()));
// mcList.add(NegotiatingMessageConverterWrapper.wrap(new StringMessageConverter()));
mcList = mcList.stream()
.filter(c -> isConverterEligible(c))
.map(converter -> {
return converter instanceof AbstractMessageConverter
? NegotiatingMessageConverterWrapper.wrap((AbstractMessageConverter) converter)
: converter;
})
.collect(Collectors.toList());
mcList.add(NegotiatingMessageConverterWrapper.wrap(new JsonMessageConverter(jsonMapper)));
mcList.add(NegotiatingMessageConverterWrapper.wrap(new ByteArrayMessageConverter()));
mcList.add(NegotiatingMessageConverterWrapper.wrap(new StringMessageConverter()));
mcList.add(new JsonMessageConverter(jsonMapper));
mcList.add(new ByteArrayMessageConverter());
mcList.add(new StringMessageConverter());
if (!CollectionUtils.isEmpty(mcList)) {
messageConverter = new CompositeMessageConverter(mcList);

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -391,6 +391,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
}
@Test
@Ignore
public void testMultipleOrderedAcceptValuesMessageOutput() throws Exception {
FunctionCatalog catalog = this.configureCatalog(MultipleOrderedAcceptValuesAsMessageOutputConfiguration.class);
Function<String, Message<byte[]>> function = catalog.lookup(
@@ -403,6 +404,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
@SuppressWarnings("unchecked")
@Test
@Ignore
public void testSerializationWithCompatibleWildcardSubtypeAcceptHeader() {
FunctionCatalog catalog = this.configureCatalog(NegotiatingMessageConverterConfiguration.class);
FunctionInvocationWrapper function = catalog.lookup("echo", "text/*");