Added the command system and multipart policy

Author: JanHolger

pom.xml

@@ -46,6 +46,11 @@
             <artifactId>Graph</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.javawebstack</groupId>
+            <artifactId>Command</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

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

@@ -1,12 +1,15 @@
 package org.javawebstack.framework;
 
 import com.github.javafaker.Faker;
+import org.javawebstack.command.CommandResult;
+import org.javawebstack.command.CommandSystem;
 import org.javawebstack.framework.bind.ModelBindParamTransformer;
 import org.javawebstack.framework.bind.ModelBindTransformer;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.framework.module.Module;
 import org.javawebstack.framework.util.CORSPolicy;
 import org.javawebstack.framework.util.Crypt;
+import org.javawebstack.framework.util.MultipartPolicy;
 import org.javawebstack.httpserver.HTTPServer;
 import org.javawebstack.httpserver.transformer.response.JsonResponseTransformer;
 import org.javawebstack.injector.Injector;
@@ -31,6 +34,7 @@ public abstract class WebApplication {
     private final Crypt crypt;
     private final List<Module> modules = new ArrayList<>();
     private final ModelBindParamTransformer modelBindParamTransformer = new ModelBindParamTransformer();
+    private final CommandSystem commandSystem = new CommandSystem();
 
     public WebApplication(){
         injector = new SimpleInjector();
@@ -81,13 +85,21 @@ public WebApplication(){
         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.json", true))
             server.responseTransformer(new JsonResponseTransformer().ignoreStrings());
         if(sql != null)
             server.routeParamTransformer(modelBindParamTransformer);
         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", (args, params) -> {
+            server.start();
+            server.join();
+            return CommandResult.success();
+        });
     }
 
     public WebApplication addModule(Module module){
@@ -128,15 +140,17 @@ public Crypt getCrypt(){
         return crypt;
     }
 
-    public abstract void setupModules();
-    public abstract void setupConfig(Config config);
-    public abstract void setupInjection(SimpleInjector injector);
-    public abstract void setupModels(SQL sql) throws ORMConfigurationException;
-    public abstract void setupServer(HTTPServer server);
-
-    public void run(){
-        server.start();
-        server.join();
+    protected void setupModules(){}
+    protected abstract void setupConfig(Config config);
+    protected abstract void setupInjection(SimpleInjector injector);
+    protected abstract void setupModels(SQL sql) throws ORMConfigurationException;
+    protected abstract void setupServer(HTTPServer server);
+    protected abstract void setupCommands(CommandSystem system);
+
+    public void run(String[] args){
+        if(args == null)
+            args = new String[]{"start"};
+        commandSystem.run(args);
     }
 
 }

src/main/java/org/javawebstack/framework/config/Config.java

@@ -27,6 +27,8 @@ public Config(){
             put("HTTP_SERVER_PORT", "http.server.port");
             put("HTTP_SERVER_CORS", "http.server.cors");
             put("HTTP_SERVER_JSON", "http.server.json");
+            put("HTTP_SERVER_TMP", "http.server.tmp");
+            put("CRYPT_KEY", "crypt.key");
         }});
     }
 

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

@@ -1,5 +1,6 @@
 package org.javawebstack.framework.module;
 
+import org.javawebstack.command.CommandSystem;
 import org.javawebstack.framework.WebApplication;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.httpserver.HTTPServer;
@@ -17,5 +18,6 @@ default void setupConfig(WebApplication application, Config config){}
     default void setupInjection(WebApplication application, SimpleInjector injector){}
     default void setupModels(WebApplication application, SQL sql) throws ORMConfigurationException {}
     default void setupServer(WebApplication application, HTTPServer server){}
+    default void setupCommands(WebApplication application, CommandSystem system){}
 
 }

src/main/java/org/javawebstack/framework/util/MultipartPolicy.java

@@ -0,0 +1,20 @@
+package org.javawebstack.framework.util;
+
+import org.javawebstack.httpserver.Exchange;
+import org.javawebstack.httpserver.handler.RequestInterceptor;
+
+public class MultipartPolicy implements RequestInterceptor {
+
+    private final String location;
+
+    public MultipartPolicy(String location){
+        this.location = location;
+    }
+
+    public boolean intercept(Exchange exchange) {
+        if(location != null)
+            exchange.enableMultipart(location);
+        return false;
+    }
+
+}