Simplified enhanecements to SpringBootApiGatewayRequestHandler introduced by previous commit"

Resolves #249
Resolves #375
This commit is contained in:
Oleg Zhurakousky
2019-06-17 15:42:10 +02:00
parent 01e813ec52
commit 493b9da295

View File

@@ -58,23 +58,10 @@ public class SpringBootApiGatewayRequestHandler extends
@Override @Override
protected Object convertEvent(APIGatewayProxyRequestEvent event) { protected Object convertEvent(APIGatewayProxyRequestEvent event) {
Object deserializedBody = event.getBody() != null ? deserializeBody(event.getBody()) : Optional.empty();
if (event.getBody() != null) { return functionAcceptsMessage()
if (functionAcceptsMessage()) { ? new GenericMessage<>(deserializedBody, getHeaders(event))
return new GenericMessage<>(deserializeBody(event.getBody()), getHeaders(event)); : deserializedBody;
}
else {
return deserializeBody(event.getBody());
}
}
else {
if (functionAcceptsMessage()) {
return new GenericMessage<Optional<Void>>(Optional.empty(), getHeaders(event));
}
else {
return Optional.empty();
}
}
} }
private boolean functionAcceptsMessage() { private boolean functionAcceptsMessage() {