From 53b61e5ebf45bece77693b1281593db756202c6e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 24 May 2023 10:57:23 +0200 Subject: [PATCH] Revert "Polishing previous commit" This reverts commit 57b8631e04c7c5dea3159d744aa9071ece7ed7c1. --- .../function/adapter/aws/AWSLambdaUtils.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 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 62eb968e1..8ceb4e300 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,7 +156,6 @@ public final class AWSLambdaUtils { } result.add(value); } - if (result.size() > 1) { output = result; } @@ -166,17 +165,15 @@ public final class AWSLambdaUtils { else { output = null; } - 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(); + 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()); } + byte[] payload = objectMapper.toJson(output); + responseMessage = MessageBuilder.withPayload(payload).build(); } } else {