apitool: produces an empty swagger/raml definition when bootstrapping without an application class fix #932

Author: jknack

jooby/src/main/java/org/jooby/Jooby.java

@@ -261,6 +261,7 @@
 import org.jooby.internal.ServerLookup;
 import org.jooby.internal.ServerSessionManager;
 import org.jooby.internal.SessionManager;
+import org.jooby.internal.SourceProvider;
 import org.jooby.internal.TypeConverters;
 import org.jooby.internal.handlers.HeadHandler;
 import org.jooby.internal.handlers.OptionsHandler;
@@ -888,6 +889,8 @@ public EnvDep(final Predicate<String> predicate, final Consumer<Config> callback
 
   private transient boolean caseSensitiveRouting = true;
 
+  private transient String classname;
+
   /**
    * Creates a new {@link Jooby} application.
    */
@@ -904,6 +907,7 @@ public Jooby() {
   public Jooby(final String prefix) {
     this.prefix = prefix;
     use(server);
+    this.classname = classname(getClass().getName());
   }
 
   @Override
@@ -3329,7 +3333,7 @@ private Config defaultConfig(final Config conf, final String cpath) {
         .withValue("contextPath", fromAnyRef(cpath.equals("/") ? "" : cpath))
         .withValue("application.name", fromAnyRef(appname))
         .withValue("application.version", fromAnyRef(version))
-        .withValue("application.class", fromAnyRef(getClass().getName()))
+        .withValue("application.class", fromAnyRef(classname))
         .withValue("application.ns", fromAnyRef(ns))
         .withValue("application.lang", fromAnyRef(lang))
         .withValue("application.tz", fromAnyRef(tz))
@@ -3468,4 +3472,18 @@ public void configureAssetHandler(final AssetHandler handler) {
     });
   }
 
+  /**
+   * Class name is this, except for script bootstrap.
+   *
+   * @param name Default classname.
+   * @return Classname.
+   */
+  private String classname(String name) {
+    if (name.equals(Jooby.class.getName()) || name.equals("org.jooby.Kooby")) {
+      return SourceProvider.INSTANCE.get()
+          .map(StackTraceElement::getClassName)
+          .orElse(name);
+    }
+    return name;
+  }
 }

modules/jooby-apitool/src/test/java/kt/CompApp.kt

@@ -3,7 +3,7 @@ package kt
 import org.jooby.*
 
 class CompApp : Kooby({
-  
+
   get("/r1") {
     true
   }

modules/jooby-apitool/src/test/java/kt/RunFn.kt

@@ -0,0 +1,13 @@
+package kt
+
+import org.jooby.*
+import org.jooby.apitool.ApiTool
+
+fun main(args: Array<String>) {
+    run(*args) {
+        use(KResource::class)
+
+        use(ApiTool()
+                .swagger())
+    }
+}

modules/jooby-apitool/src/test/java/org/jooby/apitool/KtRunFnTest.java

@@ -0,0 +1,35 @@
+package org.jooby.apitool;
+
+import org.jooby.Jooby;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class KtRunFnTest {
+
+  @Test
+  public void shouldWorkWithKotlinResource() throws Exception {
+    new RouteMethodAssert(new ApiParser(dir()).parse("kt.RunFnKt"))
+        .next(r -> {
+          r.returnType("java.util.List<kt.KR1>");
+          r.pattern("/kr");
+          r.description("List KR.");
+          r.summary("KR API.");
+          r.param(p -> {
+            p.name("name")
+                .type(String.class)
+                .description("KR name.")
+                .kind(RouteParameter.Kind.QUERY);
+          });
+        }).done();
+  }
+
+  private Path dir() {
+    Path userdir = Paths.get(System.getProperty("user.dir"));
+    if (!userdir.toString().endsWith("jooby-apitool")) {
+      userdir = userdir.resolve("modules").resolve("jooby-apitool");
+    }
+    return userdir;
+  }
+}