Injectable fields on application bootstrap class fix jooby-project#491

jknack · jknack · commit c7261e2a889a · 2016-10-02T18:02:55.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue491.java b/coverage-report/src/test/java/org/jooby/issues/Issue491.java
@@ -0,0 +1,28 @@
+package org.jooby.issues;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue491 extends ServerFeature {
+
+  @Inject
+  @Named("application.port")
+  private String applicationPort;
+
+  {
+
+    get("/491", () -> applicationPort);
+
+  }
+
+  @Test
+  public void injectableFields() throws Exception {
+    request()
+        .get("/491")
+        .expect("9999");
+  }
+
+}
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -3648,6 +3648,9 @@ private void start(final String[] args, final Consumer<List<Route.Definition>> r
 
     Logger log = logger(this);
 
+    // inject class
+    injector.injectMembers(this);
+
     // start services
     for (CheckedConsumer<Registry> onStart : this.onStart) {
       onStart.accept(this);
diff --git a/jooby/src/test/java/org/jooby/JoobyTest.java b/jooby/src/test/java/org/jooby/JoobyTest.java
@@ -523,6 +523,7 @@ public Object m1() {
     expect(injector.getInstance(Config.class)).andReturn(config);
     expect(injector.getInstance(Route.KEY)).andReturn(Collections.emptySet());
     expect(injector.getInstance(WebSocket.KEY)).andReturn(Collections.emptySet());
+    injector.injectMembers(isA(Jooby.class));
 
     AppPrinter printer = unit.constructor(AppPrinter.class)
         .args(Set.class, Set.class, Config.class)
@@ -580,6 +581,7 @@ public void applicationSecret() throws Exception {
               expect(injector.getInstance(Config.class)).andReturn(config);
               expect(injector.getInstance(Route.KEY)).andReturn(Collections.emptySet());
               expect(injector.getInstance(WebSocket.KEY)).andReturn(Collections.emptySet());
+              injector.injectMembers(isA(Jooby.class));
 
               unit.mockStatic(Guice.class);
               expect(Guice.createInjector(eq(Stage.PRODUCTION), unit.capture(Module.class)))
@@ -988,6 +990,7 @@ public void stopOnServerFailure() throws Exception {
               expect(injector.getInstance(Config.class)).andReturn(config);
               expect(injector.getInstance(Route.KEY)).andReturn(Collections.emptySet());
               expect(injector.getInstance(WebSocket.KEY)).andReturn(Collections.emptySet());
+              injector.injectMembers(isA(Jooby.class));
 
               unit.mockStatic(Guice.class);
               expect(Guice.createInjector(eq(Stage.DEVELOPMENT), unit.capture(Module.class)))
diff --git a/jooby/src/test/java/org/jooby/test/JoobyRunner.java b/jooby/src/test/java/org/jooby/test/JoobyRunner.java
@@ -18,6 +18,7 @@
  */
 package org.jooby.test;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,8 +32,6 @@
 import org.junit.runners.model.Statement;
 
 import com.google.inject.Binder;
-import com.google.inject.Guice;
-import com.google.inject.name.Names;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValueFactory;
@@ -146,14 +145,29 @@ public void evaluate() throws Throwable {
   @Override
   protected Object createTest() throws Exception {
     Object test = super.createTest();
-    Guice.createInjector(binder -> {
-      binder.bind(Integer.class).annotatedWith(Names.named("port")).toInstance(port);
-      binder.bind(Integer.class).annotatedWith(Names.named("securePort")).toInstance(securePort);
-    }).injectMembers(test);
+    Class<? extends Object> c = test.getClass();
+    set(test, c, "port", port);
+    set(test, c, "securePort", securePort);
 
     return test;
   }
 
+  @SuppressWarnings("rawtypes")
+  private void set(final Object test, final Class clazz, final String field, final Object value)
+      throws Exception {
+    try {
+      Field f = clazz.getDeclaredField(field);
+      f.setAccessible(true);
+      f.set(test, value);
+    } catch (NoSuchFieldException ex) {
+      Class superclass = clazz.getSuperclass();
+      if (superclass != Object.class) {
+        set(test, superclass, field, value);
+      }
+    }
+
+  }
+
   @Override
   protected Statement withAfterClasses(final Statement statement) {
     Statement next = super.withAfterClasses(statement);
diff --git a/jooby/src/test/java/org/jooby/test/ServerFeature.java b/jooby/src/test/java/org/jooby/test/ServerFeature.java
@@ -4,9 +4,6 @@
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.apache.http.client.utils.URIBuilder;
 import org.jooby.Jooby;
 import org.junit.Before;
@@ -20,12 +17,8 @@ public abstract class ServerFeature extends Jooby {
 
   public static boolean DEBUG = false;
 
-  @Named("port")
-  @Inject
   protected int port;
 
-  @Named("securePort")
-  @Inject
   protected int securePort;
 
   public static String protocol = "http";
diff --git a/jooby/src/test/java/org/jooby/test/SseFeature.java b/jooby/src/test/java/org/jooby/test/SseFeature.java
@@ -5,9 +5,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.jooby.Jooby;
 import org.jooby.MediaType;
 import org.junit.After;
@@ -25,8 +22,6 @@
 @RunWith(JoobySuite.class)
 public abstract class SseFeature extends Jooby {
 
-  @Named("port")
-  @Inject
   private int port;
 
   private AsyncHttpClient client;
