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

Fixed README generation and polished few tests

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-08-19 17:03:40 +02:00
parent 946365dcdc
commit 591b3bf531
4 changed files with 61 additions and 14 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/BeanFactoryAwareFunctionRegistry.java
View File

@@ -430,6 +430,7 @@ public class BeanFactoryAwareFunctionRegistry
}
}
// Outputs will be converted only if we're told how (via acceptedOutputMimeTypes), otherwise output returned as is.
if (!ObjectUtils.isEmpty(this.acceptedOutputMimeTypes)) {
result = result instanceof Publisher
? this.convertOutputPublisherIfNecessary((Publisher<?>) result, this.acceptedOutputMimeTypes)
@@ -462,7 +463,7 @@ public class BeanFactoryAwareFunctionRegistry
}
convertedValue = Tuples.fromArray(convertedInputArray);
}
else {
else if (value != null) {
List<MimeType> acceptedContentTypes = MimeTypeUtils.parseMimeTypes(acceptedOutputMimeTypes[0].toString());
convertedValue = acceptedContentTypes.stream()