Replaced SimpleInjector with Injector to allow custom implementations

Author: JanHolger

src/main/java/org/javawebstack/framework/WebApplication.java

@@ -31,7 +31,7 @@ public abstract class WebApplication {
     private Logger logger = Logger.getLogger("WebApp");
     private final SQL sql;
     private final HTTPServer server;
-    private final SimpleInjector injector;
+    private final Injector injector;
     private final Faker faker = new Faker();
     private final Config config = new Config();
     private final Crypt crypt;
@@ -44,10 +44,9 @@ public abstract class WebApplication {
     public WebApplication(){
         injector = new SimpleInjector();
         injector.setInstance(Injector.class, injector);
-        injector.setInstance(SimpleInjector.class, injector);
         injector.setInstance(Faker.class, faker);
         injector.setInstance(Config.class, config);
-        injector.setInstanceUnsafe(getClass(), this);
+        injector.setInstance((Class<WebApplication>) getClass(), this);
         injector.setInstance(WebApplication.class, this);
         injector.setInstance(CommandSystem.class, commandSystem);
         injector.setInstance(I18N.class, translation);
@@ -192,7 +191,7 @@ public HTTPServer getServer() {
         return server;
     }
 
-    public SimpleInjector getInjector() {
+    public Injector getInjector() {
         return injector;
     }
 
@@ -214,7 +213,7 @@ public I18N getTranslation(){
 
     protected void setupModules(){}
     protected abstract void setupConfig(Config config);
-    protected void setupInjection(SimpleInjector injector){}
+    protected void setupInjection(Injector injector){}
     protected void setupSeeding(){}
     protected abstract void setupModels(SQL sql) throws ORMConfigurationException;
     protected abstract void setupServer(HTTPServer server);

src/main/java/org/javawebstack/framework/module/Module.java

@@ -4,19 +4,19 @@
 import org.javawebstack.framework.WebApplication;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.httpserver.HTTPServer;
-import org.javawebstack.injector.SimpleInjector;
+import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.javawebstack.orm.wrapper.SQL;
 
 public interface Module {
 
     default void beforeSetupConfig(WebApplication application, Config config){}
-    default void beforeSetupInjection(WebApplication application, SimpleInjector injector){}
+    default void beforeSetupInjection(WebApplication application, Injector injector){}
     default void beforeSetupModels(WebApplication application, SQL sql) throws ORMConfigurationException {}
     default void beforeSetupServer(WebApplication application, HTTPServer server){}
     default void beforeSetupSeeding(WebApplication application){}
     default void setupConfig(WebApplication application, Config config){}
-    default void setupInjection(WebApplication application, SimpleInjector injector){}
+    default void setupInjection(WebApplication application, Injector injector){}
     default void setupModels(WebApplication application, SQL sql) throws ORMConfigurationException {}
     default void setupServer(WebApplication application, HTTPServer server){}
     default void setupCommands(WebApplication application, CommandSystem system){}