Kotlin enhancements (#818)

* onStart/onStop callback fix #810
* Kooby as receiver fix #817

Author: jknack

modules/jooby-lang-kotlin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -22,18 +22,18 @@
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
         <version>${kotlin.version}</version>
+        <configuration>
+          <jvmTarget>1.8</jvmTarget>
+          <args>
+            <arg>-java-parameters</arg>
+          </args>
+        </configuration>
         <executions>
           <execution>
             <id>compile</id>
             <goals>
               <goal>compile</goal>
             </goals>
-            <configuration>
-              <args>
-                <arg>-java-parameters</arg>
-              </args>
-              <jvmTarget>1.8</jvmTarget>
-            </configuration>
           </execution>
 
           <execution>
@@ -109,7 +109,16 @@
       <artifactId>kotlin-stdlib</artifactId>
     </dependency>
 
-    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jre7</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jre8</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.jooby</groupId>
       <artifactId>jooby</artifactId>

modules/jooby-lang-kotlin/src/main/kotlin/org/jooby/Jooby.kt

@@ -3,10 +3,15 @@ package org.jooby
 import kotlin.reflect.KClass
 import org.jooby.spi.Server
 import java.util.SortedSet
+import com.sun.xml.internal.bind.v2.schemagen.episode.Klass
+
+@DslMarker
+annotation class DslJooby
 
 /**
  * Collection of utility class and method to make Jooby more Kotlin.
  */
+@DslJooby
 class KRouteGroup(b: Route.Props<Route.Group>) : Route.Props<Route.Group> by b {
   private val g = b as Route.Group
 
@@ -164,7 +169,12 @@ class KRouteGroup(b: Route.Props<Route.Group>) : Route.Props<Route.Group> by b {
 /**
   * Collection of utility class and method to make Jooby more Kotlin.
   */
-open class Kooby: Jooby() {
+@DslJooby
+open class Kooby constructor(): Jooby() {
+  constructor(init: Kooby.() -> Unit): this() {
+    this.init()
+  }
+
   fun <T:Any> use(klass: KClass<T>): Route.Collection {
     return use(klass.java)
   }
@@ -225,6 +235,21 @@ open class Kooby: Jooby() {
   fun head(pattern: String = "/", init: Request.() -> Any): Route.Definition {
     return head(pattern, {req-> req.init()})
   }
+
+  fun onStart(init: Registry.() -> Unit): Jooby {
+    this.onStart({registry-> registry.init()})
+    return this
+  }
+
+  fun onStarted(init: Registry.() -> Unit): Jooby {
+    this.onStarted({registry-> registry.init()})
+    return this
+  }
+
+  fun onStop(init: Registry.() -> Unit): Jooby {
+    this.onStop({registry-> registry.init()})
+    return this
+  }
 }
 
 /**
@@ -252,18 +277,19 @@ fun jooby(init: Kooby.() -> Unit): Jooby {
  * </pre>
  */
 fun run(vararg args: String, init: Kooby.() -> Unit): Unit {
-  Jooby.run({ ->
-    val app = Kooby()
-    app.init()
-    app
-  }, args)
+  Jooby.run({-> Kooby(init)}, args)
+}
+
+fun run(supplier: () -> Jooby, vararg args: String): Unit {
+  Jooby.run(supplier, args)
 }
 
 // Redefine functions with class arguments
 fun <T:Throwable> Router.err(klass: KClass<T>, handler: Err.Handler): Router {
-    return this.err(klass.java, handler)
-  }
+  return this.err(klass.java, handler)
+}
 
+// *********************************** Registry **************************************************
 fun <T:Any> Registry.require(klass: KClass<T>): T {
   return this.require(klass.java)
 }
@@ -277,6 +303,18 @@ fun <T:Any> LifeCycle.lifeCycle(klass: KClass<T>): LifeCycle {
   return this.lifeCycle(klass.java)
 }
 
+fun Env.onStart(init: Registry.() -> Unit): LifeCycle {
+  return this.onStart({registry-> registry.init()})
+}
+
+fun Env.onStarted(init: Registry.() -> Unit): LifeCycle {
+  return this.onStarted({registry-> registry.init()})
+}
+
+fun Env.onStop(init: Registry.() -> Unit): LifeCycle {
+  return this.onStop({registry-> registry.init()})
+}
+
 // *********************************** Mutant *****************************************************
 val Mutant.booleanValue: Boolean
   get() = booleanValue()
@@ -333,22 +371,42 @@ fun <T:Enum<T>> Mutant.toEnum(type: KClass<T>): T {
   return this.toEnum(type.java)
 }
 
+inline fun <reified T:Enum<T>> Mutant.toEnum(): T {
+  return this.toEnum(T::class.java)
+}
+
 fun <T:Any> Mutant.toOptional(type: KClass<T>): java.util.Optional<T> {
   return this.toOptional(type.java)
 }
 
+inline fun <reified T> Mutant.toOptional(): java.util.Optional<T> {
+  return this.toOptional(T::class.java)
+}
+
 fun <T:Any> Mutant.toList(type: KClass<T>): List<T> {
   return this.toList(type.java)
 }
 
+inline fun <reified T> Mutant.toList(): List<T> {
+  return this.toList(T::class.java)
+}
+
 fun <T:Any> Mutant.toSet(type: KClass<T>): Set<T> {
   return this.toSet(type.java)
 }
 
+inline fun <reified T> Mutant.toSet(): Set<T> {
+  return this.toSet(T::class.java)
+}
+
 fun <T:Comparable<T>> Mutant.toSortedSet(type: KClass<T>): SortedSet<T> {
   return this.toSortedSet(type.java)
 }
 
+inline fun <reified T:Comparable<T>> Mutant.toSortedSet(): SortedSet<T> {
+  return this.toSortedSet(T::class.java)
+}
+
 // *********************************** Request *****************************************************
 fun <T:Any> Request.set(type: KClass<T>, value: Any): Request {
   return this.set(type.java, value)

modules/jooby-lang-kotlin/src/test/kotlin/examples/kotlin/App.kt

@@ -1,7 +1,6 @@
 package examples.kotlin
 
-import org.jooby.Jooby
-import org.jooby.Kooby
+import org.jooby.*
 
 /**
  * Use Kooby to make Jooby more Kotlin.
@@ -14,6 +13,7 @@ class App: Kooby() {
     get ("/") {
       "Hi Kotlin"
     }
+
   }
 }
 

modules/jooby-lang-kotlin/src/test/kotlin/examples/kotlin/Fn.kt

@@ -13,6 +13,14 @@ fun main(args: Array<String>) {
       "Hi $name!!"
     }
 
+    // reified version
+    post {
+      val h = header<Int>("id")
+      val name = param<String>("name")
+      val user = body<User>()
+      name + user + h
+    }
+
     with {
       get("/with") { "With" }
     }.name("w")
@@ -56,5 +64,17 @@ fun main(args: Array<String>) {
       val user = body<User>()
       user
     }
+
+    onStart {
+      println("Starting")
+    }
+
+    onStarted {
+      println("Started")
+    }
+
+    onStop {
+      println("Stopped")
+    }
   }
 }

modules/jooby-lang-kotlin/src/test/kotlin/examples/kotlin/KoobyApp.kt

@@ -0,0 +1,43 @@
+  package examples.kotlin
+
+import org.jooby.*
+
+class KApp: Kooby({
+
+  use({env, conf, binder ->
+    env.onStart {->
+      println("Start from module")
+    }
+    println("XXX New module $env $conf $binder")
+  })
+
+  get {
+    "Hi Kotlin"
+  }
+
+  onStart {
+    println("Starting")
+  }
+
+  onStarted {
+    println("Started")
+  }
+
+  onStop {
+    println("Stopped")
+  }
+
+  route("/") {
+    get {->
+      val value = param("x").value
+      "x $value"
+    }
+  }
+})
+
+/**
+ * Start Jooby
+ */
+fun main(args: Array<String>) {
+  Jooby.run(::App, args)
+}