pool as parameter

Author: nPraml

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourcePoolListener.java

@@ -17,34 +17,50 @@ public interface DataSourcePoolListener {
   /**
    * Called before a connection has been created
    */
-  default void onBeforeCreateConnection() {}
+  default void onBeforeCreateConnection(DataSourcePool pool) {}
 
   /**
    * Called after a connection has been created
    */
-  default void onAfterCreateConnection(Connection connection) {}
+  default void onAfterCreateConnection(DataSourcePool pool, Connection connection) {}
 
   /**
    * Called before a connection has been retrieved from the connection pool
    */
-  default void onBeforeBorrowConnection() {}
+  default void onBeforeBorrowConnection(DataSourcePool pool) {}
 
   /**
    * Called after a connection has been retrieved from the connection pool
    */
+  default void onAfterBorrowConnection(DataSourcePool pool, Connection connection) {onAfterBorrowConnection(connection);}
+
+  /**
+   * Called after a connection has been retrieved from the connection pool.
+   *
+   * Migrate to <code>onAfterBorrowConnection(DataSourcePool pool, Connection connection)</code>
+   */
+  @Deprecated
   default void onAfterBorrowConnection(Connection connection) {}
 
   /**
    * Called before a connection will be put back to the connection pool
    */
+  default void onBeforeReturnConnection(DataSourcePool pool, Connection connection) {onBeforeReturnConnection(connection);}
+
+  /**
+   * Called before a connection will be put back to the connection pool.
+   *
+   * Migrate to <code>onBeforeReturnConnection(DataSourcePool pool, Connection connection)</code>
+   */
+  @Deprecated
   default void onBeforeReturnConnection(Connection connection) {}
 
   /**
    * Called after a connection will be put back to the connection pool
    */
-  default void onAfterReturnConnection() {}
+  default void onAfterReturnConnection(DataSourcePool pool) {}
 
-  default void onBeforeCloseConnection(Connection connection) {}
+  default void onBeforeCloseConnection(DataSourcePool pool, Connection connection) {}
 
-  default void onAfterCloseConnection() {}
+  default void onAfterCloseConnection(DataSourcePool pool) {}
 }

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -450,11 +450,11 @@ private Connection initConnection(Connection conn) throws SQLException {
   private Connection createConnection() throws SQLException {
 
     if (poolListener != null) {
-      poolListener.onBeforeCreateConnection();
+      poolListener.onBeforeCreateConnection(this);
     }
     Connection connection = initConnection(source.getConnection());
     if (poolListener != null) {
-      poolListener.onAfterCreateConnection(connection);
+      poolListener.onAfterCreateConnection(this, connection);
     }
     return connection;
   }
@@ -574,11 +574,11 @@ void removeClosedConnection(PooledConnection pooledConnection) {
    */
   private void returnTheConnection(PooledConnection pooledConnection, boolean forceClose) {
     if (poolListener != null && !forceClose) {
-      poolListener.onBeforeReturnConnection(pooledConnection);
+      poolListener.onBeforeReturnConnection(this, pooledConnection);
     }
     queue.returnPooledConnection(pooledConnection, forceClose);
     if (poolListener != null && !forceClose) {
-      poolListener.onAfterReturnConnection();
+      poolListener.onAfterReturnConnection(this);
     }
   }
 
@@ -590,13 +590,13 @@ void returnConnectionReset(PooledConnection pooledConnection) {
 
   void onBeforeCloseConnection(PooledConnection pooledConnection) {
     if (poolListener != null) {
-      poolListener.onBeforeCloseConnection(pooledConnection);
+      poolListener.onBeforeCloseConnection(this, pooledConnection);
     }
   }
 
   void onAfterCloseConnection() {
     if (poolListener != null) {
-      poolListener.onAfterCloseConnection();
+      poolListener.onAfterCloseConnection(this);
     }
   }
   /**
@@ -638,11 +638,11 @@ private void reset() {
   @Override
   public Connection getConnection(String username, String password) throws SQLException {
     if (poolListener != null) {
-      poolListener.onBeforeCreateConnection();
+      poolListener.onBeforeCreateConnection(this);
     }
     Connection connection = initConnection(source.getConnection(username, password));
     if (poolListener != null) {
-      poolListener.onAfterCreateConnection(connection);
+      poolListener.onAfterCreateConnection(this, connection);
     }
     return connection;
   }
@@ -663,14 +663,14 @@ public Connection getConnection() throws SQLException {
    */
   private PooledConnection getPooledConnection() throws SQLException {
     if (poolListener != null) {
-      poolListener.onBeforeBorrowConnection();
+      poolListener.onBeforeBorrowConnection(this);
     }
     PooledConnection c = queue.obtainConnection();
     if (captureStackTrace) {
       c.setStackTrace(Thread.currentThread().getStackTrace());
     }
     if (poolListener != null) {
-      poolListener.onAfterBorrowConnection(c);
+      poolListener.onAfterBorrowConnection(this, c);
     }
     return c;
   }

ebean-datasource/src/test/java/io/ebean/datasource/test/MultipoolTest.java

@@ -50,8 +50,8 @@ static class PoolManager implements DataSourcePoolListener {
 		Semaphore semaphore = new Semaphore(120);
 		Random random = new Random();
 
-		@Override
-		public void onBeforeCreateConnection() {
+    @Override
+    public void onBeforeCreateConnection(DataSourcePool pool) {
 			try {
 				while (!semaphore.tryAcquire(50, TimeUnit.MILLISECONDS)) {
 					System.out.println("trim required");
@@ -66,7 +66,6 @@ public void onAfterCloseConnection() {
 			semaphore.release();
 		}
 
-
 	}
 
 	private static PoolManager poolManager = new PoolManager();