From 57b8631e04c7c5dea3159d744aa9071ece7ed7c1 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 24 May 2023 10:03:55 +0200 Subject: [PATCH] Polishing previous commit --- .../function/adapter/aws/AWSLambdaUtils.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java index 8ceb4e300..62eb968e1 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java @@ -156,6 +156,7 @@ public final class AWSLambdaUtils { } result.add(value); } + if (result.size() > 1) { output = result; } @@ -165,15 +166,17 @@ public final class AWSLambdaUtils { else { output = null; } - if (output instanceof Message && ((Message) output).getPayload() instanceof byte[]) { - responseMessage = (Message) output; - } - else if (output != null) { - if (logger.isDebugEnabled()) { - logger.debug("OUTPUT: " + output + " - " + output.getClass().getName()); + if (output != null && output instanceof Message) { + if (output instanceof Message) { + responseMessage = (Message) output; + } + else { + if (logger.isDebugEnabled()) { + logger.debug("OUTPUT: " + output + " - " + output.getClass().getName()); + } + byte[] payload = objectMapper.toJson(output); + responseMessage = MessageBuilder.withPayload(payload).build(); } - byte[] payload = objectMapper.toJson(output); - responseMessage = MessageBuilder.withPayload(payload).build(); } } else {