From be747c36aac2a5705ee5728c5776f96789eefa63 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 10 Nov 2022 12:30:24 +0100 Subject: [PATCH] Polishing --- .../main/java/example/FunctionConfiguration.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java index 8a3c31ece..a237eff87 100644 --- a/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java +++ b/spring-cloud-function-samples/function-functional-sample-aws/src/main/java/example/FunctionConfiguration.java @@ -26,16 +26,12 @@ public class FunctionConfiguration implements ApplicationContextInitializer function = (str) -> str + str.toUpperCase(); - context.registerBean("uppercase", FunctionRegistration.class, -<<<<<<< HEAD - () -> new FunctionRegistration<>(function).type(FunctionTypeUtils.functionType(String.class, String.class))); -======= - () -> new FunctionRegistration<>(function).type( - FunctionType.from(String.class).to(String.class))); - context.registerBean("testFunction", FunctionRegistration.class, - () -> new FunctionRegistration<>(new TestFunction()).type( - FunctionType.from(APIGatewayProxyRequestEvent.class).to(APIGatewayProxyResponseEvent.class))); ->>>>>>> 3cb9dde6... GH-932 Fix registration of AWSTypesMessageConverter for functional spring applications + context.registerBean("uppercase", FunctionRegistration.class, + () -> new FunctionRegistration<>(function).type(FunctionTypeUtils.functionType(String.class, String.class))); + + context.registerBean("uppercase", FunctionRegistration.class, + () -> new FunctionRegistration<>(new TestFunction()).type(FunctionTypeUtils.functionType(APIGatewayProxyRequestEvent.class, APIGatewayProxyResponseEvent.class))); + } }