Merge branch '4.x' into main
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>io.spring.sample</groupId>
|
||||
<artifactId>function-functional-sample-aws</artifactId>
|
||||
<version>2.0.0.RELEASE</version>
|
||||
<version>4.0.0.RELEASE</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>function-functional-sample-aws</name>
|
||||
@@ -15,17 +15,20 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.6.1</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<java.version>1.8</java.version>
|
||||
<wrapper.version>1.0.27.RELEASE</wrapper.version>
|
||||
<aws-lambda-events.version>3.9.0</aws-lambda-events.version>
|
||||
<<<<<<< HEAD
|
||||
<spring-cloud-function.version>3.2.2-SNAPSHOT</spring-cloud-function.version>
|
||||
=======
|
||||
<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
|
||||
>>>>>>> 4.x
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.util.function.Function;
|
||||
|
||||
import org.springframework.boot.SpringBootConfiguration;
|
||||
import org.springframework.cloud.function.context.FunctionRegistration;
|
||||
import org.springframework.cloud.function.context.FunctionType;
|
||||
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
|
||||
import org.springframework.context.ApplicationContextInitializer;
|
||||
import org.springframework.context.support.GenericApplicationContext;
|
||||
|
||||
@@ -24,7 +24,6 @@ public class FunctionConfiguration implements ApplicationContextInitializer<Gene
|
||||
public void initialize(GenericApplicationContext context) {
|
||||
Function<String, String> function = (str) -> str + str.toUpperCase();
|
||||
context.registerBean("uppercase", FunctionRegistration.class,
|
||||
() -> new FunctionRegistration<>(function).type(
|
||||
FunctionType.from(String.class).to(String.class)));
|
||||
() -> new FunctionRegistration<>(function).type(FunctionTypeUtils.functionType(String.class, String.class)));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user