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

Polishing previous commit as it's current version breaks the test

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-04-21 10:19:56 +02:00
parent e7c1244501
commit 490c91e849
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
View File

@@ -174,8 +174,6 @@ final class AWSLambdaUtils {
public static byte[] generateOutput(Message requestMessage, Message<?> responseMessage, public static byte[] generateOutput(Message requestMessage, Message<?> responseMessage,
JsonMapper objectMapper, Type functionOutputType) { JsonMapper objectMapper, Type functionOutputType) {
byte[] payload = extractPayload((Message<Object>) responseMessage, objectMapper);
Class<?> outputClass = FunctionTypeUtils.getRawType(functionOutputType); Class<?> outputClass = FunctionTypeUtils.getRawType(functionOutputType);
if (outputClass != null) { if (outputClass != null) {
String outputClassName = outputClass.getName(); 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.APIGatewayProxyResponseEvent") ||
outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") || outputClassName.equals("com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent") ||
outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) { outputClassName.equals("com.amazonaws.services.lambda.runtime.events.IamPolicyResponse")) {
return payload; return extractPayload((Message<Object>) responseMessage, objectMapper);
} }
} }
byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : payload; byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : extractPayload((Message<Object>) responseMessage, objectMapper);
if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) { if (requestMessage.getHeaders().containsKey(AWS_API_GATEWAY) && ((boolean) requestMessage.getHeaders().get(AWS_API_GATEWAY))) {
Map<String, Object> response = new HashMap<String, Object>(); Map<String, Object> response = new HashMap<String, Object>();
response.put("isBase64Encoded", false); response.put("isBase64Encoded", false);
@@ -208,7 +206,7 @@ final class AWSLambdaUtils {
} }
String body = responseMessage == null String body = responseMessage == null
? "\"OK\"" : new String(payload, StandardCharsets.UTF_8); ? "\"OK\"" : new String(extractPayload((Message<Object>) responseMessage, objectMapper), StandardCharsets.UTF_8);
response.put("body", body); response.put("body", body);
if (responseMessage != null) { if (responseMessage != null) {