use logger, use try with resources

This commit is contained in:
2023-06-22 16:45:31 +02:00
parent 0290629d27
commit 3919b0f44b
2 changed files with 38 additions and 47 deletions
@@ -38,7 +38,7 @@ public final class PreventStabby extends JavaPlugin {
Util.initData(); Util.initData();
reloadPluginConfig(); reloadPluginConfig();
File dbFile = new File("plugins/PreventStabby"); File dbFile = new File("plugins/PreventStabby");
sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile); sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile, getLogger());
sqLite.createDatabaseFile(); sqLite.createDatabaseFile();
if (!sqLite.testConnection()) { if (!sqLite.testConnection()) {
getLogger().severe("Error with accessing database. Check if server has write rights."); getLogger().severe("Error with accessing database. Check if server has write rights.");
@@ -6,89 +6,80 @@ import me.youhavetrouble.preventstabby.players.PlayerData;
import java.io.File; import java.io.File;
import java.sql.*; import java.sql.*;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Logger;
public class DatabaseSQLite { public class DatabaseSQLite {
private final String url; private final String url;
private final File folder; private final File folder;
private final Logger logger;
public DatabaseSQLite(String url, File folder) { public DatabaseSQLite(String url, File folder, Logger logger) {
this.url = url; this.url = url;
this.folder = folder; this.folder = folder;
this.logger = logger;
} }
public boolean createDatabaseFile() { public void createDatabaseFile() {
this.folder.mkdir(); this.folder.mkdir();
try (Connection conn = DriverManager.getConnection(url)) { try (Connection conn = DriverManager.getConnection(url)) {
if (conn != null) { if (conn == null) return;
DatabaseMetaData meta = conn.getMetaData(); DatabaseMetaData meta = conn.getMetaData();
System.out.println("The driver name is " + meta.getDriverName()); logger.info("The driver name is " + meta.getDriverName());
Statement statement = conn.createStatement(); Statement statement = conn.createStatement();
String sql = "CREATE TABLE IF NOT EXISTS `players` (`player_uuid` varchar(36) UNIQUE PRIMARY KEY, `pvpenabled` boolean);"; String sql = "CREATE TABLE IF NOT EXISTS `players` (`player_uuid` varchar(36) UNIQUE PRIMARY KEY, `pvpenabled` boolean);";
statement.execute(sql); statement.execute(sql);
conn.close(); } catch (SQLException exception) {
exception.printStackTrace();
} }
} catch (SQLException e) {
System.out.println(e.getMessage());
return false;
}
return true;
} }
public boolean testConnection() { public boolean testConnection() {
Connection conn = null; try (Connection conn = DriverManager.getConnection(url)) {
try { logger.info("Connection to SQLite has been established.");
conn = DriverManager.getConnection(url); if (conn != null) return true;
System.out.println("Connection to SQLite has been established."); } catch (SQLException exception) {
if (conn != null) { exception.printStackTrace();
conn.close();
return true;
}
} catch (SQLException e) {
System.out.println(e.getMessage());
} }
return false; return false;
} }
public PlayerData getPlayerInfo(UUID uuid) { public PlayerData getPlayerInfo(UUID uuid) {
try (Connection conn = DriverManager.getConnection(url)) {
try { try {
Connection conn = DriverManager.getConnection(url); PreparedStatement insertnewuser = conn.prepareStatement("INSERT OR IGNORE INTO `players` (player_uuid, pvpenabled) VALUES (?, ?)");
Statement insertnewuser = conn.createStatement(); insertnewuser.setString(1, uuid.toString());
try { insertnewuser.setBoolean(2, PreventStabby.getPlugin().getConfigCache().isPvp_enabled_by_default());
String newuserdata = "INSERT OR IGNORE INTO `players` (player_uuid, pvpenabled) VALUES ('" + uuid.toString() + "', " + PreventStabby.getPlugin().getConfigCache().isPvp_enabled_by_default() + ")"; insertnewuser.executeUpdate();
insertnewuser.execute(newuserdata);
} catch (SQLException e) { } catch (SQLException e) {
if (e.getErrorCode() != 19) { if (e.getErrorCode() != 19) {
e.printStackTrace(); e.printStackTrace();
} }
} }
Statement statement = conn.createStatement(); PreparedStatement statement = conn.prepareStatement("SELECT * FROM `players` WHERE `player_uuid` = ?");
String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid + "';"; statement.setString(1, uuid.toString());
statement.execute(sql); statement.executeQuery();
ResultSet result = statement.getResultSet(); ResultSet result = statement.getResultSet();
boolean state = result.getBoolean("pvpenabled"); boolean state = result.getBoolean("pvpenabled");
conn.close();
return new PlayerData(uuid, state); return new PlayerData(uuid, state);
} catch (SQLException throwables) { } catch (SQLException exception) {
throwables.printStackTrace(); exception.printStackTrace();
} }
return null; return null;
} }
public void updatePlayerInfo(UUID uuid, PlayerData data) { public void updatePlayerInfo(UUID uuid, PlayerData data) {
try (Connection conn = DriverManager.getConnection(url)) {
try { try {
Connection conn = DriverManager.getConnection(url); PreparedStatement insertnewuser = conn.prepareStatement("UPDATE `players` SET pvpenabled = ? WHERE `player_uuid` = ?;");
Statement insertnewuser = conn.createStatement(); insertnewuser.setBoolean(1, data.isPvpEnabled());
try { insertnewuser.setString(2, uuid.toString());
String newuserdata = "UPDATE `players` SET pvpenabled = "+data.isPvpEnabled()+" WHERE `player_uuid` = '"+uuid.toString()+"';"; } catch (SQLException exception) {
insertnewuser.execute(newuserdata); logger.severe("Error while saving player data!");
} catch (SQLException e) { exception.printStackTrace();
PreventStabby.getPlugin().getLogger().severe("Error while saving player data!");
e.printStackTrace();
} }
} catch (SQLException throwables) { } catch (SQLException exception) {
throwables.printStackTrace(); exception.printStackTrace();
} }
} }