Refactor to remove abstraction

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -9,8 +9,14 @@
 
 package engine.db.handlers;
 
+import engine.gameManager.DbManager;
 import engine.objects.BuildingLocation;
+import org.pmw.tinylog.Logger;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 
 public class dbBuildingLocationHandler extends dbHandlerBase {
@@ -21,11 +27,23 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
 	}
 
 	public ArrayList<BuildingLocation> LOAD_BUILDING_LOCATIONS() {
-		prepareCallable("select * from static_building_location " +
+
+		ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
+
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("select * from static_building_location " +
 					 "where type = 6 or type = 8 " +
 					 "GROUP BY buildingID, slot " +
-				"ORDER BY buildingID, slot ASC;");
+					 "ORDER BY buildingID, slot ASC;")) {
-		return getObjectList();
+
+			ResultSet rs = preparedStatement.executeQuery();
+			buildingLocations = getObjectsFromRs(rs, 20);
+
+		} catch (SQLException e) {
+			Logger.error(e);
+			return buildingLocations;
 		}
 
+		return buildingLocations;
+	}
 }

src/engine/db/handlers/dbHeightMapHandler.java

@@ -1,8 +1,11 @@
 package engine.db.handlers;
 
 import engine.InterestManagement.HeightMap;
+import engine.gameManager.DbManager;
 import org.pmw.tinylog.Logger;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -16,31 +19,24 @@ public class dbHeightMapHandler extends dbHandlerBase {
     public void LOAD_ALL_HEIGHTMAPS() {
 
         HeightMap thisHeightmap;
-
-		int recordsRead = 0;
-		int worthlessDupes = 0;
-
         HeightMap.heightMapsCreated = 0;
 
-		prepareCallable("SELECT * FROM static_zone_heightmap INNER JOIN static_zone_size ON static_zone_size.loadNum = static_zone_heightmap.zoneLoadID");
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_heightmap INNER JOIN static_zone_size ON static_zone_size.loadNum = static_zone_heightmap.zoneLoadID")) {
 
-		try {
+            ResultSet rs = preparedStatement.executeQuery();
-			ResultSet rs = executeQuery();
 
             while (rs.next()) {
-
-				recordsRead++;
                 thisHeightmap = new HeightMap(rs);
 
                 if (thisHeightmap.getHeightmapImage() == null) {
-					Logger.info( "Imagemap for " + thisHeightmap.getHeightMapID() + " was null");
+                    Logger.info("Imagemap for " + thisHeightmap.getHeightMapID() + " was null");
                     continue;
                 }
             }
+
         } catch (SQLException e) {
-			Logger.error("LoadAllHeightMaps: " + e.getErrorCode() + ' ' + e.getMessage(), e);
+            Logger.error(e);
-		} finally {
-			closeCallable();
         }
     }
 

src/engine/db/handlers/dbItemBaseHandler.java

@@ -9,10 +9,13 @@
 
 package engine.db.handlers;
 
+import engine.gameManager.DbManager;
 import engine.objects.BootySetEntry;
 import engine.objects.ItemBase;
 import org.pmw.tinylog.Logger;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -26,23 +29,20 @@ public class dbItemBaseHandler extends dbHandlerBase {
 
 	public void LOAD_BAKEDINSTATS(ItemBase itemBase) {
 
-		try {
+		try (Connection connection = DbManager.getConnection();
-			prepareCallable("SELECT * FROM `static_item_bakedinstat` WHERE `itemID` = ?");
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_bakedinstat` WHERE `itemID` = ?")) {
-			setInt(1, itemBase.getUUID());
 
-			ResultSet rs = executeQuery();
+			preparedStatement.setInt(1, itemBase.getUUID());
+			ResultSet rs = preparedStatement.executeQuery();
 
 			while (rs.next()) {
-
 				if (rs.getBoolean("fromUse"))
 					itemBase.getUsedStats().put(rs.getInt("token"), rs.getInt("numTrains"));
 				else
 					itemBase.getBakedInStats().put(rs.getInt("token"), rs.getInt("numTrains"));
 			}
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			Logger.error(e);
-		} finally {
-			closeCallable();
 		}
 	}
 
@@ -50,27 +50,24 @@ public class dbItemBaseHandler extends dbHandlerBase {
 
 		ArrayList<Integer> tempList = new ArrayList<>();
 		ArrayList<Integer> tempListOff = new ArrayList<>();
-		try {
-			prepareCallable("SELECT * FROM `static_itembase_animations` WHERE `itemBaseUUID` = ?");
-			setInt(1, itemBase.getUUID());
 
-			ResultSet rs = executeQuery();
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_itembase_animations` WHERE `itemBaseUUID` = ?")) {
+
+			preparedStatement.setInt(1, itemBase.getUUID());
+			ResultSet rs = preparedStatement.executeQuery();
 
 			while (rs.next()) {
 				int animation = rs.getInt("animation");
-
 				boolean rightHand = rs.getBoolean("rightHand");
 
 				if (rightHand)
 					tempList.add(animation);
 				else
 					tempListOff.add(animation);
-
 			}
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			Logger.error(e);
-		} finally {
-			closeCallable();
 		}
 
 		itemBase.setAnimations(tempList);
@@ -80,31 +77,24 @@ public class dbItemBaseHandler extends dbHandlerBase {
 	public void LOAD_ALL_ITEMBASES() {
 
 		ItemBase itemBase;
-
 		int recordsRead = 0;
 
-		prepareCallable("SELECT * FROM static_itembase");
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_itembase")) {
 
-		try {
+			ResultSet rs = preparedStatement.executeQuery();
-			ResultSet rs = executeQuery();
 
 			while (rs.next()) {
-
 				recordsRead++;
 				itemBase = new ItemBase(rs);
-
-				// Add ItemBase to internal cache
-
 				ItemBase.addToCache(itemBase);
 			}
 
-			Logger.info( "read: " + recordsRead + "cached: " + ItemBase.getUUIDCache().size());
-
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			Logger.error(e);
-		} finally {
-			closeCallable();
 		}
+
+		Logger.info("read: " + recordsRead + "cached: " + ItemBase.getUUIDCache().size());
 	}
 
 	public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {
@@ -114,10 +104,10 @@ public class dbItemBaseHandler extends dbHandlerBase {
 		int runeBaseID;
 		int recordsRead = 0;
 
-		prepareCallable("SELECT * FROM static_npc_runeSet");
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_runeSet")) {
 
-		try {
+			ResultSet rs = preparedStatement.executeQuery();
-			ResultSet rs = executeQuery();
 
 			while (rs.next()) {
 
@@ -126,25 +116,23 @@ public class dbItemBaseHandler extends dbHandlerBase {
 				runeSetID = rs.getInt("runeSet");
 				runeBaseID = rs.getInt("runeBase");
 
-				if (runeSets.get(runeSetID) == null){
+				if (runeSets.get(runeSetID) == null) {
 					ArrayList<Integer> runeList = new ArrayList<>();
 					runeList.add(runeBaseID);
 					runeSets.put(runeSetID, runeList);
-				}
+				} else {
-				else{
+					ArrayList<Integer> runeList = runeSets.get(runeSetID);
-					ArrayList<Integer>runeList = runeSets.get(runeSetID);
 					runeList.add(runeSetID);
 					runeSets.put(runeSetID, runeList);
 				}
 			}
 
-			Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
-
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			Logger.error(e);
-		} finally {
+			return runeSets;
-			closeCallable();
 		}
+
+		Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
 		return runeSets;
 	}
 
@@ -153,13 +141,12 @@ public class dbItemBaseHandler extends dbHandlerBase {
 		HashMap<Integer, ArrayList<BootySetEntry>> bootySets = new HashMap<>();
 		BootySetEntry bootySetEntry;
 		int bootySetID;
-
 		int recordsRead = 0;
 
-		prepareCallable("SELECT * FROM static_npc_bootySet");
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_bootySet")) {
 
-		try {
+			ResultSet rs = preparedStatement.executeQuery();
-			ResultSet rs = executeQuery();
 
 			while (rs.next()) {
 
@@ -168,25 +155,22 @@ public class dbItemBaseHandler extends dbHandlerBase {
 				bootySetID = rs.getInt("bootySet");
 				bootySetEntry = new BootySetEntry(rs);
 
-				if (bootySets.get(bootySetID) == null){
+				if (bootySets.get(bootySetID) == null) {
 					ArrayList<BootySetEntry> bootyList = new ArrayList<>();
 					bootyList.add(bootySetEntry);
 					bootySets.put(bootySetID, bootyList);
-				}
+				} else {
-				else{
+					ArrayList<BootySetEntry> bootyList = bootySets.get(bootySetID);
-					ArrayList<BootySetEntry>bootyList = bootySets.get(bootySetID);
 					bootyList.add(bootySetEntry);
 					bootySets.put(bootySetID, bootyList);
 				}
 			}
-
-			Logger.info("read: " + recordsRead + " cached: " + bootySets.size());
-
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			Logger.error(e);
-		} finally {
+			return bootySets;
-			closeCallable();
 		}
+
+		Logger.info("read: " + recordsRead + " cached: " + bootySets.size());
 		return bootySets;
 	}
 }