Move Database config to purely envvars

config.yaml

@@ -155,13 +155,7 @@ worlds:
     why_am_i_recommended: Welcome to Medere!
     channels: 3
 
-
 server:
-    #Database Configuration
-    DB_URL: "jdbc:mysql://localhost:3306/ashes"
-    DB_USER: "root"
-    INIT_CONNECTION_POOL_TIMEOUT: 90    # Seconds
-
     #Login Configuration
     WORLDS: 1                           #Initial number of worlds on the server.
     WLDLIST_SIZE: 21                    #Max possible worlds on the server.

src/main/java/config/ServerConfig.java

@@ -4,13 +4,6 @@
 import java.util.Map;
 
 public class ServerConfig {
-
-    //Database Configuration
-    public String DB_URL;
-    public String DB_USER;
-    public String DB_PASS;
-    public int INIT_CONNECTION_POOL_TIMEOUT;
-
     //Login Configuration
     public int WORLDS;
     public int WLDLIST_SIZE;

src/main/java/config/YamlConfig.java

@@ -1,5 +1,6 @@
 package config;
 
+import database.DatabaseConfig;
 import com.esotericsoftware.yamlbeans.YamlReader;
 
 import java.io.FileNotFoundException;
@@ -16,6 +17,7 @@ public class YamlConfig {
 
     public List<WorldConfig> worlds;
     public ServerConfig server;
+	public DatabaseConfig database;
 
     private static YamlConfig loadConfig() {
         try {

src/main/java/database/DatabaseConnection.java

@@ -46,12 +46,11 @@ public static Handle getHandle() {
 	private static HikariConfig getConfig() {
         HikariConfig config = new HikariConfig();
 
-        config.setJdbcUrl(YamlConfig.config.server.DB_URL);
-        config.setUsername(YamlConfig.config.server.DB_USER);
+        config.setJdbcUrl(System.getenv("DB_URL"));
+        config.setUsername(System.getenv("DB_USER");
         config.setPassword(System.getenv("DB_PASS"));
 
-        final int initFailTimeoutSeconds = YamlConfig.config.server.INIT_CONNECTION_POOL_TIMEOUT;
-        config.setInitializationFailTimeout(SECONDS.toMillis(initFailTimeoutSeconds));
+        config.setInitializationFailTimeout(SECONDS.toMillis(90));
         config.setConnectionTimeout(SECONDS.toMillis(30)); // Hikari default
         config.setMaximumPoolSize(10); // Hikari default