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

GH-639 Fix NPE for when using Supplier with AWS API Gateway

Browse Source 
Resolves #639
This commit is contained in:
Oleg Zhurakousky
2021-02-08 10:36:00 +01:00
parent b96b834cdd
commit f3573f359d
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ final class AWSLambdaUtils {
} }
private static boolean isTypeAnApiGatewayRequest(Type type) { private static boolean isTypeAnApiGatewayRequest(Type type) {
return isAPIGatewayProxyRequestEventPresent() return type != null && isAPIGatewayProxyRequestEventPresent()
? type.getTypeName().endsWith(APIGatewayProxyRequestEvent.class.getSimpleName()) ? type.getTypeName().endsWith(APIGatewayProxyRequestEvent.class.getSimpleName())
: false; : false;
} }

23
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
View File

@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
import com.amazonaws.services.lambda.runtime.events.KinesisEvent; import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
@@ -625,6 +626,22 @@ public class FunctionInvokerTests {
assertThat(result.get("body")).isEqualTo("\"hello\""); assertThat(result.get("body")).isEqualTo("\"hello\"");
} }
@SuppressWarnings("rawtypes")
@Test
public void testApiGatewayAsSupplier() throws Exception {
System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName());
System.setProperty("spring.cloud.function.definition", "supply");
FunctionInvoker invoker = new FunctionInvoker();
InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes());
ByteArrayOutputStream output = new ByteArrayOutputStream();
invoker.handleRequest(targetStream, output, null);
Map result = mapper.readValue(output.toByteArray(), Map.class);
System.out.println(result);
assertThat(result.get("body")).isEqualTo("\"boom\"");
}
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Test @Test
public void testApiGatewayEventAsMessage() throws Exception { public void testApiGatewayEventAsMessage() throws Exception {
@@ -840,6 +857,12 @@ public class FunctionInvokerTests {
@Configuration @Configuration
public static class ApiGatewayConfiguration { public static class ApiGatewayConfiguration {
@Bean
public Supplier<String> supply() {
return () -> "boom";
}
@Bean @Bean
public Consumer<String> consume() { public Consumer<String> consume() {
return v -> System.out.println(v); return v -> System.out.println(v);