Rename DataSourcePoolNewConnectionListener to NewConnectionInitializer

Rename class and method names only

Author: rbygrave

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

@@ -380,9 +380,9 @@ default DataSourceBuilder listener(DataSourcePoolListener listener) {
   DataSourceBuilder setListener(DataSourcePoolListener listener);
 
   /**
-   * Set the connection listener to use.
+   * Set the connection initializer to use.
    */
-  DataSourceBuilder connectionListener(DataSourcePoolNewConnectionListener connectionListener);
+  DataSourceBuilder connectionInitializer(NewConnectionInitializer connectionListener);
 
   /**
    * Set a SQL statement used to test the database is accessible.
@@ -941,7 +941,7 @@ default String driverClassName() {
     /**
      * Return the new connection listener to use.
      */
-    DataSourcePoolNewConnectionListener getConnectionListener();
+    NewConnectionInitializer getConnectionInitializer();
 
     /**
      * Return a SQL statement used to test the database is accessible.

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

@@ -84,7 +84,7 @@ public class DataSourceConfig implements DataSourceBuilder.Settings {
   private List<String> initSql;
   private DataSourceAlert alert;
   private DataSourcePoolListener listener;
-  private DataSourcePoolNewConnectionListener connectionListener;
+  private NewConnectionInitializer connectionInitializer;
   private Properties clientInfo;
   private String applicationName;
   private boolean shutdownOnJvmExit;
@@ -479,13 +479,13 @@ public DataSourceConfig setListener(DataSourcePoolListener listener) {
   }
 
   @Override
-  public DataSourcePoolNewConnectionListener getConnectionListener() {
-    return connectionListener;
+  public NewConnectionInitializer getConnectionInitializer() {
+    return connectionInitializer;
   }
 
   @Override
-  public DataSourceBuilder connectionListener(DataSourcePoolNewConnectionListener connectionListener) {
-    this.connectionListener= connectionListener;
+  public DataSourceBuilder connectionInitializer(NewConnectionInitializer connectionInitializer) {
+    this.connectionInitializer = connectionInitializer;
     return this;
   }
 

…DataSourcePoolNewConnectionListener.java …datasource/NewConnectionInitializer.javaebean-datasource-api/src/main/java/io/ebean/datasource/DataSourcePoolNewConnectionListener.java renamed to ebean-datasource-api/src/main/java/io/ebean/datasource/NewConnectionInitializer.java ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourcePoolNewConnectionListener.java renamed to ebean-datasource-api/src/main/java/io/ebean/datasource/NewConnectionInitializer.java

@@ -5,18 +5,22 @@
 /**
  * A {@link DataSourcePool} listener which allows you to hook on the create connections process of the pool.
  */
-public interface DataSourcePoolNewConnectionListener {
+public interface NewConnectionInitializer {
 
   /**
    * Called after a connection has been created, before any initialization.
+   *
    * @param connection the created connection
    */
-  default void onCreatedConnection(Connection connection) {}
+  default void preInitialize(Connection connection) {
+  }
 
   /**
    * Called after a connection has been initialized (after onCreatedConnection) and all settings applied.
+   *
    * @param connection the created connection
    */
-  default void onAfterInitialized(Connection connection) {}
+  default void postInitialize(Connection connection) {
+  }
 
 }

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

@@ -46,7 +46,7 @@ interface Heartbeat {
    */
   private final DataSourceAlert notify;
   private final DataSourcePoolListener poolListener;
-  private final DataSourcePoolNewConnectionListener connectionListener;
+  private final NewConnectionInitializer connectionInitializer;
   private final List<String> initSql;
   private final String user;
   private final String schema;
@@ -110,7 +110,7 @@ interface Heartbeat {
     this.name = name;
     this.notify = params.getAlert();
     this.poolListener = params.getListener();
-    this.connectionListener = params.getConnectionListener();
+    this.connectionInitializer = params.getConnectionInitializer();
     this.autoCommit = params.isAutoCommit();
     this.readOnly = params.isReadOnly();
     this.failOnStart = params.isFailOnStart();
@@ -436,8 +436,8 @@ private void testConnection() {
    * Initializes the connection we got from the driver.
    */
   private Connection initConnection(Connection conn) throws SQLException {
-    if (connectionListener != null) {
-      connectionListener.onCreatedConnection(conn);
+    if (connectionInitializer != null) {
+      connectionInitializer.preInitialize(conn);
     }
     conn.setAutoCommit(autoCommit);
     // isolation level is set globally for all connections (at least for H2) and
@@ -475,8 +475,8 @@ private Connection initConnection(Connection conn) throws SQLException {
         }
       }
     }
-    if (connectionListener != null) {
-      connectionListener.onAfterInitialized(conn);
+    if (connectionInitializer != null) {
+      connectionInitializer.postInitialize(conn);
     }
     return conn;
   }

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolNewConnectionListenerTest.java

@@ -1,7 +1,7 @@
 package io.ebean.datasource.pool;
 
 import io.ebean.datasource.DataSourceConfig;
-import io.ebean.datasource.DataSourcePoolNewConnectionListener;
+import io.ebean.datasource.NewConnectionInitializer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -30,17 +30,17 @@ private ConnectionPool createPool() {
     config.setPassword("");
     config.setMinConnections(1);
     config.setMaxConnections(5);
-    config.connectionListener(new DataSourcePoolNewConnectionListener() {
+    config.connectionInitializer(new NewConnectionInitializer() {
       @Override
-      public void onCreatedConnection(Connection connection) {
+      public void preInitialize(Connection connection) {
         synchronized (createdConnections) {
           createdConnections.put(connection, 1 + createdConnections.getOrDefault(connection, 0));
           createdConnections.notifyAll();
         }
       }
 
       @Override
-      public void onAfterInitialized(Connection connection) {
+      public void postInitialize(Connection connection) {
         synchronized (afterConnections) {
           afterConnections.put(connection, 1 + afterConnections.getOrDefault(connection, 0));
           afterConnections.notifyAll();