Added command system

Author: JanHolger

pom.xml

@@ -51,6 +51,11 @@
             <artifactId>Command</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>bsh</groupId>
+            <artifactId>bsh</artifactId>
+            <version>2.0b4</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

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

@@ -5,6 +5,8 @@
 import org.javawebstack.command.CommandSystem;
 import org.javawebstack.framework.bind.ModelBindParamTransformer;
 import org.javawebstack.framework.bind.ModelBindTransformer;
+import org.javawebstack.framework.command.ShellCommand;
+import org.javawebstack.framework.command.StartCommand;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.framework.module.Module;
 import org.javawebstack.framework.util.CORSPolicy;
@@ -95,11 +97,8 @@ public WebApplication(){
         modules.forEach(m -> m.setupServer(this, server));
         setupCommands(commandSystem);
         modules.forEach(m -> m.setupCommands(this, commandSystem));
-        commandSystem.addCommand("start", (args, params) -> {
-            server.start();
-            server.join();
-            return CommandResult.success();
-        });
+        commandSystem.addCommand("start", new StartCommand(this));
+        commandSystem.addCommand("sh", new ShellCommand(this));
     }
 
     public WebApplication addModule(Module module){
@@ -153,4 +152,9 @@ public void run(String[] args){
         commandSystem.run(args);
     }
 
+    public void start(){
+        server.start();
+        server.join();
+    }
+
 }

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

@@ -0,0 +1,31 @@
+package org.javawebstack.framework.command;
+
+import bsh.EvalError;
+import bsh.Interpreter;
+import org.javawebstack.command.Command;
+import org.javawebstack.command.CommandResult;
+import org.javawebstack.command.CommandSystem;
+import org.javawebstack.framework.WebApplication;
+import org.javawebstack.orm.ORM;
+
+import java.util.List;
+import java.util.Map;
+
+public class ShellCommand implements Command {
+    private final WebApplication application;
+    public ShellCommand(WebApplication application){
+        this.application = application;
+    }
+    public CommandResult execute(CommandSystem system, List<String> list, Map<String, List<String>> map) {
+        Interpreter interpreter = new Interpreter();
+        try {
+            interpreter.set("app", application);
+            interpreter.getNameSpace().importClass("org.javawebstack.orm.Repo");
+            ORM.getModels().forEach(m -> interpreter.getNameSpace().importClass(m.getName()));
+            interpreter.run();
+        } catch (EvalError error) {
+            return CommandResult.error(error);
+        }
+        return CommandResult.success();
+    }
+}

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

@@ -0,0 +1,24 @@
+package org.javawebstack.framework.command;
+
+import org.javawebstack.command.Command;
+import org.javawebstack.command.CommandResult;
+import org.javawebstack.command.CommandSystem;
+import org.javawebstack.framework.WebApplication;
+
+import java.util.List;
+import java.util.Map;
+
+public class StartCommand implements Command {
+    private final WebApplication application;
+    public StartCommand(WebApplication application){
+        this.application = application;
+    }
+    public CommandResult execute(CommandSystem commandSystem, List<String> list, Map<String, List<String>> map) {
+        try {
+            application.start();
+        }catch (Throwable throwable){
+            return CommandResult.error(throwable);
+        }
+        return CommandResult.success();
+    }
+}