reworked connection pooling (this should fix the failed tests)

adding boneCP dependency

build.gradle

@@ -80,6 +80,7 @@ dependencies {
 	compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.3.0'
 	compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.3.0'
 	compile group: 'com.google.code.findbugs', name: 'annotations', version: '2.0.3'
+	compile group: 'com.jolbox', name: 'bonecp', version: '0.8.0.RELEASE'
 	compile group: 'com.tngtech.java', name: 'config-builder', version: '1.1'
 	compile(group: 'org.postgis', name: 'postgis-jdbc', version:'1.3+') {
 		exclude(module: 'postgis-stubs')

src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java

@@ -45,7 +45,7 @@ public final class ConfigIsochrone {
 	@PropertyValue("db.batchSize")
 	private Integer batchSize;
 
-	@DefaultValue(value = "true")
+	@DefaultValue(value = "false")
 	@PropertyValue("db.pooling")
 	private Boolean pooling;
 
@@ -137,7 +137,8 @@ public final class ConfigIsochrone {
 	}
 
 	public int getMaxConnections() {
-		// TODO: This is not used (mail to t.gummerer and j.gamper)
+		// TODO: This was not used (mail to t.gummerer and j.gamper)
+		// Usage was implemented by n.krismer using bonecp
 		return maxConnections;
 	}
 
@@ -153,7 +154,7 @@ public final class ConfigIsochrone {
 		LOGGER.debug(" - isPooling: " + pooling);
 
 		try {
-			factory = new ConnectionFactory(pooling);
+			factory = new ConnectionFactory(pooling, maxConnections);
 			factory.register(host, database, port, user, password);
 		} catch (final SQLException e) {
 			throw new RuntimeException("Unable to connect to the database: " + e);

src/main/java/it/unibz/inf/isochrone/db/ConnectionFactory.java

@@ -4,27 +4,30 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import javax.sql.PooledConnection;
-
-import org.postgresql.ds.PGConnectionPoolDataSource;
+import com.jolbox.bonecp.BoneCP;
+import com.jolbox.bonecp.BoneCPConfig;
 
 /**
- * Used for connecting to the PostgreSQL server and get connections
- * from a connection pool if pooling is enabled.
- *
- * <p>The <code>ConnectionFactory</code> class</p>
- * <p>Copyright: 2006 - 2009 <a href="http://www.inf.unibz.it/dis">Dis Research Group</a></p>
- * <p> Domenikanerplatz -  Bozen, Italy.</p>
+ * Used for connecting to the database server and for getting connections
+ * from a connection pool (if pooling is enabled in the config file).
  *
- * @author Markus Innerebner
- * @version 2.2
+ * @author Nikolaus Krismer
+ * @version 3
  */
 public class ConnectionFactory {
-	private boolean pooling = false;
-	private PooledConnection connectionPool;
+	private static final int MIN_CONNECTIONS = 5;
 	private Connection connection;
+	private BoneCP connectionPool;
+	private final int maxConnections;
+	private final boolean pooling;
+
+	public ConnectionFactory() {
+		this.maxConnections = 1;
+		this.pooling = false;
+	}
 
-	public ConnectionFactory(final boolean pooling) {
+	public ConnectionFactory(final boolean pooling, final int maxConnections) {
+		this.maxConnections = maxConnections;
 		this.pooling = pooling;
 	}
 
@@ -38,18 +41,20 @@ public class ConnectionFactory {
 	 * @param passwd The password for the database
 	 */
 	public void register(final String serverName, final String database, final int port, final String user, final String passwd) throws SQLException, ClassNotFoundException {
+		final String url = "jdbc:postgresql://" + serverName + ":" + port + "/" + database + "?binaryTransfer=true";
+		Class.forName("org.postgresql.Driver"); // load the driver
+
 		if (pooling) {
-			final PGConnectionPoolDataSource pds = new PGConnectionPoolDataSource();
-			pds.setServerName(serverName);
-			pds.setDatabaseName(database);
-			pds.setPortNumber(port);
-			pds.setUser(user);
-			pds.setPassword(passwd);
-			connectionPool = pds.getPooledConnection();
+			final BoneCPConfig config = new BoneCPConfig();
+			config.setDefaultAutoCommit(false);
+			config.setUser(user);
+			config.setPassword(passwd);
+			config.setJdbcUrl(url);
+			config.setMinConnectionsPerPartition(Math.min(MIN_CONNECTIONS, maxConnections));
+			config.setMaxConnectionsPerPartition(maxConnections);
+			config.setPartitionCount(1);
+			connectionPool = new BoneCP(config);
 		} else {
-			Class.forName("org.postgresql.Driver"); // load the driver
-
-			final String url = "jdbc:postgresql://" + serverName + ":" + port + "/" + database + "?binaryTransfer=true";
 			connection = DriverManager.getConnection(url, user, passwd);
 			connection.setAutoCommit(false);
 		}
@@ -62,9 +67,7 @@ public class ConnectionFactory {
 	 */
 	public Connection getConnection() throws SQLException {
 		if (pooling) {
-			final Connection conn = connectionPool.getConnection();
-			conn.setAutoCommit(false);
-			return conn;
+			return connectionPool.getConnection();
 		}
 
 		return connection;

src/main/java/it/unibz/inf/isochrone/db/Database.java

@@ -36,8 +36,6 @@ import org.apache.commons.dbutils.DbUtils;
  * <br />
  * Domenikanerplatz - Bozen, Italy.
  * </p>
- * <p>
- * </p>
  *
  * @author Markus Innerebner
  * @version 2.2

src/main/resources/config.xml

@@ -3,6 +3,8 @@
 <properties>
 	<!-- Global database settings -->
 	<entry key="db.maxConnections">50</entry>
+	<entry key="db.pooling">false</entry>
+
 	<!-- Postgres database -->
 	<entry key="org.postgresql.servername">localhost</entry>
 	<entry key="org.postgresql.database">isochrone</entry>

src/test/java/it/unibz/inf/isochrone/network/ComparisonTest.java

@@ -30,16 +30,12 @@ public class ComparisonTest {
 		final Query queryDijkstra = new Query(Direction.INCOMING, WALKING_SPEED, DURATION, TIME, false, Mode.MULTIMODAL);
 		queryDijkstra.setNodes(NODE_ID);
 		final Isochrone mDijkstra = new MDijkstra(config, queryDijkstra);
-		MemoryOutput outDijkstra = new MemoryOutput();
-		outDijkstra = mDijkstra.compute(outDijkstra);
 
 		final Query queryMinex = new Query(Direction.INCOMING, WALKING_SPEED, DURATION, TIME, true, Mode.MULTIMODAL);
 		queryMinex.setNodes(NODE_ID);
 		final Isochrone mineX = new MineX(config, queryMinex);
-		MemoryOutput outMineX = new MemoryOutput();
-		outMineX = mineX.compute(outMineX);
 
-		Assert.assertEquals(outDijkstra.getLinks(), outMineX.getLinks(), "Dijkstra != MineX");
+		Assert.assertEquals(mDijkstra.compute().getLinks(), mineX.compute().getLinks(), "Dijkstra != MineX");
 	}
 
 	@Test