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

Fix ClassCastException with Spring Native

Browse Source 
Resolves #860
This commit is contained in:
Twometer
2022-04-20 11:44:58 +02:00
committed by Oleg Zhurakousky
parent 28ffac0fe3
commit 4b8a45c654
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,10 +161,21 @@ final class AWSLambdaUtils {
return messageBuilder; return messageBuilder;
} }
private static byte[] extractPayload(Message<Object> msg, JsonMapper objectMapper) {
if (msg.getPayload() instanceof byte[]) {
return (byte[]) msg.getPayload();
}
else {
return objectMapper.toJson(msg.getPayload());
}
}
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public static byte[] generateOutput(Message requestMessage, Message<byte[]> 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();
@@ -172,11 +183,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 responseMessage.getPayload(); return payload;
} }
} }
byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : responseMessage.getPayload(); byte[] responseBytes = responseMessage == null ? "\"OK\"".getBytes() : payload;
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);
@@ -197,7 +208,7 @@ final class AWSLambdaUtils {
} }
String body = responseMessage == null String body = responseMessage == null
? "\"OK\"" : new String(responseMessage.getPayload(), StandardCharsets.UTF_8); ? "\"OK\"" : new String(payload, StandardCharsets.UTF_8);
response.put("body", body); response.put("body", body);
if (responseMessage != null) { if (responseMessage != null) {