Skip to content

Commit d88625e

Browse files
JulianFun123JulianFun123
committed
Moved Commands-Groups into packages
1 parent f449b92 commit d88625e

8 files changed

Lines changed: 34 additions & 16 deletions

File tree

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
import org.javawebstack.framework.bind.ModelBindParamTransformer;
88
import org.javawebstack.framework.bind.ModelBindTransformer;
99
import org.javawebstack.framework.command.*;
10+
import org.javawebstack.framework.command.crypto.DecryptCommand;
11+
import org.javawebstack.framework.command.crypto.EncryptCommand;
12+
import org.javawebstack.framework.command.crypto.HashCommand;
13+
import org.javawebstack.framework.command.crypto.GenerateKeyCommand;
14+
import org.javawebstack.framework.command.db.MigrateCommand;
15+
import org.javawebstack.framework.command.db.SeedCommand;
1016
import org.javawebstack.framework.config.Config;
1117
import org.javawebstack.framework.module.Module;
1218
import org.javawebstack.framework.seed.AllSeeder;
@@ -115,13 +121,13 @@ public WebApplication() {
115121
commandSystem.addCommand("start", new StartCommand());
116122
commandSystem.addCommand("sh", new ShellCommand());
117123
commandSystem.addCommand("db", new MultiCommand()
118-
.add("migrate", new DBMigrateCommand())
119-
.add("seed", new DBSeedCommand())
124+
.add("migrate", new MigrateCommand())
125+
.add("seed", new SeedCommand())
120126
);
121127
commandSystem.addCommand("crypt", new MultiCommand()
122-
.add("encrypt", new CryptEncryptCommand())
123-
.add("decrypt", new CryptDecryptCommand())
124-
.add("hash", new CryptHashCommand())
128+
.add("encrypt", new EncryptCommand())
129+
.add("decrypt", new DecryptCommand())
130+
.add("hash", new HashCommand())
125131
);
126132
commandSystem.addCommand("generate", new MultiCommand()
127133
.add("key", new GenerateKeyCommand())

src/main/java/org/javawebstack/framework/command/CryptDecryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/DecryptCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.crypto;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12-
public class CryptDecryptCommand implements Command {
12+
public class DecryptCommand implements Command {
1313

1414
@Inject
1515
Crypt crypt;

src/main/java/org/javawebstack/framework/command/CryptEncryptCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/EncryptCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.crypto;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12-
public class CryptEncryptCommand implements Command {
12+
public class EncryptCommand implements Command {
1313

1414
@Inject
1515
Crypt crypt;

src/main/java/org/javawebstack/framework/command/GenerateKeyCommand.java renamed to src/main/java/org/javawebstack/framework/command/crypto/GenerateKeyCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.crypto;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.crypto;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12-
public class CryptHashCommand implements Command {
12+
public class HashCommand implements Command {
1313

1414
@Inject
1515
Crypt crypt;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.db;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;
@@ -10,7 +10,7 @@
1010
import java.util.List;
1111
import java.util.Map;
1212

13-
public class DBMigrateCommand implements Command {
13+
public class MigrateCommand implements Command {
1414

1515
@Inject
1616
private WebApplication app;

src/main/java/org/javawebstack/framework/command/DBSeedCommand.java renamed to src/main/java/org/javawebstack/framework/command/db/SeedCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.framework.command;
1+
package org.javawebstack.framework.command.db;
22

33
import org.javawebstack.command.Command;
44
import org.javawebstack.command.CommandResult;
@@ -9,7 +9,7 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12-
public class DBSeedCommand implements Command {
12+
public class SeedCommand implements Command {
1313

1414
@Inject
1515
private WebApplication application;

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.javawebstack.framework.config;
22

3+
import com.google.gson.Gson;
34
import com.google.gson.JsonElement;
45
import org.javawebstack.framework.util.IO;
56
import org.javawebstack.framework.util.Json;
@@ -209,6 +210,17 @@ public boolean isEnabled(String key, boolean defaultValue) {
209210
return false;
210211
}
211212

213+
public String generateEnv(){
214+
StringBuilder env = new StringBuilder();
215+
Gson escaper = new Gson();
216+
config.forEach((key, value) -> {
217+
env.append(key)
218+
.append("=")
219+
.append(escaper.toJson(value)).append("\n");
220+
});
221+
return env.toString();
222+
}
223+
212224
public boolean isEnabled(String key) {
213225
return isEnabled(key, false);
214226
}

0 commit comments

Comments
 (0)