Match void / no content response and swagger

Author: rbygrave

src/main/java/io/dinject/javalin/generator/MethodReader.java

@@ -59,7 +59,7 @@ class MethodReader {
     this.bean = bean;
     this.beanPath = bean.getPath();
     this.element = element;
-    this.isVoid = element.getReturnType().toString().equals("void");
+    this.isVoid = element.getReturnType().getKind() == TypeKind.VOID;
     this.methodRoles = Util.findRoles(element);
     this.javadoc = Javadoc.parse(ctx.getDocComment(element));
     this.produces = produces(bean);
@@ -142,11 +142,11 @@ void addMeta(ProcessingContext ctx) {
       response.setDescription(javadoc.getReturnDescription());
 
       TypeMirror returnType = element.getReturnType();
-      if (isNoResponse(returnType)) {
+      if (isVoid) {
         if (isEmpty(response.getDescription())) {
           response.setDescription("No content");
         }
-        responses.addApiResponse("204", response);
+        responses.addApiResponse(Integer.toString(httpStatusCode()), response);
       } else {
         responses.addApiResponse(ApiResponses.DEFAULT, response);
         String contentMediaType = (produces == null) ? MediaType.APPLICATION_JSON : produces;
@@ -159,10 +159,6 @@ private boolean isEmpty(String value) {
     return value == null || value.isEmpty();
   }
 
-  private boolean isNoResponse(TypeMirror returnType) {
-    return returnType.getKind() == TypeKind.VOID;
-  }
-
   /**
    * Return true if the method is included in documentation.
    */
@@ -241,7 +237,7 @@ private List<String> roles() {
   }
 
   private int httpStatusCode() {
-    return webMethod.statusCode();
+    return webMethod.statusCode(isVoid);
   }
 
   private boolean isReturnContent() {

src/main/java/io/dinject/javalin/generator/WebMethod.java

@@ -2,18 +2,25 @@
 
 enum WebMethod {
   GET(200),
-  PUT(200),
   POST(201),
-  PATCH(200),
-  DELETE(200);
+  PUT(200, 204),
+  PATCH(200, 204),
+  DELETE(200, 204);
 
   private int statusCode;
+  private int voidStatusCode;
+
+  WebMethod(int statusCode, int voidStatusCode) {
+    this.statusCode = statusCode;
+    this.voidStatusCode = voidStatusCode;
+  }
 
   WebMethod(int statusCode) {
     this.statusCode = statusCode;
+    this.voidStatusCode = statusCode;
   }
 
-  int statusCode() {
-    return statusCode;
+  int statusCode(boolean isVoid) {
+    return isVoid ? voidStatusCode : statusCode;
   }
 }