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

GH-364 Additional cleanup and small refactoring for Kotlin lambda support

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-09-10 13:48:32 +02:00
parent 2aed5abff8
commit d93febd4c4
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-function-kotlin/src/main/java/org/springframework/cloud/function/context/config/KotlinLambdaToFunctionAutoConfiguration.java
View File

@@ -57,7 +57,7 @@ import org.springframework.util.ObjectUtils;
* @since 2.0
*/
@Configuration
@ConditionalOnClass(name = "kotlin.jvm.functions.Function1")
@ConditionalOnClass(name = "kotlin.jvm.functions.Function0")
class KotlinLambdaToFunctionAutoConfiguration {
protected final Log logger = LogFactory.getLog(getClass());
@@ -88,7 +88,7 @@ class KotlinLambdaToFunctionAutoConfiguration {
ConstructorArgumentValues ca = new ConstructorArgumentValues();
ca.addGenericArgumentValue(beanDefinition);
cbd.setConstructorArgumentValues(ca);
((BeanDefinitionRegistry) beanFactory).registerBeanDefinition("_" + beanDefinitionName, cbd);
((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(beanDefinitionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, cbd);
}
}
}
@@ -164,7 +164,10 @@ class KotlinLambdaToFunctionAutoConfiguration {
@Override
public FunctionRegistration getObject() throws Exception {
Type functionType = FunctionContextUtils.findType(this.name.substring(1), this.beanFactory);
String name = this.name.endsWith(FunctionRegistration.REGISTRATION_NAME_SUFFIX)
? this.name.replace(FunctionRegistration.REGISTRATION_NAME_SUFFIX, "")
: this.name;
Type functionType = FunctionContextUtils.findType(name, this.beanFactory);
FunctionRegistration<?> registration = new FunctionRegistration<>(this, name);
Type[] types = ((ParameterizedType) functionType).getActualTypeArguments();