From 490c91e8495e65304c61be28bf1c0dde5d804e4f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 21 Apr 2022 10:19:56 +0200 Subject: [PATCH] Polishing previous commit as it's current version breaks the test --- .../cloud/function/adapter/aws/AWSLambdaUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 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 87e556f27..3eb2a9f72 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 @@ -174,8 +174,6 @@ final class AWSLambdaUtils { public static byte[] generateOutput(Message requestMessage, Message responseMessage, JsonMapper objectMapper, Type functionOutputType) { - byte[] payload = extractPayload((Message) responseMessage, objectMapper); - Class outputClass = FunctionTypeUtils.getRawType(functionOutputType); if (outputClass != null) { String outputClassName = outputClass.getName(); @@ -183,11 +181,11 @@ final class AWSLambdaUtils { outputClassName.equals("com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) { - return payload; + return extractPayload((Message) responseMessage, objectMapper); } } - byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : payload; + byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : extractPayload((Message) responseMessage, objectMapper); if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) { Map response = new HashMap(); response.put("isBase64Encoded", false); @@ -208,7 +206,7 @@ final class AWSLambdaUtils { } String body = responseMessage == null - ? "\"OK\"" : new String(payload, StandardCharsets.UTF_8); + ? "\"OK\"" : new String(extractPayload((Message) responseMessage, objectMapper), StandardCharsets.UTF_8); response.put("body", body); if (responseMessage != null) {