diff --git a/samples/spring-cloud-function-demo/TestHttp.http b/samples/spring-cloud-function-demo/TestHttp.http index a53802ef..724330b4 100644 --- a/samples/spring-cloud-function-demo/TestHttp.http +++ b/samples/spring-cloud-function-demo/TestHttp.http @@ -47,7 +47,7 @@ x-routing-key: uppercase hello world -### Test routing to upperCase function using custom router +### Test NoOP Function POST http://localhost:8080/functionRouter Content-Type: application/json diff --git a/samples/spring-cloud-function-demo/pom.xml b/samples/spring-cloud-function-demo/pom.xml index b8d0b859..a137d9b8 100644 --- a/samples/spring-cloud-function-demo/pom.xml +++ b/samples/spring-cloud-function-demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.4.6 com.amazonaws.demo spring-cloud-function-demo @@ -71,37 +71,4 @@ - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot.experimental - spring-boot-thin-layout - 1.0.31.RELEASE - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - false - true - aws - - - - - diff --git a/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/SpringCloudFunctionDemo.java b/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/SpringCloudFunctionDemoApplication.java similarity index 87% rename from samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/SpringCloudFunctionDemo.java rename to samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/SpringCloudFunctionDemoApplication.java index d2da4493..ae3e8503 100644 --- a/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/SpringCloudFunctionDemo.java +++ b/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/SpringCloudFunctionDemoApplication.java @@ -1,10 +1,9 @@ -package com.amazonaws.demo; +package com.amazonaws.springcloudfunctiondemo; import com.amazonaws.services.lambda.runtime.events.SQSEvent; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.function.context.MessageRoutingCallback; -import org.springframework.cloud.function.context.config.RoutingFunction; import org.springframework.context.annotation.Bean; import org.springframework.messaging.Message; @@ -12,10 +11,10 @@ import java.util.function.Function; @SpringBootApplication -public class SpringCloudFunctionDemo { +public class SpringCloudFunctionDemoApplication { public static void main(String[] args) { - SpringApplication.run(SpringCloudFunctionDemo.class, args); + SpringApplication.run(SpringCloudFunctionDemoApplication.class, args); } @Bean @@ -32,7 +31,7 @@ public Function reverse(){ } @Bean - public Function helloUnicorn(){ + public Function helloUnicorn(){ return value -> "Hello %s! You are %d years old!".formatted(value.name(), value.age()); } diff --git a/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/Unicorn.java b/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/Unicorn.java similarity index 51% rename from samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/Unicorn.java rename to samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/Unicorn.java index cc377776..755db6e0 100644 --- a/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/demo/Unicorn.java +++ b/samples/spring-cloud-function-demo/src/main/java/com/amazonaws/springcloudfunctiondemo/Unicorn.java @@ -1,4 +1,4 @@ -package com.amazonaws.demo; +package com.amazonaws.springcloudfunctiondemo; public record Unicorn(String name, int age) { } diff --git a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/FunctionCatalogTest.java b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/FunctionCatalogTest.java similarity index 97% rename from samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/FunctionCatalogTest.java rename to samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/FunctionCatalogTest.java index d4d384ea..e8e1f3f7 100644 --- a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/FunctionCatalogTest.java +++ b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/FunctionCatalogTest.java @@ -1,4 +1,4 @@ -package com.amazonaws.demo; +package com.amazonaws.springcloudfunctiondemo; import com.amazonaws.services.lambda.runtime.events.SQSEvent; import org.junit.jupiter.api.Test; diff --git a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/HttpIntegrationTest.java b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/HttpIntegrationTest.java similarity index 93% rename from samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/HttpIntegrationTest.java rename to samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/HttpIntegrationTest.java index 92d0f070..378fa8b2 100644 --- a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/HttpIntegrationTest.java +++ b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/HttpIntegrationTest.java @@ -1,4 +1,4 @@ -package com.amazonaws.demo; +package com.amazonaws.springcloudfunctiondemo; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +36,7 @@ public void testUppercaseFunction() { @Test public void testHandleUnicornHelloFunction() { - var fluffy = new com.amazonaws.demo.Unicorn("Fluffy", 3); + var fluffy = new com.amazonaws.springcloudfunctiondemo.Unicorn("Fluffy", 3); var headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); diff --git a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/MessageCallBackTest.java b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/MessageCallBackTest.java similarity index 83% rename from samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/MessageCallBackTest.java rename to samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/MessageCallBackTest.java index f1f6f08b..5ce8ec2f 100644 --- a/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/demo/MessageCallBackTest.java +++ b/samples/spring-cloud-function-demo/src/test/java/com/amazonaws/springcloudfunctiondemo/MessageCallBackTest.java @@ -1,4 +1,4 @@ -package com.amazonaws.demo; +package com.amazonaws.springcloudfunctiondemo; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ public class MessageCallBackTest { @Test public void testCustomRouter() { // Create test message - var unicorn = new com.amazonaws.demo.Unicorn("RouterUnicorn", 2); + var unicorn = new com.amazonaws.springcloudfunctiondemo.Unicorn("RouterUnicorn", 2); var headers = new MessageHeaders(Map.of("x-routing-key", "unicorn")); var message = new GenericMessage<>(unicorn, headers); @@ -36,7 +36,7 @@ public void testCustomRouter() { assertEquals("helloUnicorn", functionName); // Get the function and apply it - Function function = catalog.lookup(Function.class, functionName); + Function function = catalog.lookup(Function.class, functionName); var result = function.apply(unicorn); // Verify result diff --git a/samples/spring-cloud-function-demo/src/test/resources/application.properties b/samples/spring-cloud-function-demo/src/test/resources/application.properties index fff07136..ba00cd54 100644 --- a/samples/spring-cloud-function-demo/src/test/resources/application.properties +++ b/samples/spring-cloud-function-demo/src/test/resources/application.properties @@ -1,7 +1,7 @@ # Test configuration spring.main.banner-mode=off logging.level.root=ERROR -logging.level.com.amazonaws.demo=DEBUG +logging.level.com.amazonaws.springcloudfunctiondemo=DEBUG # Function configuration #spring.cloud.function.routing.enabled=true diff --git a/samples/spring-cloud-function-demo/template.yaml b/samples/spring-cloud-function-demo/template.yaml index 0b5a14bb..4aedb83e 100644 --- a/samples/spring-cloud-function-demo/template.yaml +++ b/samples/spring-cloud-function-demo/template.yaml @@ -21,10 +21,10 @@ Resources: Type: AWS::Serverless::Function Properties: Handler: org.springframework.cloud.function.adapter.aws.FunctionInvoker - CodeUri: target/spring-cloud-function-demo-1.0-aws.jar + CodeUri: . Environment: Variables: - #MAIN_CLASS: net.springio.springcloudfunctiondemo.SpringCloudFunctionDemoApplication + MAIN_CLASS: com.amazonaws.springcloudfunctiondemo.SpringCloudFunctionDemoApplication SPRING_CLOUD_FUNCTION_DEFINITION: upperCase Events: ApiEvent: @@ -38,10 +38,10 @@ Resources: Type: AWS::Serverless::Function Properties: Handler: org.springframework.cloud.function.adapter.aws.FunctionInvoker - CodeUri: target/spring-cloud-function-demo-1.0-aws.jar + CodeUri: . Environment: Variables: - #MAIN_CLASS: net.springio.springcloudfunctiondemo.SpringCloudFunctionDemoApplication + MAIN_CLASS: com.amazonaws.springcloudfunctiondemo.SpringCloudFunctionDemoApplication SPRING_CLOUD_FUNCTION_DEFINITION: asyncProcessor Events: SQSEvent: