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

GH-939 & GH-956 Fix Kotlin function registration regression

Browse Source 
Resolves #939
Resolves #956
This commit is contained in:
Oleg Zhurakousky
2022-11-14 15:01:19 +01:00
parent be747c36aa
commit 04df79482d
5 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java
View File

@@ -56,7 +56,8 @@ public class ContextFunctionCatalogAutoConfigurationKotlinTests {
public void typeDiscoveryTests() {
create(new Class[] { KotlinLambdasConfiguration.class,
SimpleConfiguration.class,
KotlinComponentFunction.class});
KotlinComponentFunction.class,
ComponentUppercase.class});
FunctionCatalog functionCatalog = this.context.getBean(FunctionCatalog.class);
@@ -89,12 +90,19 @@ public class ContextFunctionCatalogAutoConfigurationKotlinTests {
assertThat(kotlinListPojoFunction.getInputType().getTypeName()).isEqualTo("java.util.List<org.springframework.cloud.function.kotlin.Person>");
assertThat(kotlinListPojoFunction.getOutputType()).isEqualTo(String.class);
// function = this.context.getBean("kotlinListPojoFunction");
// functionType = (ParameterizedType) FunctionTypeUtils.discoverFunctionType(function, "kotlinListPojoFunction", this.context);
// assertThat(functionType.getRawType().getTypeName()).isEqualTo(Function.class.getName());
// assertThat(functionType.getActualTypeArguments().length).isEqualTo(2);
// assertThat(functionType.getActualTypeArguments()[0].getTypeName()).isEqualTo("java.util.List<org.springframework.cloud.function.kotlin.Person>");
// assertThat(functionType.getActualTypeArguments()[1].getTypeName()).isEqualTo(String.class.getName());
FunctionInvocationWrapper componentUppercase = functionCatalog.lookup("componentUppercase");
assertThat(componentUppercase.isFunction()).isTrue();
assertThat(componentUppercase.getInputType()).isEqualTo(String.class);
assertThat(componentUppercase.getOutputType()).isEqualTo(String.class);
assertThat(componentUppercase.apply("hello")).isEqualTo("HELLO");
FunctionInvocationWrapper uppercaseBean = functionCatalog.lookup("uppercase");
assertThat(uppercaseBean.isFunction()).isTrue();
assertThat(uppercaseBean.getInputType()).isEqualTo(String.class);
assertThat(uppercaseBean.getOutputType()).isEqualTo(String.class);
assertThat(uppercaseBean.apply("hello")).isEqualTo("HELLO");
}
@Test

10
spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/ComponentUppercase.kt Normal file
View File

@@ -0,0 +1,10 @@
package org.springframework.cloud.function.kotlin
import org.springframework.stereotype.Component
@Component
class ComponentUppercase : (String) -> String {
override fun invoke(p1: String): String {
return p1.uppercase()
}
}

3
spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt
View File

@@ -29,6 +29,9 @@ import java.util.List
@EnableAutoConfiguration
@Configuration
class KotlinLambdasConfiguration {
@Bean
fun uppercase(): Function<String, String> = KotlinComponentFunction()
@Bean
fun kotlinFunction(): (String) -> String {
return { it.toUpperCase() }