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

GH-419 Fix output type conversion

Browse Source 
Ensured that we check for the output type and see if and what type of conversion needs to be applied. If output is already a message with payload byte[], then no conversion is necessary

Resolves #419
This commit is contained in:
Oleg Zhurakousky
2019-10-24 12:19:14 +02:00
parent 0d536fae71
commit 8ec28bb004
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -602,10 +602,28 @@ public class BeanFactoryAwareFunctionRegistry
convertedValue = acceptedContentTypes.stream()
.map(acceptedContentType -> {
Object v = value instanceof Message ? ((Message<?>) value).getPayload() : value;
return messageConverter
.toMessage(v, new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, acceptedContentType)));
})
Message<?> resultMessage = null;
if (value instanceof Message) {
Message<?> message = (Message<?>) value;
if (message.getPayload() instanceof byte[]) {
resultMessage = message;
}
else {
resultMessage = messageConverter.toMessage(message.getPayload(), message.getHeaders());
}
}
else {
if (value instanceof byte[]) {
resultMessage = MessageBuilder.withPayload(value).setHeader(MessageHeaders.CONTENT_TYPE, acceptedContentType).build();
}
else {
resultMessage = messageConverter
.toMessage(value, new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, acceptedContentType)));
}
}
return resultMessage;
})
.filter(v -> v != null)
.findFirst().orElse(null);
}