Merge pull request #360 from avaje/feature/355-helidon

#355 Controller methods returning null should produce 204 no content …

Author: rbygrave

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerMethodWriter.java

@@ -186,19 +186,30 @@ void writeHandler(boolean requestScoped) {
     writer.append(");").eol();
 
     if (!method.isVoid() && !isFilter) {
-      writeContextReturn();
+      TypeMirror typeMirror = method.returnType();
+      boolean includeNoContent = !typeMirror.getKind().isPrimitive();
+      if (includeNoContent) {
+        writer.append("    if (result == null) {").eol();
+        writer.append("      res.status(NO_CONTENT_204).send();").eol();
+        writer.append("    } else {").eol();
+      }
+      String indent = includeNoContent ? "      " : "    ";
+      writeContextReturn(indent);
       if (isInputStream(method.returnType())) {
         final var uType = UType.parse(method.returnType());
-        writer.append("    result.transferTo(res.outputStream());", uType.shortName()).eol();
+        writer.append(indent).append("result.transferTo(res.outputStream());", uType.shortName()).eol();
       } else if (producesJson()) {
         if (returnTypeString()) {
-          writer.append("    res.send(result); // send raw JSON").eol();
+          writer.append(indent).append("res.send(result); // send raw JSON").eol();
         } else {
           final var uType = UType.parse(method.returnType());
-          writer.append("    %sJsonType.toJson(result, JsonOutput.of(res));", uType.shortName()).eol();
+          writer.append(indent).append("%sJsonType.toJson(result, JsonOutput.of(res));", uType.shortName()).eol();
         }
       } else {
-        writer.append("    res.send(result);").eol();
+        writer.append(indent).append("res.send(result);").eol();
+      }
+      if (includeNoContent) {
+        writer.append("    }").eol();
       }
     }
     writer.append("  }").eol().eol();
@@ -260,14 +271,14 @@ private boolean usesFormParams() {
     return method.params().stream().anyMatch(p -> p.isForm() || ParamType.FORMPARAM.equals(p.paramType()));
   }
 
-  private void writeContextReturn() {
+  private void writeContextReturn(String indent) {
     final var producesOp = Optional.ofNullable(method.produces());
     if (producesOp.isEmpty() && !useJsonB) {
       return;
     }
-
     final var produces = producesOp.map(MediaType::parse).orElse(MediaType.APPLICATION_JSON);
-    final var contentTypeString = "    res.headers().contentType(MediaTypes.";
+    final var contentTypeString = "res.headers().contentType(MediaTypes.";
+    writer.append(indent);
     switch (produces) {
       case APPLICATION_JSON -> writer.append(contentTypeString).append("APPLICATION_JSON);").eol();
       case TEXT_HTML -> writer.append(contentTypeString).append("TEXT_HTML);").eol();

tests/test-nima-jsonb/src/main/java/org/example/TestController.java

@@ -140,4 +140,9 @@ void filter(FilterChain chain, RoutingResponse res) {
   String formBean(MyForm form) {
     return form.name + "|" + form.email + "|" + form.url;
   }
+
+  @Get("maybeNoContent")
+  String maybeNoContent(Boolean empty) {
+    return Boolean.TRUE.equals(empty) ? null : "Hi";
+  }
 }

tests/test-nima-jsonb/src/test/java/org/example/TestControllerTest.java

@@ -29,6 +29,27 @@ void hello() {
     assertThat(res.body()).isEqualTo("Hello world - index");
   }
 
+  @Test
+  void maybeNoContent() {
+    HttpResponse<String> res = client.request()
+      .path("test/maybeNoContent")
+      .queryParam("empty", false)
+      .GET()
+      .asString();
+
+    assertThat(res.statusCode()).isEqualTo(200);
+    assertThat(res.body()).isEqualTo("Hi");
+
+    HttpResponse<String> res2 = client.request()
+      .path("test/maybeNoContent")
+      .queryParam("empty", true)
+      .GET()
+      .asString();
+
+    assertThat(res2.statusCode()).isEqualTo(204);
+    assertThat(res2.body()).isEqualTo("");
+  }
+
   @Test
   void strBody() {
     HttpResponse<String> res = client.request()