From 96e16cc712b85f77afcd019282c300ad5880246d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 20 Mar 2025 10:28:25 +0100 Subject: [PATCH] GH-1240 Fix logging for ineligible functions Resolves #1240 --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 7 ++++--- 1 file changed, 4 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 9715454fb..87558bf5b 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 @@ -124,6 +124,9 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp if (!this.applicationContext.containsBean(functionDefinition) || !KotlinDetector.isKotlinType(this.applicationContext.getBean(functionDefinition).getClass())) { functionDefinition = this.normalizeFunctionDefinition(functionDefinition); } + if (!isFunctionDefinitionEligible(functionDefinition)) { + return null; + } if (!StringUtils.hasText(functionDefinition)) { Collection functionalBeans = this.getNames(null).stream() .filter(name -> !RoutingFunction.FUNCTION_NAME.equals(name)) @@ -134,9 +137,7 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp + "use 'spring.cloud.function.definition' property to explicitly define it. "); } } - if (!isFunctionDefinitionEligible(functionDefinition)) { - return null; - } + FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes); Object syncInstance = functionDefinition == null ? this : functionDefinition; synchronized (syncInstance) {