OpenAPI generator now supports Kotlin object controllers.

imeszaros · imeszaros · commit 77aca503bf15 · 2020-09-19T12:58:56.000+02: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
@@ -28,6 +28,7 @@
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.LdcInsnNode;
 import org.objectweb.asm.tree.LocalVariableNode;
 import org.objectweb.asm.tree.MethodInsnNode;
@@ -205,6 +206,10 @@ public static List<OperationExt> parse(ParserContext ctx, String prefix,
           Type type = Type.getReturnType(methodInsnNode.desc);
           return parse(ctx, prefix, type);
         }
+      } else if (previous instanceof FieldInsnNode) {
+        FieldInsnNode fieldInsnNode = (FieldInsnNode) previous;
+        Type type = Type.getObjectType(fieldInsnNode.owner);
+        return parse(ctx, prefix, type);
       }
     }
     return Collections.emptyList();
diff --git a/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java b/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java
@@ -29,6 +29,8 @@
 import kt.KtCoroutineRouteIdioms;
 import kt.KtMvcApp;
 import kt.KtMvcAppWithRoutes;
+import kt.KtMvcInstanceApp;
+import kt.KtMvcObjectApp;
 import kt.KtNoAppClassKt;
 import kt.KtRouteIdioms;
 import kt.KtRouteImport;
@@ -1306,6 +1308,16 @@ public void ktMvc(RouteIterator iterator) {
     assertKtController(iterator);
   }
 
+  @OpenAPITest(value = KtMvcInstanceApp.class)
+  public void ktMvcInstance(RouteIterator iterator) {
+    assertKtController(iterator);
+  }
+
+  @OpenAPITest(value = KtMvcObjectApp.class)
+  public void ktMvcObject(RouteIterator iterator) {
+    assertKtController(iterator);
+  }
+
   @OpenAPITest(value = KtMvcAppWithRoutes.class)
   public void ktMvcWithRoutes(RouteIterator iterator) {
     assertKtController(iterator);
diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtMvcInstanceApp.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtMvcInstanceApp.kt
@@ -0,0 +1,9 @@
+package kt
+
+import io.jooby.Kooby
+
+class KtMvcInstanceApp : Kooby({
+
+  mvc(KtController())
+
+})
diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtMvcObjectApp.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtMvcObjectApp.kt
@@ -0,0 +1,9 @@
+package kt
+
+import io.jooby.Kooby
+
+class KtMvcObjectApp : Kooby({
+
+  mvc(KtObjectController)
+
+})
diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt
@@ -0,0 +1,58 @@
+package kt
+
+import examples.ABean
+import kotlinx.coroutines.delay
+import java.util.concurrent.CompletableFuture
+import javax.inject.Named
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.HeaderParam
+import javax.ws.rs.Path
+import javax.ws.rs.QueryParam
+
+object KtObjectController {
+
+  @GET
+  fun doSomething(): String {
+    return ""
+  }
+
+  @DELETE
+  @Path("/unit")
+  fun doUnit() {
+  }
+
+  @GET
+  @Path("/doMap")
+  fun doMap(): Map<String, Any> {
+    return mapOf()
+  }
+
+  @Path("/doParams")
+  fun params(@QueryParam("I") i: Int,
+             @QueryParam("oI") oi: Int?,
+             @QueryParam("q") q: String,
+             @QueryParam("nullq") nullq: String?): ABean {
+    return ABean()
+  }
+
+  @GET
+  @Path("/coroutine")
+  suspend fun coroutine(): List<String> {
+    delay(100)
+    return listOf("...")
+  }
+
+  @GET
+  @Path("/future")
+  fun completableFuture(): CompletableFuture<String> {
+    return CompletableFuture.completedFuture("...")
+  }
+
+  @GET
+  @Path("/httpNames")
+  fun httpNames(@HeaderParam("Last-Modified-Since") lastModifiedSince: String,
+                @Named("x-search") @io.jooby.annotations.QueryParam q: String): String {
+    return lastModifiedSince
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`import org.objectweb.asm.tree.AbstractInsnNode;`
`29`	`29`	`import org.objectweb.asm.tree.AnnotationNode;`
`30`	`30`	`import org.objectweb.asm.tree.ClassNode;`
	`31`	`+import org.objectweb.asm.tree.FieldInsnNode;`
`31`	`32`	`import org.objectweb.asm.tree.LdcInsnNode;`
`32`	`33`	`import org.objectweb.asm.tree.LocalVariableNode;`
`33`	`34`	`import org.objectweb.asm.tree.MethodInsnNode;`
`@@ -205,6 +206,10 @@ public static List<OperationExt> parse(ParserContext ctx, String prefix,`
`205`	`206`	`Type type = Type.getReturnType(methodInsnNode.desc);`
`206`	`207`	`return parse(ctx, prefix, type);`
`207`	`208`	`}`
	`209`	`+ } else if (previous instanceof FieldInsnNode) {`
	`210`	`+ FieldInsnNode fieldInsnNode = (FieldInsnNode) previous;`
	`211`	`+ Type type = Type.getObjectType(fieldInsnNode.owner);`
	`212`	`+ return parse(ctx, prefix, type);`
`208`	`213`	`}`
`209`	`214`	`}`
`210`	`215`	`return Collections.emptyList();`