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

GH-1247 Fix how Kotlin function bean is detected

Browse Source 
Resolves #1247
This commit is contained in:
Oleg Zhurakousky
2025-03-25 20:37:51 +01:00
parent 2db95c7286
commit daa60090ce
1 changed files with 1 additions and 2 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/BeanFactoryAwareFunctionRegistry.java
View File

@@ -48,7 +48,6 @@ import org.springframework.cloud.function.utils.KotlinUtils;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.KotlinDetector;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
@@ -121,7 +120,7 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
functionDefinition = StringUtils.hasText(functionDefinition) functionDefinition = StringUtils.hasText(functionDefinition)
? functionDefinition ? functionDefinition
: this.applicationContext.getEnvironment().getProperty(FunctionProperties.FUNCTION_DEFINITION, ""); : this.applicationContext.getEnvironment().getProperty(FunctionProperties.FUNCTION_DEFINITION, "");
if (!this.applicationContext.containsBean(functionDefinition) || !KotlinDetector.isKotlinType(this.applicationContext.getBean(functionDefinition).getClass())) { if (!this.applicationContext.containsBean(functionDefinition) || !KotlinUtils.isKotlinType(this.applicationContext.getBean(functionDefinition))) {
functionDefinition = this.normalizeFunctionDefinition(functionDefinition); functionDefinition = this.normalizeFunctionDefinition(functionDefinition);
} }
if (!isFunctionDefinitionEligible(functionDefinition)) { if (!isFunctionDefinitionEligible(functionDefinition)) {