1197 support non-static dependencies

framework/src/play/inject/DefaultBeanSource.java

@@ -0,0 +1,17 @@
+package play.inject;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class DefaultBeanSource implements BeanSource {
+  @Override
+  public <T> T getBeanOfType(Class<T> clazz) {
+    try {
+      Constructor<T> constructor = clazz.getDeclaredConstructor();
+      constructor.setAccessible(true);
+      return constructor.newInstance();
+    } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+      throw new RuntimeException("Cannot instantiate " + clazz, e);
+    }
+  }
+}

framework/src/play/inject/Injector.java

@@ -14,6 +14,24 @@
 
 public class Injector {
 
+    private static BeanSource beanSource = new DefaultBeanSource();
+
+    public static void setBeanSource(BeanSource beanSource) {
+        Injector.beanSource = beanSource;
+    }
+
+    public static <T> T getBeanOfType(String className) {
+        try {
+            return getBeanOfType((Class<T>) Class.forName(className));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Cannot instantiate " + className, e);
+        }
+    }
+
+    public static <T> T getBeanOfType(Class<T> clazz) {
+        return beanSource.getBeanOfType(clazz);
+    }
+
     /**
      * For now, inject beans in controllers and any classes that include @RequireInjection.
      * 

framework/src/play/jobs/JobsPlugin.java

@@ -1,31 +1,27 @@
 package play.jobs;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 import play.Logger;
 import play.Play;
 import play.PlayPlugin;
 import play.exceptions.PlayException;
 import play.exceptions.UnexpectedException;
+import play.inject.Injector;
 import play.libs.CronExpression;
 import play.libs.Expression;
 import play.libs.Time;
 import play.mvc.Http.Request;
 import play.utils.Java;
 import play.utils.PThreadFactory;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.*;
+
 public class JobsPlugin extends PlayPlugin {
 
     public static ScheduledThreadPoolExecutor executor;
@@ -158,7 +154,7 @@ public void afterApplicationStart() {
             if (clazz.isAnnotationPresent(Every.class)) {
                 try {
                     Job job = createJob(clazz);
-                    String value = job.getClass().getAnnotation(Every.class).value();
+                    String value = clazz.getAnnotation(Every.class).value();
                     if (value.startsWith("cron.")) {
                         value = Play.configuration.getProperty(value);
                     }
@@ -174,7 +170,10 @@ public void afterApplicationStart() {
     }
 
     private Job<?> createJob(Class<?> clazz) throws InstantiationException, IllegalAccessException {
-        Job<?> job = (Job<?>) clazz.newInstance();
+        Job<?> job = (Job<?>) Injector.getBeanOfType(clazz);
+        if (!job.getClass().equals(clazz)) {
+            throw new RuntimeException("Enhanced job are not allowed: " + clazz.getName() + " vs. " + job.getClass().getName());
+        }
         scheduledJobs.add(job);
         return job;
     }

framework/src/play/mvc/ActionInvoker.java

@@ -21,6 +21,7 @@
 import play.exceptions.JavaExecutionException;
 import play.exceptions.PlayException;
 import play.exceptions.UnexpectedException;
+import play.inject.Injector;
 import play.mvc.Http.Request;
 import play.mvc.Router.Route;
 import play.mvc.results.NoResult;
@@ -445,7 +446,7 @@ public static Object invokeControllerMethod(Method method, Object[] forceArgs) t
         Http.Request request = Http.Request.current();
 
         if (!isStatic && request.controllerInstance == null) {
-            request.controllerInstance = request.controllerClass.newInstance();
+            request.controllerInstance = Injector.getBeanOfType(request.controllerClass);
         }
 
         Object[] args = forceArgs != null ? forceArgs : getActionMethodArgs(method, request.controllerInstance);
@@ -465,7 +466,7 @@ public static Object invokeControllerMethod(Method method, Object[] forceArgs) t
 
         Object methodClassInstance = isStatic ? null :
             (method.getDeclaringClass().isAssignableFrom(request.controllerClass)) ? request.controllerInstance :
-                method.getDeclaringClass().newInstance();
+                Injector.getBeanOfType(method.getDeclaringClass());
 
         return invoke(method, methodClassInstance, args);
     }

framework/src/play/mvc/Scope.java

@@ -10,6 +10,7 @@
 import play.data.validation.Validation;
 import play.exceptions.UnexpectedException;
 import play.i18n.Messages;
+import play.inject.Injector;
 import play.libs.Codec;
 import play.libs.Crypto;
 import play.utils.Utils;
@@ -36,10 +37,13 @@ public class Scope {
 
     private static SessionStore createSessionStore() {
         String sessionStoreClass = Play.configuration.getProperty("application.session.storeClass");
-        if (sessionStoreClass == null) return new CookieSessionStore();
+        if (sessionStoreClass == null) {
+            return Injector.getBeanOfType(CookieSessionStore.class);
+        }
+
         try {
             Logger.info("Storing sessions using " + sessionStoreClass);
-            return (SessionStore) Class.forName(sessionStoreClass).newInstance();
+            return (SessionStore) Injector.getBeanOfType(sessionStoreClass);
         }
         catch (Exception e) {
             throw new UnexpectedException("Cannot create instance of " + sessionStoreClass, e);

framework/src/play/plugins/PluginCollection.java

@@ -18,6 +18,7 @@
 import play.data.binding.RootParamNode;
 import play.db.Model;
 import play.exceptions.UnexpectedException;
+import play.inject.Injector;
 import play.libs.F;
 import play.mvc.Http;
 import play.mvc.Router;
@@ -165,7 +166,7 @@ public void loadPlugins() {
         for (LoadingPluginInfo info : pluginsToLoad) {
             Logger.trace("Loading plugin %s", info.name);
             try {
-                PlayPlugin plugin = (PlayPlugin) Play.classloader.loadClass(info.name).newInstance();
+                PlayPlugin plugin = (PlayPlugin) Injector.getBeanOfType(Play.classloader.loadClass(info.name));
                 plugin.index = info.index;
                 if (addPlugin(plugin)) {
                     Logger.trace("Plugin %s loaded", plugin);
@@ -220,21 +221,8 @@ public void reloadApplicationPlugins() throws Exception {
             // Is this plugin an application-supplied-plugin?
             if (isLoadedByApplicationClassloader(plugin)) {
                 // This plugin is application-supplied - Must reload it
-                String pluginClassName = plugin.getClass().getName();
-                Class pluginClazz = Play.classloader.loadClass(pluginClassName);
-
-                // First look for constructors the old way
-                Constructor<?>[] constructors = pluginClazz.getConstructors();
-
-                if (constructors.length == 0) {
-                    // No constructors in plugin
-                    // using getDeclaredConstructors() instead of
-                    // getConstructors() to make it work for plugins without
-                    // constructor
-                    constructors = pluginClazz.getDeclaredConstructors();
-                }
-
-                PlayPlugin newPlugin = (PlayPlugin) constructors[0].newInstance();
+                Class pluginClazz = Play.classloader.loadClass(plugin.getClass().getName());
+                PlayPlugin newPlugin = (PlayPlugin) Injector.getBeanOfType(pluginClazz);
                 newPlugin.index = plugin.index;
                 // Replace this plugin
                 replacePlugin(plugin, newPlugin);

samples-and-tests/nonstatic-app/.gitignore

@@ -0,0 +1,3 @@
+lib
+modules
+tmp

samples-and-tests/nonstatic-app/app/controllers/Module.java

@@ -0,0 +1,9 @@
+package controllers;
+
+import com.google.inject.AbstractModule;
+
+public class Module extends AbstractModule {
+  @Override
+  protected void configure() {
+  }
+}

samples-and-tests/nonstatic-app/app/jobs/CounterUpdaterJob.java

@@ -0,0 +1,19 @@
+package jobs;
+
+import play.jobs.Every;
+import play.jobs.Job;
+import play.jobs.On;
+import services.Counter;
+
+import javax.inject.Inject;
+
+@Every("1s")
+public class CounterUpdaterJob extends Job<Void> {
+  @Inject
+  private Counter counter;
+
+  @Override
+  public void doJob() {
+    counter.inc("counter.job.every");
+  }
+}

samples-and-tests/nonstatic-app/app/jobs/CounterUpdaterJob2.java

@@ -0,0 +1,19 @@
+package jobs;
+
+import play.jobs.Every;
+import play.jobs.Job;
+import play.jobs.OnApplicationStart;
+import services.Counter;
+
+import javax.inject.Inject;
+
+@OnApplicationStart
+public class CounterUpdaterJob2 extends Job<Void> {
+  @Inject
+  private Counter counter;
+
+  @Override
+  public void doJob() {
+    counter.inc("counter.job.onApplicationStart");
+  }
+}

samples-and-tests/nonstatic-app/app/jobs/CounterUpdaterJob3.java

@@ -0,0 +1,19 @@
+package jobs;
+
+import play.jobs.Job;
+import play.jobs.On;
+import play.jobs.OnApplicationStart;
+import services.Counter;
+
+import javax.inject.Inject;
+
+@On("cron.counterUpdater")
+public class CounterUpdaterJob3 extends Job<Void> {
+  @Inject
+  private Counter counter;
+
+  @Override
+  public void doJob() {
+    counter.inc("counter.job.on");
+  }
+}

samples-and-tests/nonstatic-app/app/plugins/DebugPlugin.java

@@ -0,0 +1,23 @@
+package plugins;
+
+import play.PlayPlugin;
+import play.mvc.Http;
+import play.mvc.Scope;
+import services.Mathematics;
+
+import javax.inject.Inject;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+
+public class DebugPlugin extends PlayPlugin {
+  @Inject private Mathematics mathematics;
+
+  @Override
+  public void beforeActionInvocation(Method actionMethod) {
+    Scope.RenderArgs renderArgs = Scope.RenderArgs.current();
+    Http.Request request = Http.Request.current();
+    renderArgs.put("actionName", request.action);
+    renderArgs.put("actionMethod", actionMethod.getName());
+    renderArgs.put("math", ": SQRT(2)=" + mathematics.sqrt(new BigDecimal(2)));
+  }
+}

samples-and-tests/nonstatic-app/app/services/Counter.java

@@ -0,0 +1,19 @@
+package services;
+
+import javax.inject.Singleton;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Singleton
+public class Counter {
+  private final Map<String, AtomicLong> namedCounters = new HashMap<>();
+
+  public void inc(String name) {
+    namedCounters.computeIfAbsent(name, k -> new AtomicLong()).incrementAndGet();
+  }
+
+  public long get(String name) {
+    return namedCounters.get(name).get();
+  }
+}

samples-and-tests/nonstatic-app/app/services/Mathematics.java

@@ -0,0 +1,11 @@
+package services;
+
+import javax.inject.Singleton;
+import java.math.BigDecimal;
+
+@Singleton
+public class Mathematics {
+  public BigDecimal sqrt(BigDecimal number) {
+    return new BigDecimal(Math.sqrt(number.doubleValue()));
+  }
+}

samples-and-tests/nonstatic-app/conf/application.conf

@@ -238,3 +238,4 @@ mail.smtp=mock
 %test.jpa.ddl=create
 %test.mail.smtp=mock
 
+cron.counterUpdater=*/2 * * * * ?

samples-and-tests/nonstatic-app/conf/dependencies.yml

@@ -2,3 +2,12 @@
 
 require:
     - play
+    - play-codeborne -> guice 1.9
+    - com.google.guava -> guava 23.0
+
+repositories:
+    - codeborne:
+        type: http
+        artifact: https://repo.codeborne.com/play-[module]/[module]-[revision].zip
+        contains:
+            - play-codeborne -> *

samples-and-tests/nonstatic-app/conf/play.plugins

@@ -0,0 +1,2 @@
+500:plugins.DebugPlugin
+1000:play.modules.guice.GuicePlugin

samples-and-tests/nonstatic-app/conf/routes

@@ -3,8 +3,8 @@
 # ~~~~
 
 # Home page
-GET     /                                       Application.index
-GET     /hello                                  Application.hello
+GET     /                                       NonstaticHello.index
+GET     /hello                                  NonstaticHello.hello
 
 # Ignore favicon requests
 GET     /favicon.ico                            404