From dda6d3cb211c73fc4c672704050d80bf16499528 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Thu, 9 Mar 2023 16:19:39 -0500 Subject: [PATCH] Unncessary warning for multiple functions found Currently we show a warning for multiple functions found even when there are no functions found and spring.cloud.function.definition is not set. Resolves https://github.com/spring-cloud/spring-cloud-function/issues/1011 --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ce8ebed25..9aff1f21f 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 @@ -53,6 +53,7 @@ import org.springframework.core.convert.ConversionService; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.converter.CompositeMessageConverter; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; /** @@ -126,8 +127,10 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp .filter(name -> !RoutingFunction.FUNCTION_NAME.equals(name)) .filter(name -> !RoutingFunction.DEFAULT_ROUTE_HANDLER.equals(name)) .collect(Collectors.toList()); - logger.warn("Multiple functional beans were found " + functionalBeans + ", thus can't determine default function definition. Please " + if (!CollectionUtils.isEmpty(functionalBeans) && functionalBeans.size() > 1) { + logger.warn("Multiple functional beans were found " + functionalBeans + ", thus can't determine default function definition. Please " + "use 'spring.cloud.function.definition' property to explicitly define it. "); + } } if (!isFunctionDefinitionEligible(functionDefinition)) { return null;