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

GH-929 Ensure AWS Functioininvoker handles Mono<Void> return the same way as imperative Consumer

Browse Source 
Resolves #929
This commit is contained in:
Oleg Zhurakousky
2022-10-19 10:51:55 +02:00
parent 47f3964435
commit b44984f59c
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,28 +90,31 @@ public class FunctionInvoker implements RequestStreamHandler {
@SuppressWarnings("unchecked")
private byte[] buildResult(Message<?> requestMessage, Object output) throws IOException {
Message<byte[]> responseMessage;
Message<byte[]> responseMessage = null;
if (output instanceof Publisher<?>) {
List<Object> result = new ArrayList<>();
for (Object value : Flux.from((Publisher<?>) output).toIterable()) {
if (logger.isInfoEnabled()) {
logger.info("Response value: " + value);
if (logger.isDebugEnabled()) {
logger.debug("Response value: " + value);
}
result.add(value);
}
if (result.size() > 1) {
output = result;
}
else {
else if (result.size() == 1) {
output = result.get(0);
}
if (logger.isInfoEnabled()) {
logger.info("OUTPUT: " + output + " - " + output.getClass().getName());
else {
output = null;
}
if (output != null) {
if (logger.isDebugEnabled()) {
logger.debug("OUTPUT: " + output + " - " + output.getClass().getName());
}
byte[] payload = this.jsonMapper.toJson(output);
responseMessage = MessageBuilder.withPayload(payload).build();
}
byte[] payload = this.jsonMapper.toJson(output);
responseMessage = MessageBuilder.withPayload(payload).build();
}
else {
responseMessage = (Message<byte[]>) output;

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

@@ -44,6 +44,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.function.json.JsonMapper;
@@ -1024,6 +1025,21 @@ public class FunctionInvokerTests {
assertThat(result.get("body")).isEqualTo("\"OK\"");
}
@SuppressWarnings("rawtypes")
@Test
public void testApiGatewayWithMonoVoidAsReturn() throws Exception {
System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName());
System.setProperty("spring.cloud.function.definition", "reactiveWithVoidReturn");
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);
assertThat(result.get("body")).isEqualTo("\"OK\"");
}
@Test
public void testWithDefaultRoutingFailure() throws Exception {
System.setProperty("MAIN_CLASS", SampleConfiguration.class.getName());
@@ -1315,6 +1331,11 @@ public class FunctionInvokerTests {
return v -> v.toUpperCase();
}
@Bean
public Function<Mono<String>, Mono<Void>> reactiveWithVoidReturn() {
return v -> Mono.empty();
}
@Bean
public Function<Person, String> uppercasePojo() {
return v -> {