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

Revert "GH-986 Fix regression to NOT attempt output conversion of Message<byte[]>"

Browse Source 
This reverts commit b1237c2ab2.
This commit is contained in:
Oleg Zhurakousky
2023-01-19 17:19:03 +01:00
parent 7d1751cc59
commit 6b9b9995ab
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.Message;
import org.springframework.messaging.converter.AbstractMessageConverter;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.MimeType;
import static org.assertj.core.api.Assertions.assertThat;
@@ -765,24 +764,6 @@ public class FunctionInvokerTests {
assertThat(result.get("body")).isEqualTo("\"Hello from ELB\"");
}
@Test
public void testLBEventReturningMessage() throws Exception {
System.setProperty("MAIN_CLASS", LBConfiguration.class.getName());
System.setProperty("spring.cloud.function.definition", "inputOutputLBEventAsMessage");
FunctionInvoker invoker = new FunctionInvoker();
InputStream targetStream = new ByteArrayInputStream(this.sampleLBEvent.getBytes());
ByteArrayOutputStream output = new ByteArrayOutputStream();
invoker.handleRequest(targetStream, output, null);
Map result = mapper.readValue(output.toByteArray(), Map.class);
System.out.println("RESULT: " + result);
assertThat(result.get("body")).isEqualTo("\"Hello\"");
assertThat((boolean) result.get("isBase64Encoded")).isFalse();
assertThat(((Map) result.get("headers")).get("foo")).isEqualTo("bar");
assertThat(result.get("statusCode")).isEqualTo(200);
}
@Test
public void testLBEventAsMessage() throws Exception {
System.setProperty("MAIN_CLASS", LBConfiguration.class.getName());
@@ -1317,14 +1298,6 @@ public class FunctionInvokerTests {
};
}
@Bean
public Function<ApplicationLoadBalancerRequestEvent, Message<byte[]>> inputOutputLBEventAsMessage() {
return v -> {
Message<byte[]> message = MessageBuilder.withPayload("\"Hello\"".getBytes(StandardCharsets.UTF_8)).setHeader("foo", "bar").build();
return message;
};
}
@Bean
public Function<ApplicationLoadBalancerRequestEvent, ApplicationLoadBalancerResponseEvent> inputOutputLBEvent() {
return v -> {