add app param to start/stop callback #357

Author: jknack

jooby-jdbc/src/test/java/org/jooby/jdbc/JdbcTest.java

@@ -37,7 +37,6 @@
 import com.zaxxer.hikari.HikariConfig;
 
 import javaslang.control.Try.CheckedConsumer;
-import javaslang.control.Try.CheckedRunnable;
 
 public class JdbcTest {
 
@@ -1059,7 +1058,7 @@ public Routes routes() throws UnsupportedOperationException {
       }
 
       @Override
-      public Env onStop(final CheckedRunnable shutdownTask) {
+      public Env onStop(final CheckedConsumer<Jooby> shutdownTask) {
         throw new UnsupportedOperationException();
       }
 
@@ -1069,7 +1068,7 @@ public List<CheckedConsumer<Jooby>> stopTasks() {
       }
 
       @Override
-      public Env onStart(final CheckedRunnable task) {
+      public Env onStart(final CheckedConsumer<Jooby> task) {
         throw new UnsupportedOperationException();
       }
 

jooby/src/main/java/org/jooby/Env.java

@@ -140,14 +140,14 @@ public List<CheckedConsumer<Jooby>> stopTasks() {
       }
 
       @Override
-      public Env onStop(final CheckedRunnable task) {
-        this.shutdown.add(e -> task.run());
+      public Env onStop(final CheckedConsumer<Jooby> task) {
+        this.shutdown.add(task);
         return this;
       }
 
       @Override
-      public Env onStart(final CheckedRunnable task) {
-        this.start.add(e -> task.run());
+      public Env onStart(final CheckedConsumer<Jooby> task) {
+        this.start.add(task);
         return this;
       }
 
@@ -373,7 +373,37 @@ default <T> Option<T> when(final Predicate<String> predicate, final T result) {
    * @param task Task to run.
    * @return This env.
    */
-  Env onStart(CheckedRunnable task);
+  Env onStart(CheckedConsumer<Jooby> task);
+
+  /**
+   * Add a start task, useful for initialize and/or start services at startup time.
+   *
+   * You should ONLY call this method while the application is been initialized, usually executing
+   * {@link Jooby.Module#configure(Env, Config, com.google.inject.Binder)}.
+   *
+   * The behaviour of this method once application has been initialized is <code>undefined</code>.
+   *
+   * @param task Task to run.
+   * @return This env.
+   */
+  default Env onStart(final CheckedRunnable task) {
+    return onStart(app -> task.run());
+  }
+
+  /**
+   * Add a stop task, useful for cleanup and/or stop service at stop time.
+   *
+   * You should ONLY call this method while the application is been initialized, usually executing
+   * {@link Jooby.Module#configure(Env, Config, com.google.inject.Binder)}.
+   *
+   * The behaviour of this method once application has been initialized is <code>undefined</code>.
+   *
+   * @param task Task to run.
+   * @return This env.
+   */
+  default Env onStop(final CheckedRunnable task) {
+    return onStop(app -> task.run());
+  }
 
   /**
    * Add a stop task, useful for cleanup and/or stop service at stop time.
@@ -386,7 +416,7 @@ default <T> Option<T> when(final Predicate<String> predicate, final T result) {
    * @param task Task to run.
    * @return This env.
    */
-  Env onStop(CheckedRunnable task);
+  Env onStop(CheckedConsumer<Jooby> task);
 
   /**
    * @return List of start tasks.

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

@@ -711,7 +711,18 @@ public Jooby env(final Env.Builder env) {
    */
   public Jooby onStart(final CheckedRunnable callback) {
     requireNonNull(callback, "Callback is required.");
-    onStart.add(e -> callback.run());
+    return onStart(a -> callback.run());
+  }
+
+  /**
+   * Run code at application startup time.
+   *
+   * @param callback A callback to run.
+   * @return This instance.
+   */
+  public Jooby onStart(final CheckedConsumer<Jooby> callback) {
+    requireNonNull(callback, "Callback is required.");
+    onStart.add(callback);
     return this;
   }
 
@@ -723,7 +734,18 @@ public Jooby onStart(final CheckedRunnable callback) {
    */
   public Jooby onStop(final CheckedRunnable callback) {
     requireNonNull(callback, "Callback is required.");
-    onStop.add(e -> callback.run());
+    return onStop(e -> callback.run());
+  }
+
+  /**
+   * Run code at application shutdown time.
+   *
+   * @param callback A callback to run.
+   * @return This instance.
+   */
+  public Jooby onStop(final CheckedConsumer<Jooby> callback) {
+    requireNonNull(callback, "Callback is required.");
+    onStop.add(callback);
     return this;
   }