OpenAPI: requestbody from MVC

jknack · jknack · commit b0fa9b472eea · 2020-03-18T08:45:21.000-03:00
diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java
@@ -34,6 +34,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -201,16 +203,23 @@ private static List<OperationExt> routerMethod(ParserContext ctx, String prefix,
       ClassNode classNode, MethodNode method) {
     List<OperationExt> result = new ArrayList<>();
 
-    List<ParameterExt> arguments = routerArguments(method);
+    AtomicReference<RequestBodyExt> requestBody = new AtomicReference<>();
+    List<ParameterExt> arguments = routerArguments(method, requestBody::set);
     List<ResponseExt> returnTypes = returnTypes(method);
 
     for (String httpMethod : httpMethod(method.visibleAnnotations)) {
       for (String pattern : httpPattern(classNode, method, httpMethod)) {
-        OperationExt operation = new OperationExt(method, httpMethod, RoutePath.path(prefix, pattern),
+        OperationExt operation = new OperationExt(
+            method,
+            httpMethod,
+            RoutePath.path(prefix, pattern),
             arguments,
-            returnTypes);
+            returnTypes
+        );
         operation.setOperationId(method.name);
         operation.setDeprecated(isDeprecated(method.visibleAnnotations));
+        Optional.ofNullable(requestBody.get()).ifPresent(operation::setRequestBody);
+
         result.add(operation);
       }
     }
@@ -246,7 +255,8 @@ private static List<ResponseExt> returnTypes(MethodNode method) {
     return result;
   }
 
-  private static List<ParameterExt> routerArguments(MethodNode method) {
+  private static List<ParameterExt> routerArguments(MethodNode method,
+      Consumer<RequestBodyExt> requestBody) {
     List<ParameterExt> result = new ArrayList<>();
     if (method.parameters != null) {
       for (int i = 0; i < method.parameters.size(); i++) {
@@ -288,13 +298,19 @@ private static List<ParameterExt> routerArguments(MethodNode method) {
             ? true
             : !isNullable(method, i);//!javaType.startsWith("java.util.Optional");
 
-        ParameterExt argument = new ParameterExt();
-        argument.setName(paramType.getHttpName(annotations).orElse(parameter.name));
-        argument.setJavaType(javaType);
-        paramType.setIn(argument);
-        argument.setRequired(required);
-
-        result.add(argument);
+        if (paramType == ParamType.BODY) {
+          RequestBodyExt body = new RequestBodyExt();
+          body.setRequired(required);
+          body.setJavaType(javaType);
+          requestBody.accept(body);
+        } else {
+          ParameterExt argument = new ParameterExt();
+          argument.setName(paramType.getHttpName(annotations).orElse(parameter.name));
+          argument.setJavaType(javaType);
+          paramType.setIn(argument);
+          argument.setRequired(required);
+          result.add(argument);
+        }
       }
     }
     return result;
diff --git a/modules/jooby-openapi/src/test/java/examples/ControllerExample.java b/modules/jooby-openapi/src/test/java/examples/ControllerExample.java
@@ -44,4 +44,9 @@ public String ifSession(Optional<Session> ifSession) {
   public List<String> returnList() {
     return null;
   }
+
+  @POST("/bean")
+  public ABean save(ABean bean) {
+    return bean;
+  }
 }
diff --git a/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenApiToolTest.java b/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenApiToolTest.java
@@ -1110,6 +1110,11 @@ public void routeMvc(RouteIterator iterator) {
               route.getResponse().toString());
           assertTrue(route.getDeprecated());
         })
+        .next(route -> {
+          assertEquals("POST /api/bean", route.toString());
+          assertEquals(ABean.class.getName(), route.getResponse().toString());
+          assertEquals(ABean.class.getName(), route.getRequestBody().getJavaType());
+        })
         .verify();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,9 @@ public String ifSession(Optional<Session> ifSession) {`
`44`	`44`	`public List<String> returnList() {`
`45`	`45`	`return null;`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ @POST("/bean")`
	`49`	`+ public ABean save(ABean bean) {`
	`50`	`+ return bean;`
	`51`	`+ }`
`47`	`52`	`}`