Merge pull request #583 from jschneider/feature/add-possibility-to-create-own-injector

extract #createInjector

Author: jknack

coverage-report/src/test/java/org/jooby/issues/PullRequest583Test.java

@@ -0,0 +1,37 @@
+package org.jooby.issues;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import org.jooby.test.ServerFeature;
+import org.junit.*;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Johannes Schneider (<a href="mailto:[email protected]">[email protected]</a>)
+ */
+public class PullRequest583Test extends ServerFeature {
+  private final AtomicReference<Injector> createdInjector = new AtomicReference<>();
+
+  {
+    injector((stage, module) -> {
+      Injector injector = Guice.createInjector(module);
+      createdInjector.set(injector);
+      return injector;
+    });
+  }
+
+  @Test
+  public void appShouldBeMountedOnApplicationPath() throws Exception {
+    Assert.assertNull(createdInjector.get());
+
+    start();
+    try {
+      Injector injector = require(Injector.class);
+      Assert.assertNotNull(injector);
+      Assert.assertSame(injector, createdInjector.get());
+    } finally {
+      stop();
+    }
+  }
+}

coverage-report/src/test/java/org/jooby/issues/PullRequest583WithChildInjectorTest.java

@@ -0,0 +1,44 @@
+package org.jooby.issues;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import org.jooby.test.ServerFeature;
+import org.junit.*;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Johannes Schneider (<a href="mailto:[email protected]">[email protected]</a>)
+ */
+public class PullRequest583WithChildInjectorTest extends ServerFeature {
+  private final AtomicReference<Injector> createdInjector = new AtomicReference<>();
+
+  private final Injector parentInjector = Guice.createInjector(
+    binder -> binder.bind(MyInjectedClass.class).toInstance(new MyInjectedClass()));
+
+  {
+
+    injector((stage, module) -> {
+      Injector injector = parentInjector.createChildInjector(module);
+      createdInjector.set(injector);
+      return injector;
+    });
+  }
+
+  @Test
+  public void appShouldBeMountedOnApplicationPath() throws Exception {
+    Assert.assertNull(createdInjector.get());
+
+    start();
+    try {
+      Injector injector = require(Injector.class);
+      Assert.assertSame(parentInjector.getInstance(MyInjectedClass.class), injector.getInstance(MyInjectedClass.class));
+    } finally {
+      stop();
+    }
+  }
+
+  private static class MyInjectedClass {
+  }
+
+}

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

@@ -82,6 +82,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -696,6 +697,11 @@ public EnvDep(final Predicate<String> predicate, final Consumer<Config> callback
 
   private boolean throwBootstrapException;
 
+  /**
+   * creates the injector
+   */
+  private transient BiFunction<Stage, com.google.inject.Module, Injector> injectorFactory = Guice::createInjector;
+
   /**
    * Creates a new {@link Jooby} application.
    */
@@ -2016,6 +2022,17 @@ public Jooby map(final Mapper<?> mapper) {
     return this;
   }
 
+  /**
+   * Use the injection provider to create the Guice injector
+   *
+   * @param injectorFactory the injection provider
+   * @return this instance.
+   */
+  public Jooby injector(final BiFunction<Stage, com.google.inject.Module, Injector> injectorFactory) {
+    this.injectorFactory = injectorFactory;
+    return this;
+  }
+
   /**
    * Bind the provided abstract type to the given implementation:
    *
@@ -2556,8 +2573,7 @@ private Injector bootstrap(final Config args,
     xss(finalEnv);
 
     /** dependency injection */
-    @SuppressWarnings("unchecked")
-    Injector injector = Guice.createInjector(stage, binder -> {
+    com.google.inject.Module joobyModule = binder -> {
 
       /** type converters */
       new TypeConverters().configure(binder);
@@ -2592,8 +2608,8 @@ private Injector bootstrap(final Config args,
       binder.bind(SSLContext.class).toProvider(SslContextProvider.class);
 
       /** routes */
-      Multibinder<Route.Definition> definitions = Multibinder
-          .newSetBinder(binder, Route.Definition.class);
+      Multibinder<Definition> definitions = Multibinder
+          .newSetBinder(binder, Definition.class);
 
       /** web sockets */
       Multibinder<WebSocket.Definition> sockets = Multibinder
@@ -2689,10 +2705,10 @@ private Injector bootstrap(final Config args,
       } else {
         binder.bind(SessionManager.class).to(ServerSessionManager.class).asEagerSingleton();
         if (sstore instanceof Class) {
-          binder.bind(Session.Store.class).to((Class<? extends Store>) sstore)
+          binder.bind(Store.class).to((Class<? extends Store>) sstore)
               .asEagerSingleton();
         } else {
-          binder.bind(Session.Store.class).toInstance((Store) sstore);
+          binder.bind(Store.class).toInstance((Store) sstore);
         }
       }
 
@@ -2712,7 +2728,9 @@ private Injector bootstrap(final Config args,
 
       /** executors. */
       executors.forEach(it -> it.accept(binder));
-    });
+    };
+    @SuppressWarnings("unchecked")
+    Injector injector = injectorFactory.apply(stage, joobyModule);
 
     onStart.addAll(0, finalEnv.startTasks());
     onStarted.addAll(0, finalEnv.startedTasks());