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

GH-235 Moved Kotlin support to a separate module

Browse Source 
Resolves #235
This commit is contained in:
Oleg Zhurakousky
2018-11-30 18:47:36 +01:00
parent f0f957b96a
commit 6a16a44aa0
10 changed files with 214 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017 the original author or authors.
* Copyright 2017-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.reactivestreams.Publisher;
@@ -67,15 +66,13 @@ import org.springframework.util.StreamUtils;
import static org.assertj.core.api.Assertions.assertThat;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
* @author Dave Syer
* @author Artem Bilan
*
* @author Oleg Zhurakousky
*/
public class ContextFunctionCatalogAutoConfigurationTests {
@@ -376,47 +373,6 @@ public class ContextFunctionCatalogAutoConfigurationTests {
}
}
@Test
@Ignore("Cannot make this work in Eclipse (since the tools upgraded to 0.8.9)")
public void kotlinLambdas() {
create("org.springframework.cloud.function.context.config.KotlinLambdasConfiguration",
new Class[] { SimpleConfiguration.class });
assertThat(context.getBean("kotlinFunction")).isInstanceOf(Function.class);
assertThat(context.getBean("kotlinFunction")).isInstanceOf(Function1.class);
assertThat((Function<?, ?>) catalog.lookup(Function.class, "kotlinFunction"))
.isInstanceOf(Function.class);
assertThat(
inspector.getInputType(catalog.lookup(Function.class, "kotlinFunction")))
.isAssignableFrom(String.class);
assertThat(
inspector.getOutputType(catalog.lookup(Function.class, "kotlinFunction")))
.isAssignableFrom(String.class);
assertThat(context.getBean("kotlinConsumer")).isInstanceOf(Consumer.class);
assertThat(context.getBean("kotlinConsumer")).isInstanceOf(Function1.class);
assertThat((Function<?, ?>) catalog.lookup(Function.class, "kotlinConsumer"))
.isInstanceOf(Function.class);
assertThat(
inspector.getInputType(catalog.lookup(Function.class, "kotlinConsumer")))
.isAssignableFrom(String.class);
assertThat(context.getBean("kotlinSupplier")).isInstanceOf(Supplier.class);
assertThat(context.getBean("kotlinSupplier")).isInstanceOf(Function0.class);
Supplier<Flux<String>> supplier = catalog.lookup(Supplier.class,
"kotlinSupplier");
assertThat(supplier.get().blockFirst()).isEqualTo("Hello");
assertThat((Supplier<?>) catalog.lookup(Supplier.class, "kotlinSupplier"))
.isInstanceOf(Supplier.class);
assertThat(
inspector.getOutputType(catalog.lookup(Supplier.class, "kotlinSupplier")))
.isAssignableFrom(String.class);
Function<Flux<String>, Flux<String>> function = catalog.lookup(Function.class,
"kotlinFunction|function2");
assertThat(function.apply(Flux.just("Hello")).blockFirst())
.isEqualTo("HELLOfunction2");
}
private void create(String jarfile, Class<?> config, String... props) {
try {
@@ -572,13 +528,6 @@ public class ContextFunctionCatalogAutoConfigurationTests {
create(new Class<?>[] { type }, props);
}
private void create(String typeName, Class<?>[] types, String... props) {
Class<?>[] typesToUse = new Class<?>[types.length + 1];
typesToUse[0] = ClassUtils.resolveClassName(typeName, null);
System.arraycopy(types, 0, typesToUse, 1, types.length);
create(typesToUse, props);
}
private void create(Class<?>[] types, String... props) {
context = new SpringApplicationBuilder(types).properties(props).run();
catalog = context.getBean(FunctionCatalog.class);

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

@@ -1,44 +0,0 @@
/*
* Copyright 2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.function.kotlin
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
/**
* @author Oleg Zhurakousky
*
*/
@EnableAutoConfiguration
@Configuration
open class KotlinLambdasConfiguration {
@Bean
open fun kotlinFunction(): (String) -> String {
return { it.toUpperCase() }
}
@Bean
open fun kotlinConsumer(): (String) -> Unit {
return { println(it) }
}
@Bean
open fun kotlinSupplier(): () -> String {
return { "Hello" }
}
}