src: updated Quarkus template

Function in template now accepts beans instead of java.lang.Object

Signed-off-by: Matej Vasek <[email protected]>

Author: matejvasek

Diff for: pkged.go

@@ -2,7 +2,7 @@
 
 Welcome to your new Quarkus function project!
 
-This sample project contains single function: `functions.Function.echo()`,
+This sample project contains a single function: `functions.Function.function()`,
 the function just returns its argument.
 
 ## Local execution
@@ -69,7 +69,7 @@ curl -v ${URL} \
   -H "Ce-Source:cloud-event-example" \
   -H "Ce-Type:dev.knative.example" \
   -H "Ce-Specversion:1.0" \
-  -d "{\"name\": \"$(whoami)\"}\""
+  -d "{\"message\": \"$(whoami)\"}\""
 ```
 
 ### HTTPie
@@ -82,5 +82,5 @@ http -v ${URL} \
   Ce-Source:cloud-event-example \
   Ce-Type:dev.knative.example \
   Ce-Specversion:1.0 \
-  name=$(whoami)
+  message=$(whoami)
 ```

Diff for: templates/quarkus/events/README.md

@@ -7,7 +7,7 @@
 public class Function {
 
     @Funq
-    public Object echo(Object input, @Context CloudEvent cloudEvent) {
+    public Output function(Input input, @Context CloudEvent cloudEvent) {
         if (cloudEvent != null) {
             System.out.println(
                     "CloudEvent{" +
@@ -17,7 +17,7 @@ public Object echo(Object input, @Context CloudEvent cloudEvent) {
                             ", subject='" + cloudEvent.subject() + '\'' +
                             '}');
         }
-        return input;
+        return new Output(input.getMessage());
     }
 
-}
+}

Diff for: templates/quarkus/events/src/main/java/functions/Function.java

@@ -0,0 +1,19 @@
+package functions;
+
+public class Input {
+    private String message;
+
+    public Input() {}
+
+    public Input(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Diff for: templates/quarkus/events/src/main/java/functions/Input.java

@@ -0,0 +1,19 @@
+package functions;
+
+public class Output {
+    private String message;
+
+    public Output() {}
+
+    public Output(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Diff for: templates/quarkus/events/src/main/java/functions/Output.java

@@ -1,3 +1,3 @@
 # Configuration file
 # key = value
-quarkus.funqy.export=echo
+quarkus.funqy.export=function

Diff for: templates/quarkus/events/src/main/resources/application.properties

@@ -13,24 +13,24 @@
 public class FunctionTest {
 
     @Test
-    void testEcho() {
-        Object obj = (new Function()).echo(42, null);
-        Assertions.assertEquals(42, obj);
+    void testFunction() {
+        Output output = (new Function()).function(new Input("Hello!"), null);
+        Assertions.assertEquals("Hello!", output.getMessage());
     }
 
     @Test
-    public void testEchoIntegration() {
+    public void testFunctionIntegration() {
         RestAssured.given().contentType("application/json")
-                .body("{\"message\": \"Hello\"}")
+                .body("{\"message\": \"Hello!\"}")
                 .header("ce-id", "42")
                 .header("ce-specversion", "1.0")
                 .post("/")
                 .then().statusCode(200)
                 .header("ce-id", notNullValue())
                 .header("ce-specversion", equalTo("1.0"))
-                .header("ce-source", equalTo("echo"))
-                .header("ce-type", equalTo("echo.output"))
-                .body("message", equalTo("Hello"));
+                .header("ce-source", equalTo("function"))
+                .header("ce-type", equalTo("function.output"))
+                .body("message", equalTo("Hello!"));
     }
 
-}
+}

Diff for: templates/quarkus/events/src/test/java/functions/FunctionTest.java

@@ -6,4 +6,4 @@
 public class NativeFunctionIT extends FunctionTest {
 
     // Execute the same tests but in native mode.
-}
+}

Diff for: templates/quarkus/events/src/test/java/functions/NativeFunctionIT.java

@@ -2,7 +2,7 @@
 
 Welcome to your new Quarkus function project!
 
-This sample project contains single function: `functions.Function.echo()`,
+This sample project contains a single function: `functions.Function.function()`,
 the function just returns its argument.
 
 ## Local execution
@@ -62,16 +62,22 @@ func describe
 ### cURL
 
 ```shell script
-URL=http://localhost:8080/echo
+URL=http://localhost:8080/
 curl -v ${URL} \
   -H "Content-Type:application/json" \
-  -d "{\"name\": \"$(whoami)\"}\""
+  -d "{\"message\": \"$(whoami)\"}\""
+# OR
+URL="http://localhost:8080/?message=$(whoami)"
+curl -v ${URL} 
 ```
 
 ### HTTPie
 
 ```shell script
-URL=http://localhost:8080/echo
+URL=http://localhost:8080/
 http -v ${URL} \
-  name=$(whoami)
+  message=$(whoami)
+# OR
+URL="http://localhost:8080/?message=$(whoami)"
+http -v ${URL}
 ```

Diff for: templates/quarkus/http/README.md

@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-funqy-http</artifactId>
+      <artifactId>quarkus-funqy-knative-events</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

Diff for: templates/quarkus/http/pom.xml

@@ -5,8 +5,8 @@
 public class Function {
 
     @Funq
-    public Object echo(Object input) {
-        return input;
+    public Output function(Input input) {
+        return new Output(input.getMessage());
     }
 
 }

Diff for: templates/quarkus/http/src/main/java/functions/Function.java

@@ -0,0 +1,19 @@
+package functions;
+
+public class Input {
+    private String message;
+
+    public Input() {}
+
+    public Input(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Diff for: templates/quarkus/http/src/main/java/functions/Input.java

@@ -0,0 +1,19 @@
+package functions;
+
+public class Output {
+    private String message;
+
+    public Output() {}
+
+    public Output(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Diff for: templates/quarkus/http/src/main/java/functions/Output.java

@@ -1,3 +1,3 @@
 # Configuration file
 # key = value
-quarkus.funqy.export=echo
+quarkus.funqy.export=function

Diff for: templates/quarkus/http/src/main/resources/application.properties

@@ -13,20 +13,20 @@
 public class FunctionTest {
 
     @Test
-    void testEcho() {
-        Object obj = (new Function()).echo(42);
-        Assertions.assertEquals(42, obj);
+    void testFunction() {
+        Output output = (new Function()).function(new Input("Hello!"));
+        Assertions.assertEquals("Hello!", output.getMessage());
     }
 
     @Test
-    public void testEchoIntegration() {
+    public void testFunctionIntegration() {
         RestAssured.given().contentType("application/json")
                 .body("{\"message\": \"Hello\"}")
                 .header("ce-id", "42")
                 .header("ce-specversion", "1.0")
-                .post("/echo")
+                .post("/")
                 .then().statusCode(200)
                 .body("message", equalTo("Hello"));
     }
 
-}
+}

Diff for: templates/quarkus/http/src/test/java/functions/FunctionTest.java

@@ -6,4 +6,4 @@
 public class NativeFunctionIT extends FunctionTest {
 
     // Execute the same tests but in native mode.
-}
+}