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

Polish to fix build

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-11-03 15:38:27 +01:00
parent 1ed99667bb
commit e95279daae
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -729,6 +729,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
*
*/
private Object convertInputIfNecessary(Object input, Type type) {
if (type == null) {
return input;
}
if (this.getRawClassFor(type) == Void.class && !(input instanceof Publisher) && !(input instanceof Message)) {
logger.info("Input value '" + input + "' is ignored for function '"
+ this.functionDefinition + "' since it's input type is Void and as such it is treated as Supplier.");

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

@@ -95,10 +95,11 @@ public class ContextFunctionCatalogAutoConfiguration {
mcList = mcList.stream()
.filter(c -> isConverterEligible(c))
.collect(Collectors.toList());
mcList.add(new StringMessageConverter());
mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService));
mcList.add(new JsonMessageConverter(jsonMapper));
mcList.add(new ByteArrayMessageConverter());
mcList.add(new StringMessageConverter());
mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService));
if (!CollectionUtils.isEmpty(mcList)) {

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
View File

@@ -170,10 +170,10 @@ public class ContextFunctionCatalogInitializer implements ApplicationContextInit
List<MessageConverter> messageConverters = new ArrayList<>();
JsonMapper jsonMapper = this.context.getBean(JsonMapper.class);
messageConverters.add(new StringMessageConverter());
messageConverters.add(new PrimitiveTypesFromStringMessageConverter(new DefaultConversionService()));
messageConverters.add(new JsonMessageConverter(jsonMapper));
messageConverters.add(new ByteArrayMessageConverter());
messageConverters.add(new StringMessageConverter());
messageConverters.add(new PrimitiveTypesFromStringMessageConverter(new DefaultConversionService()));
SmartCompositeMessageConverter messageConverter = new SmartCompositeMessageConverter(messageConverters);