Game uses hikaricp for all connection pooling. Connection count set dynamically.

src/engine/gameManager/DbManager.java

@@ -8,11 +8,12 @@
 
 package engine.gameManager;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.db.handlers.*;
 import engine.objects.*;
-import engine.pooling.ConnectionPool;
 import engine.server.MBServerStatics;
 import engine.util.Hasher;
 import org.pmw.tinylog.Logger;
@@ -26,28 +27,14 @@ import java.util.concurrent.ConcurrentHashMap;
 public enum DbManager {
 	DBMANAGER;
 
-	private static ConnectionPool connPool;
+	private static HikariDataSource connectionPool = null;
+
 	public static Hasher hasher;
 
 	//Local Object Caching
 
 	private static final EnumMap<GameObjectType, ConcurrentHashMap<Integer, AbstractGameObject>> objectCache = new EnumMap<>(GameObjectType.class);
 
-	public static boolean configureDatabaseLayer() {
-
-		boolean worked = true;
-
-		try {
-			DbManager.connPool = new ConnectionPool();
-			DbManager.connPool.fill(10);
-			DBMANAGER.hasher = new Hasher();
-		} catch (Exception e ) {
-			e.printStackTrace();
-			worked = false;
-		}
-		return worked;
-	}
-
 	public static AbstractGameObject getObject(GameObjectType objectType, int objectUUID) {
 
 		AbstractGameObject outObject = null;
@@ -87,9 +74,6 @@ public enum DbManager {
 		return outObject;
 	}
 
-	public static int getPoolSize(){
-		return connPool.getPoolSize();
-	}
 
 	public static boolean inCache(GameObjectType gameObjectType, int uuid) {
 
@@ -227,7 +211,7 @@ public enum DbManager {
 	}
 
 	public static PreparedStatement prepareStatement(String sql) throws SQLException {
-		return getConn().prepareStatement(sql, 1);
+		return getConnection().prepareStatement(sql, 1);
 	}
 
 	// Omg refactor this out, somebody!
@@ -259,15 +243,12 @@ public enum DbManager {
 	 * @return the conn
 	 */
 	//XXX I think we have a severe resource leak here! No one is putting the connections back!
-	public static Connection getConn() {
-		Connection conn = DbManager.connPool.get();
+	public static Connection getConnection() {
 		try {
-			if (!conn.isClosed())
-				DbManager.connPool.put(conn);
+			return DbManager.connectionPool.getConnection();
 		} catch (SQLException e) {
-			Logger.error( e.toString());
+			throw new RuntimeException(e);
 		}
-		return conn;
 	}
 
 	public static final dbAccountHandler AccountQueries = new dbAccountHandler();
@@ -312,4 +293,25 @@ public enum DbManager {
 	public static final dbHeightMapHandler HeightMapQueries = new dbHeightMapHandler();
 
 	public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();
+
+	public static void configureConnectionPool() {
+
+		HikariConfig config = new HikariConfig();
+
+		config.setMaximumPoolSize(Runtime.getRuntime().availableProcessors() * 2);
+
+		config.setJdbcUrl("jdbc:mysql://" + ConfigManager.MB_DATABASE_ADDRESS.getValue() +
+				":" + ConfigManager.MB_DATABASE_PORT.getValue() + "/" +
+				ConfigManager.MB_DATABASE_NAME.getValue());
+		config.setUsername(ConfigManager.MB_DATABASE_USER.getValue());
+		config.setPassword(ConfigManager.MB_DATABASE_PASS.getValue());
+		config.addDataSourceProperty("characterEncoding", "utf8");
+		config.addDataSourceProperty("cachePrepStmts", "true");
+		config.addDataSourceProperty("prepStmtCacheSize", "250");
+		config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+
+		connectionPool = new HikariDataSource(config); // setup the connection pool
+
+		Logger.info("Local warehouse database connection configured");
+	}
 }

src/engine/gameManager/SimulationManager.java

@@ -10,7 +10,6 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
-import engine.db.archive.DataWarehouse;
 import engine.objects.AbstractGameObject;
 import engine.objects.City;
 import engine.objects.PlayerCharacter;
@@ -58,7 +57,7 @@ public enum SimulationManager {
 
 		String popString = "";
 
-		try (Connection connection = DataWarehouse.connectionPool.getConnection();
+		try (Connection connection = DbManager.getConnection();
 			 PreparedStatement getPopString = connection.prepareStatement("CALL GET_POPULATION_STRING()");) {
 
 			ResultSet rs = getPopString.executeQuery();