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

GH-980 Ensure reactive types are supported by AWS adapter

Browse Source 
Resolves #980
This commit is contained in:
Oleg Zhurakousky
2023-01-23 13:00:37 +01:00
parent 9fec8d5d23
commit b4cbef163e
2 changed files with 20 additions and 7 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

@@ -56,7 +56,7 @@ public final class AWSLambdaUtils {
}
static boolean isSupportedAWSType(Type inputType) {
if (FunctionTypeUtils.isMessage(inputType)) {
if (FunctionTypeUtils.isMessage(inputType) || FunctionTypeUtils.isPublisher(inputType)) {
inputType = FunctionTypeUtils.getImmediateGenericType(inputType, 0);
}
String typeName = inputType.getTypeName();

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

@@ -690,12 +690,6 @@ public class FunctionInvokerTests {
@Test
public void testS3Event() throws Exception {
// S3EventSerializer<S3Event> ser = new S3EventSerializer<S3Event>().withClass(S3Event.class).withClassLoader(S3Event.class.getClassLoader());
// InputStream targetStream = new ByteArrayInputStream(this.s3Event.getBytes());
// S3Event event = ser.fromJson(targetStream);
// System.out.println(event);
System.setProperty("MAIN_CLASS", S3Configuration.class.getName());
System.setProperty("spring.cloud.function.definition", "inputS3Event");
FunctionInvoker invoker = new FunctionInvoker();
@@ -751,6 +745,20 @@ public class FunctionInvokerTests {
assertThat(result.get("body")).isEqualTo("\"Hello from ELB\"");
}
@Test
public void testS3EventReactive() throws Exception {
System.setProperty("MAIN_CLASS", S3Configuration.class.getName());
System.setProperty("spring.cloud.function.definition", "echoStringFlux");
FunctionInvoker invoker = new FunctionInvoker();
InputStream targetStream = new ByteArrayInputStream(this.s3Event.getBytes());
ByteArrayOutputStream output = new ByteArrayOutputStream();
invoker.handleRequest(targetStream, output, null);
String result = new String(output.toByteArray(), StandardCharsets.UTF_8);
assertThat(result).contains("s3SchemaVersion");
}
@Test
public void testLBEvent() throws Exception {
System.setProperty("MAIN_CLASS", LBConfiguration.class.getName());
@@ -1276,6 +1284,11 @@ public class FunctionInvokerTests {
return v -> v;
}
@Bean
public Function<Flux<String>, Flux<String>> echoStringFlux() {
return v -> v;
}
@Bean
public Function<S3Event, String> inputS3Event(JsonMapper jsonMapper) {
return v -> {