Enabled injection in commands

Author: JanHolger

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

@@ -46,6 +46,9 @@ public WebApplication(){
         injector.setInstance(Config.class, config);
         injector.setInstanceUnsafe(getClass(), this);
         injector.setInstance(WebApplication.class, this);
+        injector.setInstance(CommandSystem.class, commandSystem);
+        commandSystem.setInjector(injector);
+
         setupModules();
         modules.forEach(m -> m.beforeSetupConfig(this, config));
         setupConfig(config);
@@ -78,9 +81,11 @@ public WebApplication(){
                 ex.printStackTrace();
             }
         }
+
         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);
@@ -95,10 +100,11 @@ public WebApplication(){
         modules.forEach(m -> m.beforeSetupServer(this, server));
         setupServer(server);
         modules.forEach(m -> m.setupServer(this, server));
+
         setupCommands(commandSystem);
         modules.forEach(m -> m.setupCommands(this, commandSystem));
-        commandSystem.addCommand("start", new StartCommand(this));
-        commandSystem.addCommand("sh", new ShellCommand(this));
+        commandSystem.addCommand("start", new StartCommand());
+        commandSystem.addCommand("sh", new ShellCommand());
     }
 
     public WebApplication addModule(Module module){

src/main/java/org/javawebstack/framework/command/ShellCommand.java

@@ -7,17 +7,16 @@
 import org.javawebstack.command.CommandResult;
 import org.javawebstack.command.CommandSystem;
 import org.javawebstack.framework.WebApplication;
+import org.javawebstack.injector.Inject;
 import org.javawebstack.orm.ORM;
 
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
 
 public class ShellCommand implements Command {
-    private final WebApplication application;
-    public ShellCommand(WebApplication application){
-        this.application = application;
-    }
+    @Inject
+    private WebApplication application;
     public CommandResult execute(CommandSystem system, List<String> list, Map<String, List<String>> map) {
         InputStreamReader reader = new InputStreamReader(System.in);
         Interpreter interpreter = new Interpreter();

src/main/java/org/javawebstack/framework/command/StartCommand.java

@@ -4,15 +4,14 @@
 import org.javawebstack.command.CommandResult;
 import org.javawebstack.command.CommandSystem;
 import org.javawebstack.framework.WebApplication;
+import org.javawebstack.injector.Inject;
 
 import java.util.List;
 import java.util.Map;
 
 public class StartCommand implements Command {
-    private final WebApplication application;
-    public StartCommand(WebApplication application){
-        this.application = application;
-    }
+    @Inject
+    private WebApplication application;
     public CommandResult execute(CommandSystem commandSystem, List<String> list, Map<String, List<String>> map) {
         try {
             application.start();