MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Refactored to remove abstraction.

Browse Source
This commit is contained in:
MagicBot
2023-05-20 19:09:28 -04:00
parent 7e511f590d
commit 4daee03f0d
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/db/handlers/dbAccountHandler.java
+3 -3
View File
@@ -196,11 +196,11 @@ public class dbAccountHandler extends dbHandlerBase {
return this.GET_ACCOUNT(Account.AccountsMap.get(uname)); return this.GET_ACCOUNT(Account.AccountsMap.get(uname));
try (Connection connection = DbManager.getConnection(); try (Connection connection = DbManager.getConnection();
PreparedStatement accountQuery = connection.prepareStatement("SELECT * FROM `obj_account` WHERE `acct_uname`=?")) { PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `obj_account` WHERE `acct_uname`=?")) {
accountQuery.setString(1, uname); preparedStatement.setString(1, uname);
ResultSet rs = accountQuery.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
account = (Account) getObjectFromRs(rs); account = (Account) getObjectFromRs(rs);
} catch (SQLException e) { } catch (SQLException e) {
src/engine/db/handlers/dbBlueprintHandler.java
+15 -16
View File
@@ -1,8 +1,11 @@
package engine.db.handlers; package engine.db.handlers;
import engine.gameManager.DbManager;
import engine.objects.Blueprint; import engine.objects.Blueprint;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
@@ -22,10 +25,10 @@ public class dbBlueprintHandler extends dbHandlerBase {
int doorNum; int doorNum;
int recordsRead = 0; int recordsRead = 0;
prepareCallable("SELECT * FROM static_building_doors ORDER BY doorMeshUUID ASC"); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_building_doors ORDER BY doorMeshUUID ASC")) {
try { ResultSet rs = preparedStatement.executeQuery();
ResultSet rs = executeQuery();
while (rs.next()) { while (rs.next()) {
@@ -35,13 +38,11 @@ public class dbBlueprintHandler extends dbHandlerBase {
doorInfo.put(doorUUID, doorNum); doorInfo.put(doorUUID, doorNum);
} }
Logger.info( "read: " + recordsRead + " cached: " + doorInfo.size());
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("LoadAllDoorNumbers: " + e.getErrorCode() + ' ' + e.getMessage(), e); Logger.error(e);
} finally {
closeCallable();
} }
Logger.info("read: " + recordsRead + " cached: " + doorInfo.size());
return doorInfo; return doorInfo;
} }
@@ -53,10 +54,10 @@ public class dbBlueprintHandler extends dbHandlerBase {
blueprints = new HashMap<>(); blueprints = new HashMap<>();
int recordsRead = 0; int recordsRead = 0;
prepareCallable("SELECT * FROM static_building_blueprint"); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `obj_account` WHERE `acct_uname`=?")) {
try { ResultSet rs = preparedStatement.executeQuery();
ResultSet rs = executeQuery();
while (rs.next()) { while (rs.next()) {
@@ -74,13 +75,11 @@ public class dbBlueprintHandler extends dbHandlerBase {
} }
Logger.info( "read: " + recordsRead + " cached: " + blueprints.size());
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("LoadAllBlueprints: " + e.getErrorCode() + ' ' + e.getMessage(), e); Logger.error(e);
} finally {
closeCallable();
} }
Logger.info("read: " + recordsRead + " cached: " + blueprints.size());
return blueprints; return blueprints;
} }
} }