From 1622dac67f367335da65808445a8727ddb0f1161 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 27 Feb 2023 12:26:43 -0500 Subject: [PATCH] clean: cleanup `openConnection()` --- .../database/types/SQLiteData.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLiteData.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLiteData.java index 38a78abb..1c4928c4 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLiteData.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLiteData.java @@ -107,29 +107,23 @@ public class SQLiteData extends Data { private void openConnection() throws SQLException { - if (connection != null && !connection.isClosed()) { - return; - } - //Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> { + // Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> { + // ... + // }); + // connection = DriverManager.getConnection("jdbc:mysql://" + DatabaseSettings.getHost() + ":" + DatabaseSettings.getPort() + "/" + DatabaseSettings.getDatabase(), setupProperties()); - //close Connection if still active + if (connection != null && !connection.isClosed()) return; + // Close Connection if still active File dataFolder = new File(HMCCosmeticsPlugin.getInstance().getDataFolder(), "database.db"); - //connect to database host + // Connect to database host try { - Class.forName("org.sqlite.JDBC"); - + // Class.forName("org.sqlite.JDBC"); connection = DriverManager.getConnection("jdbc:sqlite:" + dataFolder); - } catch (SQLException e) { System.out.println(e.getMessage()); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); } - - //}); - //connection = DriverManager.getConnection("jdbc:mysql://" + DatabaseSettings.getHost() + ":" + DatabaseSettings.getPort() + "/" + DatabaseSettings.getDatabase(), setupProperties()); } public PreparedStatement preparedStatement(String query) {