From a8f25efcebe7bc646a578d9052c9d06402a9b2fd Mon Sep 17 00:00:00 2001 From: Neokeld Date: Thu, 17 Nov 2022 14:42:27 +0100 Subject: [PATCH] Corrects some branching for readability Resolves #960 --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 2 +- .../cloud/function/context/catalog/FunctionAroundWrapper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index 663dda14d..ce665b581 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -240,7 +240,7 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp @Override protected boolean containsFunction(String functionName) { - return super.containsFunction(functionName) ? true : this.applicationContext.containsBean(functionName); + return super.containsFunction(functionName) || this.applicationContext.containsBean(functionName); } private boolean isFunctionPojo(Object functionCandidate, String functionName) { diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java index 263dfa0d6..d656420d9 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java @@ -41,8 +41,8 @@ public abstract class FunctionAroundWrapper { public final Object apply(Object input, FunctionInvocationWrapper targetFunction) { String functionalTracingEnabledStr = System.getProperty("spring.cloud.function.observability.enabled"); - boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr) - ? Boolean.parseBoolean(functionalTracingEnabledStr) : true; + boolean functionalTracingEnabled = !StringUtils.hasText(functionalTracingEnabledStr) + || Boolean.parseBoolean(functionalTracingEnabledStr); if (functionalTracingEnabled && !(input instanceof Publisher) && input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) { return this.doApply(input, targetFunction); }