Add @consumes annotation (#202)

* Body String

* professionals have standards

* fix bodyPublisher

* rename to body

* import

* Update Body.java

* Revert "rename to body"

* fix other body types

* input stream body

* Update BodyString.java

* Update ElementReader.java

* now will use application/text fo  string

* work

* byte array openAPI

* Update SchemaDocBuilder.java

Author: SentryMan

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

@@ -0,0 +1,35 @@
+package io.avaje.http.api;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * 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.
+ *
+ * <pre>{@code
+ * @Path("/customers")
+ * @Consumes(MediaType.TEXT_PLAIN)
+ * class CustomerController {
+ *   ...
+ * }
+ *
+ * }</pre>
+ */
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface Consumes {
+
+  /**
+   * Specify request media type.
+   *
+   * <p>When not specified the default MediaType is application/json
+   */
+  String value() default MediaType.APPLICATION_JSON;
+}

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

@@ -10,7 +10,7 @@
 /**
  * Specify endpoint response media type.
  *
- * When not specified the default MediaType is APPLICATION_JSON
+ * 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.
  *
@@ -24,14 +24,14 @@
  *
  * }</pre>
  */
-@Target(value = {TYPE, METHOD})
-@Retention(value = RUNTIME)
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
 public @interface Produces {
 
   /**
    * Specify response media type.
    *
-   * <p>When not specified the default MediaType is APPLICATION_JSON
+   * <p>When not specified the default MediaType is application/json
    */
   String value() default MediaType.APPLICATION_JSON;
 

http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java

@@ -1,8 +1,10 @@
 package io.avaje.http.generator.core;
 
-import static io.avaje.http.generator.core.ProcessingContext.*;
-import io.avaje.http.generator.core.javadoc.Javadoc;
-import io.avaje.http.generator.core.openapi.MethodDocBuilder;
+import static io.avaje.http.generator.core.ProcessingContext.doc;
+import static io.avaje.http.generator.core.ProcessingContext.docComment;
+import static io.avaje.http.generator.core.ProcessingContext.platform;
+import static io.avaje.http.generator.core.ProcessingContext.superMethods;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -12,6 +14,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
@@ -20,6 +23,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
+import io.avaje.http.generator.core.javadoc.Javadoc;
+import io.avaje.http.generator.core.openapi.MethodDocBuilder;
+
 public class MethodReader {
 
   private final ControllerReader bean;
@@ -32,6 +38,7 @@ public class MethodReader {
    */
   private final List<String> methodRoles;
   private final Optional<ProducesPrism> producesAnnotation;
+  private final Optional<ConsumesPrism> consumesAnnotation;
   private final List<SecurityRequirementPrism> securityRequirements;
   private final List<OpenAPIResponsePrism> apiResponses;
   private final ExecutableType actualExecutable;
@@ -52,7 +59,13 @@ public class MethodReader {
     this.actualParams = (actualExecutable == null) ? null : actualExecutable.getParameterTypes();
     this.isVoid = element.getReturnType().getKind() == TypeKind.VOID;
     this.methodRoles = Util.findRoles(element);
-    this.producesAnnotation = findAnnotation(ProducesPrism::getOptionalOn);
+    this.producesAnnotation =
+        findAnnotation(ProducesPrism::getOptionalOn)
+            .or(() -> ProducesPrism.getOptionalOn(bean.beanType()));
+    this.consumesAnnotation =
+        findAnnotation(ConsumesPrism::getOptionalOn)
+            .or(() -> ConsumesPrism.getOptionalOn(bean.beanType()));
+
     initWebMethodViaAnnotation();
 
     this.superMethods =
@@ -303,6 +316,10 @@ public String produces() {
     return producesAnnotation.map(ProducesPrism::value).orElseGet(bean::produces);
   }
 
+  public Optional<ConsumesPrism> consumesAnnotation() {
+    return consumesAnnotation;
+  }
+
   public List<SecurityRequirementPrism> securityRequirements() {
     return securityRequirements;
   }

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

@@ -102,8 +102,8 @@ void addFormParam(Operation operation, String varName, Schema schema) {
     schemaBuilder.addFormParam(operation, varName, schema);
   }
 
-  void addRequestBody(Operation operation, Schema schema, boolean asForm, String description) {
-    schemaBuilder.addRequestBody(operation, schema, asForm, description);
+  void addRequestBody(Operation operation, Schema schema, String mediaType, String description) {
+    schemaBuilder.addRequestBody(operation, schema, mediaType, description);
   }
 
   /**

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

@@ -1,6 +1,7 @@
 package io.avaje.http.generator.core.openapi;
 
 import java.io.File;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
@@ -46,6 +47,7 @@ interface KnownType {
     add(new IntegerType(), Integer.class);
     add(new PLongType(), long.class);
     add(new LongType(), Long.class);
+    add(new BytesType(), byte[].class, InputStream.class);
 
     add(new PNumberType(), double.class, float.class);
     add(new NumberType(), Double.class, Float.class, BigDecimal.class, BigInteger.class);
@@ -174,6 +176,12 @@ private URIType() {
     }
   }
 
+  private class BytesType extends StringBaseType {
+    private BytesType() {
+      super("byte");
+    }
+  }
+
   private class StringBaseType implements KnownType {
     private final String format;
 

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

@@ -1,5 +1,8 @@
 package io.avaje.http.generator.core.openapi;
 
+import java.util.Optional;
+
+import io.avaje.http.generator.core.ConsumesPrism;
 import io.avaje.http.generator.core.HiddenPrism;
 import io.avaje.http.generator.core.MethodParam;
 import io.avaje.http.generator.core.MethodReader;
@@ -21,11 +24,13 @@ public class MethodDocBuilder {
   private final DocContext ctx;
 
   private final Operation operation = new Operation();
+  private Optional<ConsumesPrism> consumeOp;
 
   public MethodDocBuilder(MethodReader methodReader, DocContext ctx) {
     this.methodReader = methodReader;
     this.ctx = ctx;
     this.javadoc = methodReader.javadoc();
+    this.consumeOp = methodReader.consumesAnnotation();
   }
 
   public void build() {
@@ -129,6 +134,10 @@ Operation getOperation() {
     return operation;
   }
 
+  public Optional<ConsumesPrism> consumeOp() {
+    return consumeOp;
+  }
+
   private boolean isEmpty(String value) {
     return value == null || value.isEmpty();
   }

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

@@ -1,19 +1,25 @@
 package io.avaje.http.generator.core.openapi;
 
+import java.util.Optional;
+
+import javax.lang.model.element.Element;
+
+import io.avaje.http.generator.core.ConsumesPrism;
 import io.avaje.http.generator.core.ElementReader;
 import io.avaje.http.generator.core.ParamType;
 import io.avaje.http.generator.core.javadoc.Javadoc;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 
-import javax.lang.model.element.Element;
-
 /**
  * Build the OpenAPI for a method parameter.
  */
 public class MethodParamDocBuilder {
-
+  private static final String APP_FORM = "application/x-www-form-urlencoded";
+  private static final String APP_JSON = "application/json";
+  private static final String APP_TXT = "application/text";
   private final DocContext ctx;
   private final Javadoc javadoc;
   private final Operation operation;
@@ -22,12 +28,14 @@ public class MethodParamDocBuilder {
   private final String rawType;
   private final ParamType paramType;
   private final Element element;
+  private 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();
@@ -65,9 +73,21 @@ private void addMetaRequestBody(DocContext ctx, Javadoc javadoc, Operation opera
 
     Schema schema = ctx.toSchema(rawType, element);
     String description = javadoc.getParams().get(paramName);
-
-    boolean asForm = (paramType == ParamType.FORM);
-    ctx.addRequestBody(operation, schema, asForm, description);
+    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;
+                });
+
+    ctx.addRequestBody(operation, schema, mediaType, description);
   }
 
 }

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

@@ -45,7 +45,6 @@ class SchemaDocBuilder {
 
   private static final String APP_FORM = "application/x-www-form-urlencoded";
   private static final String APP_JSON = "application/json";
-  private static final String APP_TXT = "application/text";
 
   private final Elements elements;
   private final Types types;
@@ -103,21 +102,15 @@ private Schema requestFormParamSchema(RequestBody body) {
     return schema;
   }
 
-  /**
-   * Add as request body.
-   */
-  void addRequestBody(Operation operation, Schema schema, boolean asForm, String description) {
+  /** Add as request body. */
+  void addRequestBody(Operation operation, Schema schema, String mediaType, String description) {
     RequestBody body = requestBody(operation);
     body.setDescription(description);
 
     MediaType mt = new MediaType();
     mt.schema(schema);
 
-    String mime = asForm ? APP_FORM : APP_JSON;
-    if (schema instanceof StringSchema) {
-      mime = APP_TXT;
-    }
-    body.getContent().addMediaType(mime, mt);
+    body.getContent().addMediaType(mediaType, mt);
   }
 
   private RequestBody requestBody(Operation operation) {

http-generator-core/src/main/java/io/avaje/http/generator/core/package-info.java

@@ -17,6 +17,7 @@
 @GeneratePrism(value = io.avaje.http.api.Path.class, publicAccess = true)
 @GeneratePrism(value = io.avaje.http.api.Post.class, publicAccess = true)
 @GeneratePrism(value = io.avaje.http.api.Produces.class, publicAccess = true)
+@GeneratePrism(value = io.avaje.http.api.Consumes.class, publicAccess = true)
 @GeneratePrism(value = io.avaje.http.api.Put.class, publicAccess = true)
 @GeneratePrism(value = io.swagger.v3.oas.annotations.OpenAPIDefinition.class, publicAccess = true)
 @GeneratePrism(value = io.swagger.v3.oas.annotations.tags.Tag.class, publicAccess = true)

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/TestController2.java

@@ -6,6 +6,7 @@
 
 import org.example.myapp.web.ServerType;
 
+import io.avaje.http.api.Consumes;
 import io.avaje.http.api.BodyString;
 import io.avaje.http.api.Controller;
 import io.avaje.http.api.Default;
@@ -47,6 +48,7 @@ String mapTest(Map<String, List<String>> strings) {
   }
 
   @Get("/inputStream")
+  @Consumes("application/bson")
   String stream(InputStream stream) {
     return stream.toString();
   }