From 912dc31568ff78dac55d376cce4dbd1ebb4e187b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 3 Feb 2020 13:22:34 +0100 Subject: [PATCH] Streamlined output conversion logic --- .../catalog/BeanFactoryAwareFunctionRegistry.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index bec7213ba..15f309454 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -616,6 +616,9 @@ public class BeanFactoryAwareFunctionRegistry convertedValue = messageConverter.toMessage(message.getPayload(), message.getHeaders()); } } + 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) { @@ -627,13 +630,8 @@ public class BeanFactoryAwareFunctionRegistry convertedValue = messages.get(); } else { - if (value instanceof byte[]) { - convertedValue = MessageBuilder.withPayload(value).setHeader(MessageHeaders.CONTENT_TYPE, acceptedContentType).build(); - } - else { - convertedValue = messageConverter - .toMessage(value, new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, acceptedContentType))); - } + convertedValue = messageConverter + .toMessage(value, new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, acceptedContentType))); } } }