Moved Commands-Groups into packages

Author: JulianFun123

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

@@ -7,6 +7,12 @@
 import org.javawebstack.framework.bind.ModelBindParamTransformer;
 import org.javawebstack.framework.bind.ModelBindTransformer;
 import org.javawebstack.framework.command.*;
+import org.javawebstack.framework.command.crypto.DecryptCommand;
+import org.javawebstack.framework.command.crypto.EncryptCommand;
+import org.javawebstack.framework.command.crypto.HashCommand;
+import org.javawebstack.framework.command.crypto.GenerateKeyCommand;
+import org.javawebstack.framework.command.db.MigrateCommand;
+import org.javawebstack.framework.command.db.SeedCommand;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.framework.module.Module;
 import org.javawebstack.framework.seed.AllSeeder;
@@ -115,13 +121,13 @@ public WebApplication() {
         commandSystem.addCommand("start", new StartCommand());
         commandSystem.addCommand("sh", new ShellCommand());
         commandSystem.addCommand("db", new MultiCommand()
-                .add("migrate", new DBMigrateCommand())
-                .add("seed", new DBSeedCommand())
+                .add("migrate", new MigrateCommand())
+                .add("seed", new SeedCommand())
         );
         commandSystem.addCommand("crypt", new MultiCommand()
-                .add("encrypt", new CryptEncryptCommand())
-                .add("decrypt", new CryptDecryptCommand())
-                .add("hash", new CryptHashCommand())
+                .add("encrypt", new EncryptCommand())
+                .add("decrypt", new DecryptCommand())
+                .add("hash", new HashCommand())
         );
         commandSystem.addCommand("generate", new MultiCommand()
                 .add("key", new GenerateKeyCommand())

…amework/command/CryptDecryptCommand.java …ework/command/crypto/DecryptCommand.javasrc/main/java/org/javawebstack/framework/command/CryptDecryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/DecryptCommand.java src/main/java/org/javawebstack/framework/command/CryptDecryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/DecryptCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.crypto;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class CryptDecryptCommand implements Command {
+public class DecryptCommand implements Command {
 
     @Inject
     Crypt crypt;

…amework/command/CryptEncryptCommand.java …ework/command/crypto/EncryptCommand.javasrc/main/java/org/javawebstack/framework/command/CryptEncryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/EncryptCommand.java src/main/java/org/javawebstack/framework/command/CryptEncryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/EncryptCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.crypto;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class CryptEncryptCommand implements Command {
+public class EncryptCommand implements Command {
 
     @Inject
     Crypt crypt;

…ramework/command/GenerateKeyCommand.java …k/command/crypto/GenerateKeyCommand.javasrc/main/java/org/javawebstack/framework/command/GenerateKeyCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/GenerateKeyCommand.java src/main/java/org/javawebstack/framework/command/GenerateKeyCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/GenerateKeyCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.crypto;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;

…/framework/command/CryptHashCommand.java …ramework/command/crypto/HashCommand.javasrc/main/java/org/javawebstack/framework/command/CryptHashCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/HashCommand.java src/main/java/org/javawebstack/framework/command/CryptHashCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/HashCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.crypto;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class CryptHashCommand implements Command {
+public class HashCommand implements Command {
 
     @Inject
     Crypt crypt;

…/framework/command/DBMigrateCommand.java …framework/command/db/MigrateCommand.javasrc/main/java/org/javawebstack/framework/command/DBMigrateCommand.java renamed to src/main/java/org/javawebstack/framework/command/db/MigrateCommand.java src/main/java/org/javawebstack/framework/command/DBMigrateCommand.java renamed to src/main/java/org/javawebstack/framework/command/db/MigrateCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.db;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;
@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class DBMigrateCommand implements Command {
+public class MigrateCommand implements Command {
 
     @Inject
     private WebApplication app;

…ack/framework/command/DBSeedCommand.java …ck/framework/command/db/SeedCommand.javasrc/main/java/org/javawebstack/framework/command/DBSeedCommand.java renamed to src/main/java/org/javawebstack/framework/command/db/SeedCommand.java src/main/java/org/javawebstack/framework/command/DBSeedCommand.java renamed to src/main/java/org/javawebstack/framework/command/db/SeedCommand.java

@@ -1,4 +1,4 @@
-package org.javawebstack.framework.command;
+package org.javawebstack.framework.command.db;
 
 import org.javawebstack.command.Command;
 import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class DBSeedCommand implements Command {
+public class SeedCommand implements Command {
 
     @Inject
     private WebApplication application;

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

@@ -1,5 +1,6 @@
 package org.javawebstack.framework.config;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import org.javawebstack.framework.util.IO;
 import org.javawebstack.framework.util.Json;
@@ -209,6 +210,17 @@ public boolean isEnabled(String key, boolean defaultValue) {
         return false;
     }
 
+    public String generateEnv(){
+        StringBuilder env = new StringBuilder();
+        Gson escaper = new Gson();
+        config.forEach((key, value) -> {
+            env.append(key)
+               .append("=")
+               .append(escaper.toJson(value)).append("\n");
+        });
+        return env.toString();
+    }
+
     public boolean isEnabled(String key) {
         return isEnabled(key, false);
     }