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

GH-746 Fix support for Cloud Event properly enriching Function<Mono, Mono>

Browse Source 
Resolves #746
This commit is contained in:
Oleg Zhurakousky
2021-09-27 18:03:32 +02:00
parent 03babc429d
commit ed50d7c252
2 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -841,13 +841,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
}
Object result = ((Function) this.target).apply(inputValue);
if (result instanceof Flux && functionInvocationHelper != null) {
result = ((Flux) result).map(v -> {
if (firstInputMessage.get() != null && CloudEventMessageUtils.isCloudEvent(firstInputMessage.get())) {
return functionInvocationHelper.postProcessResult(v, firstInputMessage.get());
}
return v;
});
if (result instanceof Publisher && functionInvocationHelper != null) {
result = this.postProcessFunction((Publisher) result, firstInputMessage);
}
return value instanceof OriginalMessageHolder
@@ -855,6 +850,40 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
: result;
}
@SuppressWarnings("unchecked")
private Publisher postProcessFunction(Publisher result, AtomicReference<Message<?>> firstInputMessage) {
if (FunctionTypeUtils.isPublisher(this.inputType) && FunctionTypeUtils.isPublisher(this.outputType)) {
if (!FunctionTypeUtils.getRawType(FunctionTypeUtils.getImmediateGenericType(this.inputType, 0))
.isAssignableFrom(Void.class)
&& !FunctionTypeUtils.getRawType(FunctionTypeUtils.getImmediateGenericType(this.outputType, 0))
.isAssignableFrom(Void.class)) {
if (result instanceof Mono) {
return Mono.from((result)).map(v -> {
if (firstInputMessage.get() != null && CloudEventMessageUtils
.isCloudEvent(firstInputMessage.get())) {
return functionInvocationHelper.postProcessResult(v,
firstInputMessage.get());
}
return v;
});
}
else {
return Flux.from((result)).map(v -> {
if (firstInputMessage.get() != null && CloudEventMessageUtils
.isCloudEvent(firstInputMessage.get())) {
return functionInvocationHelper.postProcessResult(v,
firstInputMessage.get());
}
return v;
});
}
}
}
return result;
}
/*
*
*/