openapi: api doc generator doesn't respect mount() construction fix #2046

Author: jknack

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

@@ -273,12 +273,12 @@ private List<OperationExt> routeHandler(ParserContext ctx, String prefix,
             handlerList.addAll(AnnotationParser.parse(ctx, prefix, signature, (MethodInsnNode) it));
           } else if (signature.matches("<init>", KT_FUN_1)) {
             handlerList.addAll(kotlinHandler(ctx, null, prefix, node));
-          } else if (signature.matches("use", Router.class)) {
-            handlerList.addAll(useRouter(ctx, prefix, node, findRouterInstruction(node)));
-          } else if (signature.matches("use", String.class, Router.class)) {
+          } else if (signature.matches("use", Router.class) || signature.matches("mount", Router.class)) {
+            handlerList.addAll(mountRouter(ctx, prefix, node, findRouterInstruction(node)));
+          } else if (signature.matches("use", String.class, Router.class) || signature.matches("mount", String.class, Router.class)) {
             AbstractInsnNode routerInstruction = findRouterInstruction(node);
             String pattern = routePattern(node, node);
-            handlerList.addAll(useRouter(ctx, path(prefix, pattern), node, routerInstruction));
+            handlerList.addAll(mountRouter(ctx, path(prefix, pattern), node, routerInstruction));
           } else if (signature.matches("path", String.class, Runnable.class)
               || signature.matches("routes", Runnable.class)) {
             boolean routes = signature.matches("routes", Runnable.class);
@@ -504,7 +504,7 @@ private AbstractInsnNode findRouterInstruction(MethodInsnNode node) {
             "Unsupported router type: " + InsnSupport.toString(node)));
   }
 
-  private List<OperationExt> useRouter(ParserContext ctx, String prefix,
+  private List<OperationExt> mountRouter(ParserContext ctx, String prefix,
       MethodInsnNode node, AbstractInsnNode routerInstruction) {
     Type router;
     if (routerInstruction instanceof TypeInsnNode) {

modules/jooby-openapi/src/test/java/issues/i2046/App2046.java

@@ -0,0 +1,11 @@
+package issues.i2046;
+
+import io.jooby.Jooby;
+
+public class App2046 extends Jooby {
+  {
+    get("/2046", ctx -> "..");
+
+    mount("/b", new App2046b());
+  }
+}

modules/jooby-openapi/src/test/java/issues/i2046/App2046b.java

@@ -0,0 +1,10 @@
+package issues.i2046;
+
+import io.jooby.Jooby;
+
+public class App2046b extends Jooby {
+
+  {
+    get("/2046b", ctx -> "..");
+  }
+}

modules/jooby-openapi/src/test/java/issues/i2046/Issue2046.java

@@ -0,0 +1,39 @@
+package issues.i2046;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.jooby.openapi.OpenAPIResult;
+import io.jooby.openapi.OpenAPITest;
+import kt.issues.i2004.App2004;
+
+public class Issue2046 {
+  @OpenAPITest(value = App2046.class)
+  public void shouldSupportMountOperation(OpenAPIResult result) {
+    assertEquals("openapi: 3.0.1\n"
+        + "info:\n"
+        + "  title: 2046 API\n"
+        + "  description: 2046 API description\n"
+        + "  version: \"1.0\"\n"
+        + "paths:\n"
+        + "  /2046:\n"
+        + "    get:\n"
+        + "      operationId: get2046\n"
+        + "      responses:\n"
+        + "        \"200\":\n"
+        + "          description: Success\n"
+        + "          content:\n"
+        + "            application/json:\n"
+        + "              schema:\n"
+        + "                type: string\n"
+        + "  /b/2046b:\n"
+        + "    get:\n"
+        + "      operationId: getB2046b\n"
+        + "      responses:\n"
+        + "        \"200\":\n"
+        + "          description: Success\n"
+        + "          content:\n"
+        + "            application/json:\n"
+        + "              schema:\n"
+        + "                type: string\n", result.toYaml());
+  }
+}