Releasing version 1.0.147

Author: CI

fn-spring-cloud-function/pom.xml

@@ -30,7 +30,7 @@
     <artifactId>fn-spring-cloud-function</artifactId>
 
     <properties>
-        <spring.cloud.function.version>2.1.1.RELEASE</spring.cloud.function.version>
+        <spring.cloud.function.version>3.2.3</spring.cloud.function.version>
     </properties>
 
     <dependencies>

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/SpringCloudFunctionInvoker.java

@@ -21,13 +21,13 @@
 import com.fnproject.fn.api.exception.FunctionOutputHandlingException;
 import com.fnproject.springframework.function.functions.SpringCloudMethod;
 
+import org.springframework.boot.Banner;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import reactor.core.publisher.Flux;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -55,7 +55,7 @@ public class SpringCloudFunctionInvoker implements FunctionInvoker, Closeable {
      */
     public SpringCloudFunctionInvoker(Class<?> configClass) {
         SpringApplicationBuilder builder = new SpringApplicationBuilder(configClass);
-        applicationContext = builder.web(WebApplicationType.NONE).run();
+        applicationContext = builder.web(WebApplicationType.NONE).bannerMode(Banner.Mode.OFF).run();
         loader = applicationContext.getAutowireCapableBeanFactory().createBean(SpringCloudFunctionLoader.class);
         loader.loadFunction();
     }

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/SpringCloudFunctionLoader.java

@@ -23,7 +23,7 @@
 import com.fnproject.springframework.function.functions.SpringCloudSupplier;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.function.context.FunctionCatalog;
-import org.springframework.cloud.function.context.catalog.FunctionInspector;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 import reactor.core.publisher.Flux;
 
 import java.util.function.Consumer;
@@ -54,16 +54,14 @@ public class SpringCloudFunctionLoader {
     public static final String ENV_VAR_CONSUMER_NAME = "FN_SPRING_CONSUMER";
     public static final String ENV_VAR_SUPPLIER_NAME = "FN_SPRING_SUPPLIER";
 
-    private final FunctionCatalog catalog;
-    private final FunctionInspector inspector;
+    private final SimpleFunctionRegistry registry;
 
     private Function<Flux<?>, Flux<?>> function;
     private Consumer<Flux<?>> consumer;
     private Supplier<Flux<?>> supplier;
 
-    SpringCloudFunctionLoader(@Autowired FunctionCatalog catalog, @Autowired FunctionInspector inspector) {
-        this.catalog = catalog;
-        this.inspector = inspector;
+    SpringCloudFunctionLoader(@Autowired SimpleFunctionRegistry registry) {
+        this.registry = registry;
     }
 
     void loadFunction() {
@@ -83,24 +81,24 @@ void loadFunction() {
     private void loadSpringCloudFunctionFromEnvVars() {
         String functionName = System.getenv(ENV_VAR_FUNCTION_NAME);
         if (functionName != null) {
-            function = this.catalog.lookup(Function.class, functionName);
+            function = this.registry.lookup(Function.class, functionName);
         }
 
         String consumerName = System.getenv(ENV_VAR_CONSUMER_NAME);
         if (consumerName != null) {
-            consumer = this.catalog.lookup(Consumer.class, consumerName);
+            consumer = this.registry.lookup(Consumer.class, consumerName);
         }
 
         String supplierName = System.getenv(ENV_VAR_SUPPLIER_NAME);
         if (supplierName != null) {
-            supplier = this.catalog.lookup(Supplier.class, supplierName);
+            supplier = this.registry.lookup(Supplier.class, supplierName);
         }
     }
 
     private void loadSpringCloudFunctionFromDefaults() {
-        function = this.catalog.lookup(Function.class, DEFAULT_FUNCTION_BEAN);
-        consumer = this.catalog.lookup(Consumer.class, DEFAULT_CONSUMER_BEAN);
-        supplier = this.catalog.lookup(Supplier.class, DEFAULT_SUPPLIER_BEAN);
+        function = this.registry.lookup(Function.class, DEFAULT_FUNCTION_BEAN);
+        consumer = this.registry.lookup(Consumer.class, DEFAULT_CONSUMER_BEAN);
+        supplier = this.registry.lookup(Supplier.class, DEFAULT_SUPPLIER_BEAN);
     }
 
 
@@ -111,11 +109,11 @@ private boolean noSpringCloudFunctionFound() {
 
     SpringCloudMethod getFunction() {
         if (function != null) {
-            return new SpringCloudFunction(function, inspector);
+            return new SpringCloudFunction(function, registry);
         } else if (consumer != null) {
-            return new SpringCloudConsumer(consumer, inspector);
+            return new SpringCloudConsumer(consumer, registry);
         } else {
-            return new SpringCloudSupplier(supplier, inspector);
+            return new SpringCloudSupplier(supplier, registry);
         }
     }
 }

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/functions/SpringCloudConsumer.java

@@ -18,7 +18,7 @@
 
 import com.fnproject.fn.api.TypeWrapper;
 import com.fnproject.springframework.function.SimpleTypeWrapper;
-import org.springframework.cloud.function.context.catalog.FunctionInspector;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 import reactor.core.publisher.Flux;
 
 import java.util.function.Consumer;
@@ -29,8 +29,8 @@
 public class SpringCloudConsumer extends SpringCloudMethod {
     private Consumer<Flux<?>> consumer;
 
-    public SpringCloudConsumer(Consumer<Flux<?>> consumer, FunctionInspector inspector) {
-        super(inspector);
+    public SpringCloudConsumer(Consumer<Flux<?>> consumer, SimpleFunctionRegistry registry) {
+        super(registry);
         this.consumer = consumer;
     }
 

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/functions/SpringCloudFunction.java

@@ -16,7 +16,7 @@
 
 package com.fnproject.springframework.function.functions;
 
-import org.springframework.cloud.function.context.catalog.FunctionInspector;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 import reactor.core.publisher.Flux;
 
 import java.util.function.Function;
@@ -27,8 +27,8 @@
 public class SpringCloudFunction extends SpringCloudMethod {
     private Function<Flux<?>, Flux<?>> function;
 
-    public SpringCloudFunction(Function<Flux<?>, Flux<?>> function, FunctionInspector inspector) {
-        super(inspector);
+    public SpringCloudFunction(Function<Flux<?>, Flux<?>> function, SimpleFunctionRegistry registry) {
+        super(registry);
         this.function = function;
     }
 

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/functions/SpringCloudMethod.java

@@ -19,7 +19,7 @@
 import com.fnproject.fn.api.MethodWrapper;
 import com.fnproject.fn.api.TypeWrapper;
 import com.fnproject.springframework.function.SimpleTypeWrapper;
-import org.springframework.cloud.function.context.catalog.FunctionInspector;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 import reactor.core.publisher.Flux;
 
 import java.lang.reflect.Method;
@@ -31,10 +31,10 @@
  * Spring Cloud Functions
  */
 public abstract class SpringCloudMethod implements MethodWrapper {
-    private FunctionInspector inspector;
+    private SimpleFunctionRegistry registry;
 
-    SpringCloudMethod(FunctionInspector inspector) {
-        this.inspector = inspector;
+    SpringCloudMethod(SimpleFunctionRegistry registry) {
+        this.registry = registry;
     }
 
     @Override
@@ -73,12 +73,12 @@ public Method getTargetMethod() {
 
     @Override
     public TypeWrapper getParamType(int index) {
-        return new SimpleTypeWrapper(inspector.getInputType(getFunction()));
+        return new SimpleTypeWrapper(registry.getInputType(getFunction()));
     }
 
     @Override
     public TypeWrapper getReturnType() {
-        return new SimpleTypeWrapper(inspector.getOutputType(getFunction()));
+        return new SimpleTypeWrapper(registry.getOutputType(getFunction()));
     }
 
     /**

fn-spring-cloud-function/src/main/java/com/fnproject/springframework/function/functions/SpringCloudSupplier.java

@@ -18,7 +18,7 @@
 
 import com.fnproject.fn.api.TypeWrapper;
 import com.fnproject.springframework.function.SimpleTypeWrapper;
-import org.springframework.cloud.function.context.catalog.FunctionInspector;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 import reactor.core.publisher.Flux;
 
 import java.util.function.Supplier;
@@ -29,8 +29,8 @@
 public class SpringCloudSupplier extends SpringCloudMethod {
     private Supplier<Flux<?>> supplier;
 
-    public SpringCloudSupplier(Supplier<Flux<?>> supplier, FunctionInspector inspector) {
-        super(inspector);
+    public SpringCloudSupplier(Supplier<Flux<?>> supplier, SimpleFunctionRegistry registry) {
+        super(registry);
         this.supplier = supplier;
     }
 

fn-spring-cloud-function/src/test/java/com/fnproject/springframework/function/SimpleFunctionInspector.java

@@ -24,8 +24,6 @@
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
-import java.io.IOException;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 

fn-spring-cloud-function/src/test/java/com/fnproject/springframework/function/SpringCloudFunctionInvokerIntegrationTest.java

@@ -19,6 +19,8 @@
 import com.fnproject.springframework.function.functions.SpringCloudFunction;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
 
 import java.util.Arrays;
 import java.util.List;
@@ -28,14 +30,17 @@
 public class SpringCloudFunctionInvokerTest {
     private SpringCloudFunctionInvoker invoker;
 
+    @Autowired
+    private SimpleFunctionRegistry registry;
+
     @Before
     public void setUp() {
         invoker = new SpringCloudFunctionInvoker((SpringCloudFunctionLoader) null);
     }
 
     @Test
     public void invokesFunctionWithEmptyFlux() {
-        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, new SimpleFunctionInspector());
+        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, registry);
 
         Object result = invoker.tryInvoke(fnWrapper, new Object[0]);
 
@@ -44,7 +49,7 @@ public void invokesFunctionWithEmptyFlux() {
 
     @Test
     public void invokesFunctionWithFluxOfSingleItem() {
-        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, new SimpleFunctionInspector());
+        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, registry);
 
         Object result = invoker.tryInvoke(fnWrapper, new Object[]{ "hello" });
 
@@ -54,7 +59,7 @@ public void invokesFunctionWithFluxOfSingleItem() {
 
     @Test
     public void invokesFunctionWithFluxOfMultipleItems() {
-        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, new SimpleFunctionInspector());
+        SpringCloudFunction fnWrapper = new SpringCloudFunction(x -> x, registry);
 
         Object result = invoker.tryInvoke(fnWrapper, new Object[]{ Arrays.asList("hello", "world") });