Update Javadoc for Consumes and tidy generator internals

Author: rbygrave

http-api/src/main/java/io/avaje/http/api/Consumes.java

@@ -11,7 +11,7 @@
  * Specify endpoint request media type for the generated OpenAPI json.
  *
  * <p>When not specified the default MediaType is application/json, so we specify this on
- * controllers or methods where the responses return a different media type.
+ * controllers or methods where the request consumes a different media type.
  *
  * <pre>{@code
  * @Path("/customers")

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodDocBuilder.java

@@ -24,7 +24,7 @@ public class MethodDocBuilder {
   private final DocContext ctx;
 
   private final Operation operation = new Operation();
-  private Optional<ConsumesPrism> consumeOp;
+  private final Optional<ConsumesPrism> consumeOp;
 
   public MethodDocBuilder(MethodReader methodReader, DocContext ctx) {
     this.methodReader = methodReader;
@@ -34,9 +34,7 @@ public MethodDocBuilder(MethodReader methodReader, DocContext ctx) {
   }
 
   public void build() {
-
-    if (ctx.isOpenApiAvailable()
-        && methodReader.findAnnotation(HiddenPrism::getOptionalOn).isPresent()) {
+    if (ctx.isOpenApiAvailable() && methodReader.findAnnotation(HiddenPrism::getOptionalOn).isPresent()) {
       return;
     }
 

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodParamDocBuilder.java

@@ -28,15 +28,13 @@ public class MethodParamDocBuilder {
   private final String rawType;
   private final ParamType paramType;
   private final Element element;
-  private Optional<ConsumesPrism> consumeOp;
+  private final Optional<ConsumesPrism> consumeOp;
 
   public MethodParamDocBuilder(MethodDocBuilder methodDoc, ElementReader param) {
-
     this.ctx = methodDoc.getContext();
     this.javadoc = methodDoc.getJavadoc();
     this.operation = methodDoc.getOperation();
     this.consumeOp = methodDoc.consumeOp();
-
     this.paramType = param.paramType();
     this.paramName = param.paramName();
     this.varName = param.varName();
@@ -48,7 +46,6 @@ public MethodParamDocBuilder(MethodDocBuilder methodDoc, ElementReader param) {
    * Build the OpenAPI documentation for the method parameter.
    */
   public void build() {
-
     if (paramType == ParamType.FORM || paramType == ParamType.BODY) {
       addMetaRequestBody(ctx, javadoc, operation);
 
@@ -57,7 +54,7 @@ public void build() {
       param.setName(varName);
       param.setDescription(javadoc.getParams().get(paramName));
 
-      Schema schema = ctx.toSchema(rawType, element);
+      Schema<?> schema = ctx.toSchema(rawType, element);
       if (paramType == ParamType.FORMPARAM) {
         ctx.addFormParam(operation, varName, schema);
 
@@ -70,24 +67,22 @@ public void build() {
   }
 
   private void addMetaRequestBody(DocContext ctx, Javadoc javadoc, Operation operation) {
-
-    Schema schema = ctx.toSchema(rawType, element);
-    String description = javadoc.getParams().get(paramName);
+    final var schema = ctx.toSchema(rawType, element);
+    final var description = javadoc.getParams().get(paramName);
     var mediaType =
         consumeOp
             .map(ConsumesPrism::value)
-            .orElseGet(
-                () -> {
-                  boolean asForm = (paramType == ParamType.FORM);
-                  var mime = asForm ? APP_FORM : APP_JSON;
-
-                  if (schema instanceof StringSchema) {
-                    mime = APP_TXT;
-                  }
-                  return mime;
-                });
+            .orElseGet(() -> requestMedia(schema));
 
     ctx.addRequestBody(operation, schema, mediaType, description);
   }
 
+  private String requestMedia(Schema<?> schema) {
+    if (schema instanceof StringSchema) {
+      return APP_TXT;
+    }
+    boolean asForm = (paramType == ParamType.FORM);
+    return asForm ? APP_FORM : APP_JSON;
+  }
+
 }