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

GH-1172 Ensure content-type set in a message is honored on the output

Browse Source 
Also, ensures that the proper content type is set in GCF FunctionInvoker

Resolves #1172
This commit is contained in:
Oleg Zhurakousky
2024-09-09 12:51:36 +02:00
parent 81a2d24a14
commit 85a4fffcd4
7 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,15 @@ public class FunctionInvoker implements HttpFunction, RawBackgroundFunction {
if (result != null) {
MessageHeaders headers = result.getHeaders();
httpResponse.setContentType(result.getHeaders().get(MessageHeaders.CONTENT_TYPE).toString());
if (result.getHeaders().containsKey(MessageHeaders.CONTENT_TYPE)) {
httpResponse.setContentType(result.getHeaders().get(MessageHeaders.CONTENT_TYPE).toString());
}
else if (result.getHeaders().containsKey("Content-Type")) {
httpResponse.setContentType(result.getHeaders().get("Content-Type").toString());
}
else {
httpRequest.getContentType().ifPresent(contentType -> httpResponse.setContentType(contentType));
}
httpResponse.getWriter().write(new String(result.getPayload(), StandardCharsets.UTF_8));
for (Entry<String, Object> header : headers.entrySet()) {
Object values = header.getValue();
@@ -133,7 +141,6 @@ public class FunctionInvoker implements HttpFunction, RawBackgroundFunction {
httpResponse.appendHeader(header.getKey(), header.getValue().toString());
}
}
httpRequest.getContentType().ifPresent(contentType -> httpResponse.setContentType(contentType));
if (headers.containsKey(HTTP_STATUS_CODE)) {
if (headers.get(HTTP_STATUS_CODE) instanceof Integer) {

5
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
View File

@@ -42,6 +42,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.MessageBuilder;
import static java.util.Arrays.asList;
@@ -165,7 +166,7 @@ public class FunctionInvokerHttpTests {
bufferedWriter.close();
verify(response).setStatusCode(404);
verify(response).setContentType("text/plain");
}
@Test
@@ -200,7 +201,7 @@ public class FunctionInvokerHttpTests {
String payload = "hello";
Message<String> msg = MessageBuilder.withPayload(payload).setHeader("statusCode", 404)
Message<String> msg = MessageBuilder.withPayload(payload).setHeader("statusCode", 404).setHeader(MessageHeaders.CONTENT_TYPE, "text/plain")
.build();
return x -> msg;