fix: NPE when returning null CE in Knative Funqy

Allows user to return empty response (no CloudEvent) from non-void methods. Signed-off-by: Matej Vasek <mvasek@redhat.com>
quarkusio · May 5, 2022 · 5180a5a · 5180a5a
1 parent 8f25706
commit 5180a5a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/...-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java b/...-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java
@@ -81,6 +81,18 @@ public void testGenericInput() {
                 .body(equalTo("6"));
     }
 
+    @Test
+    public void testNullResponse() {
+        RestAssured.given().contentType("application/json")
+                .header("ce-id", "test-id")
+                .header("ce-specversion", "1.0")
+                .header("ce-type", "test-null-response")
+                .header("ce-source", "test-source")
+                .post()
+                .then()
+                .statusCode(204);
+    }
+
     @ParameterizedTest
     @MethodSource("provideBinaryEncodingTestArgs")
     public void testBinaryEncoding(Map<String, String> headers, String specversion, String dataSchemaHdrName) {

diff --git a/...nqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEvents.java b/...nqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEvents.java
@@ -65,6 +65,12 @@ public CloudEvent<Integer> sum(CloudEvent<List<TestBean>> event) {
                 .build(data);
     }
 
+    @Funq
+    @CloudEventMapping(trigger = "test-null-response")
+    public CloudEvent<String> returnNull(CloudEvent<Void> ignore) {
+        return null;
+    }
+
     public static class TestBean implements Serializable {
         private int i;
         private String s;

diff --git a/...e/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java b/...e/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java
@@ -261,6 +261,12 @@ private void processCloudEvent(RoutingContext routingContext) {
                             outputCloudEvent = (CloudEvent<?>) output;
                         }
 
+                        if (outputCloudEvent == null) {
+                            routingContext.response().setStatusCode(204);
+                            routingContext.response().end();
+                            return;
+                        }
+
                         String id = outputCloudEvent.id();
                         if (id == null) {
                             id = getResponseId();