Tidy SchemaBuilder

Author: rbygrave

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

@@ -19,7 +19,6 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
@@ -124,11 +123,21 @@ void addMeta(ProcessingContext ctx) {
       }
 
       switch (webMethod) {
-        case GET: pathItem.setGet(operation); break;
-        case PUT: pathItem.setPut(operation); break;
-        case POST: pathItem.setPost(operation); break;
-        case DELETE: pathItem.setDelete(operation); break;
-        case PATCH: pathItem.setPatch(operation); break;
+        case GET:
+          pathItem.setGet(operation);
+          break;
+        case PUT:
+          pathItem.setPut(operation);
+          break;
+        case POST:
+          pathItem.setPost(operation);
+          break;
+        case DELETE:
+          pathItem.setDelete(operation);
+          break;
+        case PATCH:
+          pathItem.setPatch(operation);
+          break;
       }
 
       for (MethodParam param : params) {
@@ -141,17 +150,15 @@ void addMeta(ProcessingContext ctx) {
       ApiResponse response = new ApiResponse();
       response.setDescription(javadoc.getReturnDescription());
 
-      TypeMirror returnType = element.getReturnType();
       if (isVoid) {
         if (isEmpty(response.getDescription())) {
           response.setDescription("No content");
         }
-        responses.addApiResponse(Integer.toString(httpStatusCode()), response);
       } else {
-        responses.addApiResponse(ApiResponses.DEFAULT, response);
         String contentMediaType = (produces == null) ? MediaType.APPLICATION_JSON : produces;
-        response.setContent(ctx.createContent(returnType, contentMediaType));
+        response.setContent(ctx.createContent(element.getReturnType(), contentMediaType));
       }
+      responses.addApiResponse(httpStatusCode(), response);
     }
   }
 
@@ -236,8 +243,8 @@ private List<String> roles() {
     return methodRoles.isEmpty() ? bean.getRoles() : methodRoles;
   }
 
-  private int httpStatusCode() {
-    return webMethod.statusCode(isVoid);
+  private String httpStatusCode() {
+    return Integer.toString(webMethod.statusCode(isVoid));
   }
 
   private boolean isReturnContent() {

src/main/java/io/dinject/javalin/generator/openapi/SchemaBuilder.java

@@ -29,24 +29,19 @@
 import java.util.Set;
 
 /**
- *
+ * Help build OpenAPI Schema objects.
  */
 public class SchemaBuilder {
 
   private final Types types;
   private final KnownTypes knownTypes;
-  //private final Elements elementUtils;
-  //private final ProcessingContext ctx;
-
   private final TypeMirror iterableType;
   private final TypeMirror mapType;
 
   private OpenAPI openAPI;
 
-  public SchemaBuilder(Types types, Elements elements) {//}, ProcessingContext ctx) {
+  public SchemaBuilder(Types types, Elements elements) {
     this.types = types;
-    //this.ctx = ctx;
-    //this.elementUtils = elementUtils;
     this.knownTypes = new KnownTypes();
     this.iterableType = types.erasure(elements.getTypeElement("java.lang.Iterable").asType());
     this.mapType = types.erasure(elements.getTypeElement("java.util.Map").asType());
@@ -57,12 +52,11 @@ public void setOpenAPI(OpenAPI openAPI) {
   }
 
   public Content createContent(TypeMirror returnType, String mediaType) {
-    Content content = new Content();
     MediaType mt = new MediaType();
     mt.setSchema(toSchema(returnType));
+    Content content = new Content();
     content.addMediaType(mediaType, mt);
     return content;
-
   }
 
   public Schema<?> toSchema(TypeMirror type) {