Merge pull request '1.7.5' (#10) from dev into main

Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/10

3 files changed, 14 insertions, 16 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/DatabaseConnection.java b/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java
index 466bda5..7dd8c01 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/DatabaseConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java b/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java
index e237e71..0f7ce30 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java
@@ -17,17 +17,15 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.configuration.Config;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Statement;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
 public class MySQLConnection implements DatabaseConnection {
 
@@ -37,20 +35,20 @@ public class MySQLConnection implements DatabaseConnection {
 
         HikariConfig config = new HikariConfig();
 
-        Main.getInstance().getLogger().info("Database host: " + databaseHost);
-        Main.getInstance().getLogger().info("Database port: " + databasePort);
-        Main.getInstance().getLogger().info("Database user: " + databaseUser);
+        Main.getInstance().getLogger().info("Database host: " + Config.databaseHost);
+        Main.getInstance().getLogger().info("Database port: " + Config.databasePort);
+        Main.getInstance().getLogger().info("Database user: " + Config.databaseUser);
         Main.getInstance().getLogger().info("Database pass: xxxxxxxxxxx");
-        Main.getInstance().getLogger().info("Database name: " + databaseName);
+        Main.getInstance().getLogger().info("Database name: " + Config.databaseName);
 
 
         config.setDriverClassName(org.mariadb.jdbc.Driver.class.getName());
-        config.setJdbcUrl("jdbc:mariadb://"+databaseHost+":"+databasePort+"/"+databaseName.trim());
+        config.setJdbcUrl("jdbc:mariadb://"+ Config.databaseHost+":"+ Config.databasePort+"/"+ Config.databaseName.trim());
         config.addDataSourceProperty("cachePrepStmts", "true");
         config.addDataSourceProperty("prepStmtCacheSize", "250");
         config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-        config.addDataSourceProperty("user", databaseUser);
-        config.addDataSourceProperty("password",databasePass);
+        config.addDataSourceProperty("user", Config.databaseUser);
+        config.addDataSourceProperty("password", Config.databasePass);
         config.addDataSourceProperty("autoCommit", "true");
         config.setAutoCommit(true);
         config.setMaximumPoolSize(20);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java b/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java
index 1a03106..70a31fd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java
@@ -17,9 +17,9 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.sqlite.SQLiteConfig;
 
 import java.io.File;
@@ -52,7 +52,7 @@ public class SQLiteConnection implements DatabaseConnection {
     public Connection connect() {
         Connection conn = null;
         try {
-            String url = "jdbc:sqlite:"+databaseFile;
+            String url = "jdbc:sqlite:"+databaseFile.getPath();
             conn = DriverManager.getConnection(url, config.toProperties());
         } catch (SQLException e) {
             Main.getInstance().getLogger().severe(e.getMessage());