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

Fix HTTP header propagation logic

Browse Source 
Related to GH-422 and GH-606
This commit is contained in:
Oleg Zhurakousky
2020-11-13 17:47:41 +01:00
parent 311649c312
commit 7ddbbe52cd
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java
View File

@@ -191,7 +191,24 @@ public class RequestProcessor {
.map(message -> message.getPayload());
}
else {
builder.headers(HeaderUtils.sanitize(request.headers()));
if (result instanceof Mono) {
result = Mono.from(result)
.map(message -> MessageUtils.unpack(handler, message))
.doOnNext(value -> {
builder.headers(HeaderUtils.sanitize(request.headers()));
addHeaders(builder, value);
})
.map(message -> message.getPayload());
}
else {
result = Flux.from(result)
.map(message -> MessageUtils.unpack(handler, message))
.doOnNext(value -> {
builder.headers(HeaderUtils.sanitize(request.headers()));
addHeaders(builder, value);
})
.map(message -> message.getPayload());
}
}
if (isOutputSingle(handler)

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java
View File

@@ -115,7 +115,7 @@ public final class FunctionWebUtils {
}
else if (result instanceof Message) {
if (!isMessage) {
result = ((Message) result).getPayload();
// result = ((Message) result).getPayload();
}
else if (((Message) result).getPayload() instanceof byte[]) {
String str = new String((byte[]) ((Message) result).getPayload());