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

Clean up applicability of FunctionAroundWraapper

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-10-31 09:18:08 +01:00
parent 62ffbc12b6
commit 931dfa22a8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
View File

@@ -40,8 +40,7 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled"); String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr) boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr)
? Boolean.parseBoolean(functionalTracingEnabledStr) : true; ? Boolean.parseBoolean(functionalTracingEnabledStr) : true;
if (functionalTracingEnabled && !targetFunction.isInputTypePublisher() && if (functionalTracingEnabled && input instanceof Message) {
input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) {
boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion(); boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion();
targetFunction.setSkipOutputConversion(true); targetFunction.setSkipOutputConversion(true);
try { try {

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

@@ -272,7 +272,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
*/ */
private FunctionInvocationWrapper wrapInAroundAdviceIfNecessary(FunctionInvocationWrapper function) { private FunctionInvocationWrapper wrapInAroundAdviceIfNecessary(FunctionInvocationWrapper function) {
FunctionInvocationWrapper wrappedFunction = function; FunctionInvocationWrapper wrappedFunction = function;
if (function != null && this.functionAroundWrapper != null) { if (function != null && this.functionAroundWrapper != null && !function.isSupplier()
&& !function.isInputTypePublisher() && !function.isOutputTypePublisher() && !FunctionTypeUtils.isCollectionOfMessage(function.getOutputType())) {
wrappedFunction = new FunctionInvocationWrapper(function) { wrappedFunction = new FunctionInvocationWrapper(function) {
@Override @Override
Object doApply(Object input) { Object doApply(Object input) {