Added AutoMigrateCommand and SeedCommand

Author: JulianFun123

.gitignore

@@ -3,4 +3,7 @@
 target
 
 # IntelliJ Linux bug
-.fuse_*
+.fuse_*
+
+
+localtest.java

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

@@ -4,7 +4,9 @@
 import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.framework.bind.ModelBindParamTransformer;
 import org.javawebstack.framework.bind.ModelBindTransformer;
+import org.javawebstack.framework.commands.AutoMigrateCommand;
 import org.javawebstack.framework.commands.HelpCommand;
+import org.javawebstack.framework.commands.SeedCommand;
 import org.javawebstack.framework.commands.StartWebServerCommand;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.framework.module.Module;
@@ -21,10 +23,7 @@
 import picocli.CommandLine;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Reader;
 import java.util.*;
-import java.util.concurrent.Callable;
 import java.util.logging.Logger;
 
 public abstract class WebApplication {
@@ -170,24 +169,30 @@ public I18N getTranslation() {
         return translation;
     }
 
-    protected void setupModules() { }
+    protected void setupModules() {
+    }
 
     protected abstract void setupConfig(Config config);
 
-    protected void setupSeeding() { }
+    protected void setupSeeding() {
+    }
 
-    void setupCommands(CommandLine commandLine) { }
+    void setupCommands(CommandLine commandLine) {
+    }
 
     protected abstract void setupModels(SQL sql) throws ORMConfigurationException;
 
     protected abstract void setupServer(HTTPServer server);
 
-    public void run(String[] args){
-        HelpCommand help  = new HelpCommand();
+    public void run(String[] args) {
+        HelpCommand help = new HelpCommand();
 
         CommandLine commandLine = new CommandLine(help);
         help.setCommandLine(commandLine);
         commandLine.addSubcommand(new StartWebServerCommand(this));
+        commandLine.addSubcommand(new SeedCommand(this));
+        commandLine.addSubcommand(new AutoMigrateCommand(this));
+
         modules.forEach(module -> module.setupCommands(this, commandLine));
         setupCommands(commandLine);
 

src/main/java/org/javawebstack/framework/bind/ModelBindParamTransformer.java

@@ -18,15 +18,15 @@ public ModelBindParamTransformer() {
         super();
         this.transformer = (exchange, repo, fieldName, source) -> {
             Map<Class<? extends Model>, Map<Object, Object>> cache = exchange.attrib("__modelbindcache__");
-            if(cache == null) {
+            if (cache == null) {
                 cache = new HashMap<>();
                 exchange.attrib("__modelbindcache__", cache);
             }
-            if(!cache.containsKey(repo.getInfo().getModelClass()))
+            if (!cache.containsKey(repo.getInfo().getModelClass()))
                 cache.put(repo.getInfo().getModelClass(), new HashMap<>());
             Map<Object, Object> modelCache = cache.get(repo.getInfo().getModelClass());
             Object model = modelCache.get(source);
-            if(model == null) {
+            if (model == null) {
                 model = repo.accessible(accessorAttribName == null ? null : exchange.attrib(accessorAttribName)).where(fieldName, source).first();
                 modelCache.put(source, model);
             }

src/main/java/org/javawebstack/framework/commands/AutoMigrateCommand.java

@@ -0,0 +1,25 @@
+package org.javawebstack.framework.commands;
+
+import org.javawebstack.framework.WebApplication;
+import org.javawebstack.orm.ORM;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.util.concurrent.Callable;
+
+@Command(name = "migrate:auto", description = "Migrate your Models automatically")
+public class AutoMigrateCommand implements Callable<Integer> {
+    private WebApplication webApplication;
+
+    @CommandLine.Option(names = {"--fresh", "-f"}, description = "Auto Migrate fresh")
+    public boolean fresh = false;
+
+    public AutoMigrateCommand(WebApplication webApplication) {
+        this.webApplication = webApplication;
+    }
+
+    public Integer call() {
+        ORM.autoMigrate(fresh);
+        return 0;
+    }
+}

src/main/java/org/javawebstack/framework/commands/HelpCommand.java

@@ -15,12 +15,12 @@ public void setCommandLine(CommandLine commandLine) {
         this.commandLine = commandLine;
     }
 
-    public HelpCommand(){
+    public HelpCommand() {
     }
 
-    private void printCommands(CommandLine.Help help, int indent){
-        System.out.println(String.join("",Collections.nCopies(indent, " ")) +help.commandList());
-        help.subcommands().forEach((n, h) -> printCommands(h, indent+4));
+    private void printCommands(CommandLine.Help help, int indent) {
+        System.out.println(String.join("", Collections.nCopies(indent, " ")) + help.commandList());
+        help.subcommands().forEach((n, h) -> printCommands(h, indent + 4));
     }
 
     public Integer call() {

src/main/java/org/javawebstack/framework/commands/SeedCommand.java

@@ -0,0 +1,32 @@
+package org.javawebstack.framework.commands;
+
+import org.javawebstack.framework.WebApplication;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.util.concurrent.Callable;
+
+@Command(name = "seed", description = "Seeding command")
+public class SeedCommand implements Callable<Integer> {
+    private WebApplication webApplication;
+
+    @CommandLine.Parameters(description = "The seeders which are going to be seeded separated by a comma or * for all")
+    private String seeders;
+
+    public SeedCommand(WebApplication webApplication) {
+        this.webApplication = webApplication;
+    }
+
+    public Integer call() {
+        for (String s : seeders.split(",")) {
+            if (s.equals("*")) {
+                webApplication.getSeeders().forEach((s1, seeder) -> {
+                    seeder.seed();
+                });
+            } else {
+                webApplication.getSeeder(s).seed();
+            }
+        }
+        return 0;
+    }
+}

src/main/java/org/javawebstack/framework/commands/StartWebServerCommand.java

@@ -1,26 +1,19 @@
 package org.javawebstack.framework.commands;
 
 import org.javawebstack.framework.WebApplication;
-import picocli.CommandLine.*;
+import picocli.CommandLine.Command;
 
 import java.util.concurrent.Callable;
 
 @Command(name = "start", description = "Starts the WebServer")
 public class StartWebServerCommand implements Callable<Integer> {
     private WebApplication webApplication;
 
-    /*@Option(names = {"--port", "-p"}, description = "Port")
-    private int port;*/
 
-    public StartWebServerCommand(WebApplication webApplication){
+    public StartWebServerCommand(WebApplication webApplication) {
         this.webApplication = webApplication;
     }
 
-    @Command(name = "test")
-    public void asd(){
-
-    }
-
     public Integer call() {
         webApplication.start();
         return 0;

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

@@ -37,6 +37,7 @@ default void setupServer(WebApplication application, HTTPServer server) {
     default void setupSeeding(WebApplication application) {
     }
 
-    default void setupCommands(WebApplication application, CommandLine commandLine) { }
+    default void setupCommands(WebApplication application, CommandLine commandLine) {
+    }
 
 }

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

@@ -8,7 +8,7 @@ public abstract class WebFrameworkTest extends HTTPTest {
 
     private WebApplication webApplication;
 
-    public WebFrameworkTest(WebApplication webApplication){
+    public WebFrameworkTest(WebApplication webApplication) {
         super(webApplication.getServer());
 
         this.webApplication = webApplication;
@@ -18,11 +18,11 @@ public WebApplication getApplication() {
         return webApplication;
     }
 
-    public void seed(String name){
+    public void seed(String name) {
         webApplication.getSeeder(name).seed();
     }
 
-    public Config getConfig(){
+    public Config getConfig() {
         return webApplication.getConfig();
     }
 }

src/main/java/org/javawebstack/framework/utils/Json.java

@@ -4,6 +4,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
 public class Json {
 
     public static Map<String, String> toKeyValueMap(JsonElement element) {