From afd68680b3b9f6764896c561999bccfe72c8676b Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 19 Jan 2018 09:30:23 +0000 Subject: [PATCH] Polish --- .../SpringBootApiGatewayRequestHandler.java | 37 +++++++++++-------- .../adapter/aws/SpringBootRequestHandler.java | 12 +++--- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java index 720ffd861..b75f65553 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java @@ -1,19 +1,21 @@ package org.springframework.cloud.function.adapter.aws; +import java.util.HashMap; +import java.util.Map; + import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.function.context.catalog.FunctionInspector; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; -import java.util.HashMap; -import java.util.Map; - -public class SpringBootApiGatewayRequestHandler extends SpringBootRequestHandler { +public class SpringBootApiGatewayRequestHandler extends + SpringBootRequestHandler { @Autowired private ObjectMapper mapper; @@ -29,11 +31,13 @@ public class SpringBootApiGatewayRequestHandler extends SpringBootRequestHandler super(); } + @Override protected Object convertEvent(APIGatewayProxyRequestEvent event) { Object body = deserializeBody(event.getBody()); if (functionAcceptsMessage()) { return new GenericMessage<>(body, getHeaders(event)); - } else { + } + else { return body; } } @@ -45,7 +49,8 @@ public class SpringBootApiGatewayRequestHandler extends SpringBootRequestHandler private Object deserializeBody(String json) { try { return mapper.readValue(json, getInputType()); - } catch (Exception e) { + } + catch (Exception e) { throw new IllegalStateException("Cannot convert event", e); } } @@ -59,19 +64,19 @@ public class SpringBootApiGatewayRequestHandler extends SpringBootRequestHandler return new MessageHeaders(headers); } + @Override protected APIGatewayProxyResponseEvent convertOutput(Object output) { if (functionReturnsMessage(output)) { - Message message = (Message) output; - return new APIGatewayProxyResponseEvent() - .withStatusCode((Integer) message.getHeaders().getOrDefault("statusCode", 200)) + Message message = (Message) output; + return new APIGatewayProxyResponseEvent().withStatusCode( + (Integer) message.getHeaders().getOrDefault("statusCode", 200)) .withHeaders(toResponseHeaders(message.getHeaders())) .withBody(serializeBody(message.getPayload())); - } else { - return new APIGatewayProxyResponseEvent() - .withStatusCode(200) + } + else { + return new APIGatewayProxyResponseEvent().withStatusCode(200) .withBody(serializeBody(output)); - } } @@ -81,14 +86,16 @@ public class SpringBootApiGatewayRequestHandler extends SpringBootRequestHandler private Map toResponseHeaders(MessageHeaders messageHeaders) { Map responseHeaders = new HashMap<>(); - messageHeaders.forEach((key, value) -> responseHeaders.put(key, value.toString())); + messageHeaders + .forEach((key, value) -> responseHeaders.put(key, value.toString())); return responseHeaders; } private String serializeBody(Object body) { try { return mapper.writeValueAsString(body); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { throw new IllegalStateException("Cannot convert output", e); } } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandler.java index e3385478e..4f6cf2d98 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandler.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandler.java @@ -28,7 +28,8 @@ import reactor.core.publisher.Flux; /** * @author Mark Fisher */ -public class SpringBootRequestHandler extends SpringFunctionInitializer implements RequestHandler { +public class SpringBootRequestHandler extends SpringFunctionInitializer + implements RequestHandler { public SpringBootRequestHandler(Class configurationClass) { super(configurationClass); @@ -51,7 +52,7 @@ public class SpringBootRequestHandler extends SpringFunctionInitializer im for (Object value : output.toIterable()) { result.add(convertOutput(value)); } - if (isSingleValue(input) && result.size()==1) { + if (isSingleValue(input) && result.size() == 1) { return result.get(0); } return result; @@ -72,8 +73,9 @@ public class SpringBootRequestHandler extends SpringFunctionInitializer im return event; } - protected O convertOutput(Object output) { - return (O) output; - } + @SuppressWarnings("unchecked") + protected O convertOutput(Object output) { + return (O) output; + } }