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

GH-252 Added support for non-fluxed functions

Browse Source 
Added support for non-fluxed functions to Azure and AWS adapters
Resolves #252
This commit is contained in:
Oleg Zhurakousky
2019-02-25 17:16:03 +01:00
parent 757600171d
commit 989f205d36
5 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
View File

@@ -18,6 +18,7 @@ package org.springframework.cloud.function.adapter.aws;
import java.io.Closeable;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.net.URL;
import java.util.Collections;
import java.util.List;
@@ -35,12 +36,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionType;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.config.FunctionContextUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.util.ClassUtils;
/**
* @author Dave Syer
* @author Oleg Zhurakousky
*/
public class SpringFunctionInitializer implements Closeable {
@@ -121,14 +126,13 @@ public class SpringFunctionInitializer implements Closeable {
}
}
@SuppressWarnings("unchecked")
protected void initialize() {
if (!this.initialized.compareAndSet(false, true)) {
return;
}
logger.info("Initializing: " + this.configurationClass);
SpringApplication builder = springApplication();
ConfigurableApplicationContext context = builder.run();
this.context = builder.run();
context.getAutowireCapableBeanFactory().autowireBean(this);
String name = context.getEnvironment().getProperty("function.name");
if (name == null) {
@@ -136,7 +140,7 @@ public class SpringFunctionInitializer implements Closeable {
}
if (this.catalog == null) {
if (context.containsBean(name)) {
this.function = context.getBean(name, Function.class);
this.function = getAndInstrumentFromContext(name);
}
}
else {
@@ -149,8 +153,16 @@ public class SpringFunctionInitializer implements Closeable {
this.function = this.catalog.lookup(Function.class, name);
}
}
this.context = context;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private <T> T getAndInstrumentFromContext(String name) {
FunctionRegistration<?> functionRegistration = new FunctionRegistration(
context.getBean(name), name);
Type type = FunctionContextUtils.findType(name, this.context.getBeanFactory());
FunctionType functionType = new FunctionType(type);
return (T) functionRegistration.type(functionType).wrap().getTarget();
}
private SpringApplication springApplication() {

18
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializerTests.java
View File

@@ -60,6 +60,14 @@ public class SpringFunctionInitializerTests {
assertThat(result.blockFirst()).isInstanceOf(Bar.class);
}
@Test
public void functionNonFluxBean() {
this.initializer = new SpringFunctionInitializer(NonFluxFunctionConfig.class);
this.initializer.initialize();
Flux<?> result = Flux.from(this.initializer.apply(Flux.just(new Foo())));
assertThat(result.blockFirst()).isInstanceOf(Bar.class);
}
@Test
public void functionApp() {
this.initializer = new SpringFunctionInitializer(FluxFunctionApp.class);
@@ -112,6 +120,16 @@ public class SpringFunctionInitializerTests {
}
@Configuration
protected static class NonFluxFunctionConfig {
@Bean
public Function<Foo, Bar> function() {
return foo -> new Bar();
}
}
protected static class FluxFunctionApp implements Function<Flux<Foo>, Flux<Bar>> {
@Override

20
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.function.adapter.azure;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
@@ -36,12 +37,16 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionType;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.config.FunctionContextUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.util.ClassUtils;
/**
* @author Soby Chacko
* @author Oleg Zhurakousky
*/
public class AzureSpringFunctionInitializer implements Closeable {
@@ -125,7 +130,6 @@ public class AzureSpringFunctionInitializer implements Closeable {
}
}
@SuppressWarnings("unchecked")
protected void initialize(ExecutionContext ctxt) {
ConfigurableApplicationContext context = AzureSpringFunctionInitializer.context;
@@ -164,7 +168,7 @@ public class AzureSpringFunctionInitializer implements Closeable {
ctxt.getLogger()
.info("No catalog. Looking for Function bean name=" + name);
}
this.function = context.getBean(name, Function.class);
this.function = getAndInstrumentFromContext(context, name);
}
}
else {
@@ -179,6 +183,18 @@ public class AzureSpringFunctionInitializer implements Closeable {
}
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private <T> T getAndInstrumentFromContext(
ConfigurableApplicationContext applicationContext, String name) {
FunctionRegistration<?> functionRegistration = new FunctionRegistration(
applicationContext.getBean(name), name);
Type type = FunctionContextUtils.findType(name,
applicationContext.getBeanFactory());
FunctionType functionType = new FunctionType(type);
return (T) functionRegistration.type(functionType).wrap().getTarget();
}
private SpringApplication springApplication() {
Class<?> sourceClass = this.configurationClass;
SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication(

19
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializerTests.java
View File

@@ -29,6 +29,7 @@ import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionType;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.GenericApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
@@ -82,6 +83,14 @@ public class AzureSpringFunctionInitializerTests {
assertThat(bar.getValue()).isEqualTo("BAR");
}
@Test
public void functionNonFluxBean() {
AzureSpringFunctionInitializer handler = handler(NonFluxFunctionConfig.class);
handler.initialize(new TestExecutionContext("function"));
Flux<?> result = Flux.from(handler.getFunction().apply(Flux.just(new Foo())));
assertThat(result.blockFirst()).isInstanceOf(Bar.class);
}
@SpringBootConfiguration
@EnableAutoConfiguration
protected static class BareConfig {
@@ -121,4 +130,14 @@ public class AzureSpringFunctionInitializerTests {
}
@Configuration
protected static class NonFluxFunctionConfig {
@Bean
public Function<Foo, Bar> function() {
return foo -> new Bar();
}
}
}

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java
View File

@@ -40,7 +40,7 @@ import org.springframework.util.ReflectionUtils;
* @author Oleg Zhurakousky
* @since 2.0
*/
abstract class FunctionContextUtils {
public abstract class FunctionContextUtils {
public static Type findType(String name, ConfigurableListableBeanFactory registry) {
AbstractBeanDefinition definition = (AbstractBeanDefinition) registry