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

Minor enhancements to the previosu commit

Browse Source 
Resolves #448
This commit is contained in:
Oleg Zhurakousky
2020-02-10 20:43:11 +01:00
parent 005d87181f
commit 6c4b5051c3
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -88,6 +88,8 @@ import org.springframework.util.StringUtils;
* {@link #register(FunctionRegistration)} operation are stored/cached locally. * {@link #register(FunctionRegistration)} operation are stored/cached locally.
* *
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @author Eric Botard
*
* @since 3.0 * @since 3.0
*/ */
public class BeanFactoryAwareFunctionRegistry public class BeanFactoryAwareFunctionRegistry
@@ -596,12 +598,12 @@ public class BeanFactoryAwareFunctionRegistry
} }
else { else {
result = this.invokeFunction(this.composed ? input result = this.invokeFunction(this.composed ? input
: this.convertInputValueIfNecessary(input, FunctionTypeUtils.getInputType(this.functionType, 0))); : (input == null ? input : this.convertInputValueIfNecessary(input, FunctionTypeUtils.getInputType(this.functionType, 0))));
} }
} }
// Outputs will be converted only if we're told how (via acceptedOutputMimeTypes), otherwise output returned as is. // Outputs will be converted only if we're told how (via acceptedOutputMimeTypes), otherwise output returned as is.
if (!ObjectUtils.isEmpty(this.acceptedOutputMimeTypes)) { if (result != null && !ObjectUtils.isEmpty(this.acceptedOutputMimeTypes)) {
result = result instanceof Publisher result = result instanceof Publisher
? this.convertOutputPublisherIfNecessary((Publisher<?>) result, enricher, this.acceptedOutputMimeTypes) ? this.convertOutputPublisherIfNecessary((Publisher<?>) result, enricher, this.acceptedOutputMimeTypes)
: this.convertOutputValueIfNecessary(result, enricher, this.acceptedOutputMimeTypes); : this.convertOutputValueIfNecessary(result, enricher, this.acceptedOutputMimeTypes);
@@ -634,43 +636,48 @@ public class BeanFactoryAwareFunctionRegistry
} }
convertedValue = Tuples.fromArray(convertedInputArray); convertedValue = Tuples.fromArray(convertedInputArray);
} }
else if (value != null) { else {
List<MimeType> acceptedContentTypes = MimeTypeUtils.parseMimeTypes(acceptedOutputMimeTypes[0].toString()); List<MimeType> acceptedContentTypes = MimeTypeUtils.parseMimeTypes(acceptedOutputMimeTypes[0].toString());
if (CollectionUtils.isEmpty(acceptedContentTypes)) {
for (int i = 0; i < acceptedContentTypes.size() && convertedValue == null; i++) { convertedValue = value;
MimeType acceptedContentType = acceptedContentTypes.get(i); }
if (value instanceof Message) { else {
Message<?> message = (Message<?>) value; for (int i = 0; i < acceptedContentTypes.size() && convertedValue == null; i++) {
if (message.getPayload() instanceof byte[]) { MimeType acceptedContentType = acceptedContentTypes.get(i);
convertedValue = message; if (value instanceof Message) {
Message<?> message = (Message<?>) value;
if (message.getPayload() instanceof byte[]) {
convertedValue = message;
}
else {
convertedValue = this.convertValueToMessage(message, enricher, acceptedContentType);
}
}
else if (value instanceof byte[]) {
convertedValue = MessageBuilder.withPayload(value).setHeader(MessageHeaders.CONTENT_TYPE, acceptedContentType).build();
}
else if (value instanceof Iterable || ObjectUtils.isArray(value)) {
boolean isArray = ObjectUtils.isArray(value);
if (isArray) {
value = Arrays.asList((Object[]) value);
}
AtomicReference<List<Message>> messages = new AtomicReference<List<Message>>(new ArrayList<>());
((Iterable) value).forEach(element ->
messages.get().add((Message) convertOutputValueIfNecessary(element, enricher, acceptedContentType.toString())));
convertedValue = messages.get();
} }
else { else {
convertedValue = this.convertValueToMessage(message, enricher, acceptedContentType); convertedValue = this.convertValueToMessage(value, enricher, acceptedContentType);
} }
} }
else if (value instanceof byte[]) {
convertedValue = MessageBuilder.withPayload(value).setHeader(MessageHeaders.CONTENT_TYPE, acceptedContentType).build();
}
else if (value instanceof Iterable || ObjectUtils.isArray(value)) {
boolean isArray = ObjectUtils.isArray(value);
if (isArray) {
value = Arrays.asList((Object[]) value);
}
AtomicReference<List<Message>> messages = new AtomicReference<List<Message>>(new ArrayList<>());
((Iterable) value).forEach(element ->
messages.get().add((Message) convertOutputValueIfNecessary(element, enricher, acceptedContentType.toString())));
convertedValue = messages.get();
}
else {
convertedValue = this.convertValueToMessage(value, enricher, acceptedContentType);
}
} }
} }
if (convertedValue == null) { if (convertedValue == null) {
throw new MessageConversionException(COULD_NOT_CONVERT_OUTPUT); throw new MessageConversionException(COULD_NOT_CONVERT_OUTPUT);
} }
return convertedValue; return convertedValue;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")