🐛 Help preserve old config options

Matt-MX · Sep 18, 2024 · 528c2a5 · 528c2a5
1 parent 5dc9c6b
commit 528c2a5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/com/mattmx/reconnect/ReconnectConfig.java b/src/main/java/com/mattmx/reconnect/ReconnectConfig.java
@@ -68,11 +68,11 @@ public static class StorageOptionsData {
             Advanced connection pool settings. Most users will not need to change these.
             https://github.com/brettwooldridge/HikariCP/blob/dev/README.md#gear-configuration-knobs-baby
             """)
-        public AdvancedConnectionOptions connectionOptions = new AdvancedConnectionOptions();
+        public AdvancedConnectionParams connectionParameters = new AdvancedConnectionParams();
     }
 
     @ConfigSerializable
-    public static class AdvancedConnectionOptions {
+    public static class AdvancedConnectionParams {
         public boolean useJdbcString = false;
         public String jdbcString = "jdbc:mysql://localhost:3306/db";
         public long connectionTimeout = 30000;

diff --git a/src/main/java/com/mattmx/reconnect/storage/MariaDbStorage.java b/src/main/java/com/mattmx/reconnect/storage/MariaDbStorage.java
@@ -19,19 +19,19 @@ public void init() {
 
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setDriverClassName(org.mariadb.jdbc.Driver.class.getName());
-        if (config.storage.data.connectionOptions.useJdbcString) {
-            hikariConfig.setJdbcUrl(config.storage.data.connectionOptions.jdbcString);
+        if (config.storage.data.connectionParameters.useJdbcString) {
+            hikariConfig.setJdbcUrl(config.storage.data.connectionParameters.jdbcString);
         } else {
             hikariConfig.setJdbcUrl("jdbc:mariadb://" + config.storage.data.address + "/" + config.storage.data.database);
         }
         hikariConfig.setUsername(config.storage.data.username);
         hikariConfig.setPassword(config.storage.data.password);
-        hikariConfig.setConnectionTimeout(config.storage.data.connectionOptions.connectionTimeout);
-        hikariConfig.setIdleTimeout(config.storage.data.connectionOptions.idleTimeout);
-        hikariConfig.setKeepaliveTime(config.storage.data.connectionOptions.keepAliveTime);
-        hikariConfig.setMaxLifetime(config.storage.data.connectionOptions.maxLifetime);
-        hikariConfig.setMinimumIdle(config.storage.data.connectionOptions.minimumIdle);
-        hikariConfig.setMaximumPoolSize(config.storage.data.connectionOptions.maximumPoolSize);
+        hikariConfig.setConnectionTimeout(config.storage.data.connectionParameters.connectionTimeout);
+        hikariConfig.setIdleTimeout(config.storage.data.connectionParameters.idleTimeout);
+        hikariConfig.setKeepaliveTime(config.storage.data.connectionParameters.keepAliveTime);
+        hikariConfig.setMaxLifetime(config.storage.data.connectionParameters.maxLifetime);
+        hikariConfig.setMinimumIdle(config.storage.data.connectionParameters.minimumIdle);
+        hikariConfig.setMaximumPoolSize(config.storage.data.connectionParameters.maximumPoolSize);
         hikariConfig.setPoolName("reconnect");
 
         ds = new HikariDataSource(hikariConfig);

diff --git a/src/main/java/com/mattmx/reconnect/storage/MySqlStorage.java b/src/main/java/com/mattmx/reconnect/storage/MySqlStorage.java
@@ -19,19 +19,19 @@ public void init() {
 
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setDriverClassName(org.mariadb.jdbc.Driver.class.getName());
-        if (config.storage.data.connectionOptions.useJdbcString) {
-            hikariConfig.setJdbcUrl(config.storage.data.connectionOptions.jdbcString);
+        if (config.storage.data.connectionParameters.useJdbcString) {
+            hikariConfig.setJdbcUrl(config.storage.data.connectionParameters.jdbcString);
         } else {
             hikariConfig.setJdbcUrl("jdbc:mariadb://" + config.storage.data.address + "/" + config.storage.data.database);
         }
         hikariConfig.setUsername(config.storage.data.username);
         hikariConfig.setPassword(config.storage.data.password);
-        hikariConfig.setConnectionTimeout(config.storage.data.connectionOptions.connectionTimeout);
-        hikariConfig.setIdleTimeout(config.storage.data.connectionOptions.idleTimeout);
-        hikariConfig.setKeepaliveTime(config.storage.data.connectionOptions.keepAliveTime);
-        hikariConfig.setMaxLifetime(config.storage.data.connectionOptions.maxLifetime);
-        hikariConfig.setMinimumIdle(config.storage.data.connectionOptions.minimumIdle);
-        hikariConfig.setMaximumPoolSize(config.storage.data.connectionOptions.maximumPoolSize);
+        hikariConfig.setConnectionTimeout(config.storage.data.connectionParameters.connectionTimeout);
+        hikariConfig.setIdleTimeout(config.storage.data.connectionParameters.idleTimeout);
+        hikariConfig.setKeepaliveTime(config.storage.data.connectionParameters.keepAliveTime);
+        hikariConfig.setMaxLifetime(config.storage.data.connectionParameters.maxLifetime);
+        hikariConfig.setMinimumIdle(config.storage.data.connectionParameters.minimumIdle);
+        hikariConfig.setMaximumPoolSize(config.storage.data.connectionParameters.maximumPoolSize);
         hikariConfig.setPoolName("reconnect");
 
         ds = new HikariDataSource(hikariConfig);