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

GH-710 Fix output conversion logic for when Function is wrapped in around advice

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-06-28 19:02:34 +02:00
parent 7d1144ffbb
commit c86890806e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,9 +377,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
} }
FunctionInvocationWrapper(String functionDefinition, Object target, Type inputType, Type outputType) { FunctionInvocationWrapper(String functionDefinition, Object target, Type inputType, Type outputType) {
if (functionAroundWrapper != null) { // if (functionAroundWrapper != null) {
this.setSkipOutputConversion(true); // this.setSkipOutputConversion(true);
} // }
this.target = target; this.target = target;
this.inputType = this.normalizeType(inputType); this.inputType = this.normalizeType(inputType);
this.outputType = this.normalizeType(outputType); this.outputType = this.normalizeType(outputType);
@@ -1022,14 +1022,14 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
if (this.skipOutputConversion) { if (this.skipOutputConversion) {
return output; return output;
} }
if (output instanceof Message && isExtractPayload((Message<?>) output, type)) { if (functionAroundWrapper == null && output instanceof Message && isExtractPayload((Message<?>) output, type)) {
output = ((Message) output).getPayload(); output = ((Message) output).getPayload();
} }
if (!(output instanceof Publisher) && this.enhancer != null) { if (!(output instanceof Publisher) && this.enhancer != null) {
output = enhancer.apply(output); output = enhancer.apply(output);
} }
if (ObjectUtils.isEmpty(contentType) && !(output instanceof Publisher)) { if (functionAroundWrapper == null && ObjectUtils.isEmpty(contentType) && !(output instanceof Publisher)) {
return output; return output;
} }
@@ -1051,7 +1051,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
} }
else { else {
convertedOutput = messageConverter.toMessage(output, convertedOutput = messageConverter.toMessage(output,
new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, contentType[0]))); new MessageHeaders(Collections.singletonMap(MessageHeaders.CONTENT_TYPE, contentType == null ? "application/json" : contentType[0])));
} }
return convertedOutput; return convertedOutput;