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

Revert "Remove skipConversion in FunctionAroundWrapper"

Browse Source 
This reverts commit d4aa4f0e41.
This commit is contained in:
Soby Chacko
2022-02-11 12:41:36 -05:00
parent 5a024de166
commit fa11dcb6d8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2020-2022 the original author or authors. * Copyright 2020-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -27,11 +27,10 @@ import org.springframework.util.StringUtils;
* If registered as bean it will be autowired into {@link FunctionInvocationWrapper}. * If registered as bean it will be autowired into {@link FunctionInvocationWrapper}.
* Keep in mind that it only affects imperative invocations where input is {@link Message} * Keep in mind that it only affects imperative invocations where input is {@link Message}
* *
* NOTE: This API is experimental and could change without notice. It is * NOTE: This API is experimental and and could change without notice. It is
* intended for internal use only (e.g., spring-cloud-sleuth) * intended for internal use only (e.g., spring-cloud-sleuth)
* *
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @author Artem Bilan
* @since 3.1 * @since 3.1
*/ */
public abstract class FunctionAroundWrapper implements BiFunction<Object, FunctionInvocationWrapper, Object> { public abstract class FunctionAroundWrapper implements BiFunction<Object, FunctionInvocationWrapper, Object> {
@@ -39,10 +38,17 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
@Override @Override
public final Object apply(Object input, FunctionInvocationWrapper targetFunction) { public final Object apply(Object input, FunctionInvocationWrapper targetFunction) {
String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled"); String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
boolean functionalTracingEnabled = boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr)
!StringUtils.hasText(functionalTracingEnabledStr) || Boolean.parseBoolean(functionalTracingEnabledStr); ? Boolean.parseBoolean(functionalTracingEnabledStr) : true;
if (functionalTracingEnabled) { if (functionalTracingEnabled) {
return this.doApply(input, targetFunction); boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion();
targetFunction.setSkipOutputConversion(true);
try {
return this.doApply(input, targetFunction);
}
finally {
targetFunction.setSkipOutputConversion(isSkipOutputConversion);
}
} }
else { else {
return targetFunction.apply(input); return targetFunction.apply(input);
@@ -50,5 +56,4 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
} }
protected abstract Object doApply(Object input, FunctionInvocationWrapper targetFunction); protected abstract Object doApply(Object input, FunctionInvocationWrapper targetFunction);
} }