Removed Injector

Author: JanHolger

pom.xml

@@ -26,11 +26,6 @@
             <artifactId>HTTP-Server</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.6</version>
-        </dependency>
         <dependency>
             <groupId>com.github.javafaker</groupId>
             <artifactId>javafaker</artifactId>

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

@@ -27,7 +27,6 @@ public abstract class WebApplication {
     private Logger logger = Logger.getLogger("WebApp");
     private SQL sql;
     private final HTTPServer server;
-    private final Injector injector;
     private final Faker faker = new Faker();
     private final Config config = new Config();
     private final Crypt crypt;
@@ -38,20 +37,12 @@ public abstract class WebApplication {
     private SQLDriverFactory sqlDriverFactory;
 
     public WebApplication() {
-        injector = new SimpleInjector();
-        injector.setInstance(Injector.class, injector);
-        injector.setInstance(Faker.class, faker);
-        injector.setInstance(Config.class, config);
-        injector.setInstance((Class<WebApplication>) getClass(), this);
-        injector.setInstance(WebApplication.class, this);
-        injector.setInstance(I18N.class, translation);
 
         setupModules();
         modules.forEach(m -> m.beforeSetupConfig(this, config));
         setupConfig(config);
 
         crypt = new Crypt(config.has("crypt.key") ? config.get("crypt.key") : Crypt.generateKey());
-        injector.setInstance(Crypt.class, crypt);
 
         modules.forEach(m -> m.setupConfig(this, config));
         sqlDriverFactory = new SQLDriverFactory(new HashMap<String, String>() {{
@@ -79,15 +70,8 @@ public WebApplication() {
         }
         modelBindParamTransformer = new ModelBindParamTransformer();
 
-        modules.forEach(m -> m.beforeSetupInjection(this, injector));
-        setupInjection(injector);
-        modules.forEach(m -> m.setupInjection(this, injector));
-
         server = new HTTPServer()
                 .port(config.getInt("http.server.port", 80));
-        injector.setInstance(HTTPServer.class, server);
-        server.injector(injector);
-        injector.inject(this);
         server.beforeInterceptor(new CORSPolicy(config.get("http.server.cors", "*")));
         server.beforeInterceptor(new MultipartPolicy(config.get("http.server.tmp", null)));
         if (config.isEnabled("http.server.autoserialization", true))
@@ -143,8 +127,6 @@ public WebApplication setAccessorAttribName(String name) {
     public void addSeeder(String name, Seeder... seeder) {
         if (seeder.length == 0)
             return;
-        for (Seeder seed : seeder)
-            injector.inject(seed);
         if (seeder.length > 1) {
             addSeeder(name, new MergedSeeder(seeder));
             return;
@@ -168,10 +150,6 @@ public HTTPServer getServer() {
         return server;
     }
 
-    public Injector getInjector() {
-        return injector;
-    }
-
     public Faker getFaker() {
         return faker;
     }
@@ -193,9 +171,6 @@ protected void setupModules() {
 
     protected abstract void setupConfig(Config config);
 
-    protected void setupInjection(Injector injector) {
-    }
-
     protected void setupSeeding() {
     }
 

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

@@ -13,9 +13,6 @@ public interface Module {
     default void beforeSetupConfig(WebApplication application, Config config) {
     }
 
-    default void beforeSetupInjection(WebApplication application, Injector injector) {
-    }
-
     default void beforeSetupModels(WebApplication application, SQL sql) throws ORMConfigurationException {
     }
 
@@ -28,9 +25,6 @@ default void beforeSetupSeeding(WebApplication application) {
     default void setupConfig(WebApplication application, Config config) {
     }
 
-    default void setupInjection(WebApplication application, Injector injector) {
-    }
-
     default void setupDriverFactory(WebApplication application, SQLDriverFactory driverFactory) {
     }
 

src/main/java/org/javawebstack/framework/testing/WebFrameworkTest.java

@@ -3,15 +3,13 @@
 import org.javawebstack.framework.WebApplication;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.httpserver.test.HTTPTest;
-import org.javawebstack.injector.Injector;
 
 public abstract class WebFrameworkTest extends HTTPTest {
 
     private WebApplication webApplication;
 
     public WebFrameworkTest(WebApplication webApplication){
         super(webApplication.getServer());
-        webApplication.getInjector().inject(this);
 
         this.webApplication = webApplication;
     }
@@ -20,10 +18,6 @@ public WebApplication getApplication() {
         return webApplication;
     }
 
-    public Injector getInjector(){
-        return webApplication.getInjector();
-    }
-
     public void seed(String name){
         webApplication.getSeeder(name).seed();
     }