openapi: work in progress

Author: jknack

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java

@@ -281,7 +281,7 @@ public static List<OperationExt> parse(ParserContext ctx, String prefix, Type ty
       try {
         var className = operationExt.getControllerName();
         javadocParser
-            .parseMvc(toJavaPath(className))
+            .parse(toJavaPath(className))
             .ifPresent(
                 doc -> {
                   operationExt.setPathDescription(doc.getDescription());

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/JavaDocParser.java

@@ -19,23 +19,23 @@ public class JavaDocParser {
   private static final Predicate<DetailAST> HAS_CLASS =
       it -> backward(it).anyMatch(tokens(TokenTypes.CLASS_DEF));
 
-  private static final Predicate<DetailAST> STATEMENT_LIST =
-      it -> backward(it).anyMatch(tokens(TokenTypes.SLIST));
+  private static final Predicate<DetailAST> SINGLE_LINE_COMMENT =
+      it -> backward(it).anyMatch(tokens(TokenTypes.SINGLE_LINE_COMMENT));
 
   private final JavaDocContext context;
 
   public JavaDocParser(JavaDocContext context) {
     this.context = context;
   }
 
-  public Optional<ClassDoc> parseMvc(Path filePath) throws Exception {
+  public Optional<ClassDoc> parse(Path filePath) throws Exception {
     ClassDoc result = null;
     var tree = context.resolve(filePath);
     for (var comment :
         forward(tree)
             .filter(tokens(TokenTypes.COMMENT_CONTENT))
             .filter(HAS_CLASS)
-            .filter(STATEMENT_LIST.negate())
+            .filter(SINGLE_LINE_COMMENT.negate())
             .toList()) {
       var classOrMethod = classOrMethod(comment);
       if (classOrMethod.getType() == TokenTypes.METHOD_DEF) {

modules/jooby-openapi/src/test/java/javadoc/JavaDocParserTest.java

@@ -95,13 +95,13 @@ public void apiDoc() throws Exception {
 
   @Test
   public void ignoreStatementComment() throws Exception {
-    var result = newParser().parseMvc(Paths.get("issues", "i1580", "Controller1580.java"));
+    var result = newParser().parse(Paths.get("issues", "i1580", "Controller1580.java"));
     assertTrue(result.isEmpty());
   }
 
   @Test
   public void noDoc() throws Exception {
-    var result = newParser().parseMvc(Paths.get("javadoc", "input", "NoDoc.java"));
+    var result = newParser().parse(Paths.get("javadoc", "input", "NoDoc.java"));
     assertTrue(result.isEmpty());
   }
 
@@ -124,6 +124,25 @@ public void noClassDoc() throws Exception {
         });
   }
 
+  @Test
+  public void shouldParseBean() throws Exception {
+    withDoc(
+        Paths.get("javadoc", "input", "QueryBeanDoc.java"),
+        doc -> {
+          assertNull(doc.getSummary());
+          assertNull(doc.getDescription());
+
+          withMethod(
+              doc,
+              "hello",
+              List.of("String"),
+              methodDoc -> {
+                assertEquals("Method Doc.", methodDoc.getSummary());
+                assertNull(methodDoc.getDescription());
+              });
+        });
+  }
+
   private JavaDocParser newParser() {
     return new JavaDocParser(new JavaDocContext(baseDir()));
   }
@@ -134,7 +153,7 @@ private Path baseDir() {
 
   private void withDoc(Path path, Consumer<ClassDoc> consumer) throws Exception {
     try {
-      var result = newParser().parseMvc(path);
+      var result = newParser().parse(path);
       assertFalse(result.isEmpty());
       consumer.accept(result.get());
     } catch (Throwable cause) {

modules/jooby-openapi/src/test/java/javadoc/input/ApiDoc.java

@@ -22,7 +22,9 @@
 public class ApiDoc {
 
   /**
-   * This is the Hello <code>/endpoint</code> Operation description
+   * This is the Hello <code>/endpoint</code>
+   *
+   * <p>Operation description
    *
    * @param name Person name.
    * @param age Person age.