Merge pull request #140 from ebean-orm/feature/service-load-newConnectionInit

Service Load a (default) NewConnectionInitializer

Author: rbygrave

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

@@ -8,14 +8,25 @@
 final class DSManager {
 
   private static final DataSourceFactory factory = init();
+  private static final NewConnectionInitializer defaultInitializer = initConnectionInitializer();
 
   private static DataSourceFactory init() {
     return ServiceLoader.load(DataSourceFactory.class)
       .findFirst()
       .orElseThrow(() -> new IllegalStateException("No DataSourceFactory, add ebean-datasource to the classpath."));
   }
 
+  private static NewConnectionInitializer initConnectionInitializer() {
+    return ServiceLoader.load(NewConnectionInitializer.class)
+      .findFirst()
+      .orElse(null);
+  }
+
   static DataSourceFactory get() {
     return factory;
   }
+
+  static NewConnectionInitializer defaultInitializer() {
+    return defaultInitializer;
+  }
 }

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

@@ -384,6 +384,11 @@ default DataSourceBuilder listener(DataSourcePoolListener listener) {
    */
   DataSourceBuilder connectionInitializer(NewConnectionInitializer connectionListener);
 
+  /**
+   * Set the default connection initializer to use if not already set.
+   */
+  DataSourceBuilder defaultConnectionInitializer(NewConnectionInitializer defaultInitializer);
+
   /**
    * Set a SQL statement used to test the database is accessible.
    * <p>

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

@@ -489,6 +489,14 @@ public DataSourceBuilder connectionInitializer(NewConnectionInitializer connecti
     return this;
   }
 
+  @Override
+  public DataSourceBuilder defaultConnectionInitializer(NewConnectionInitializer defaultInitializer) {
+    if (connectionInitializer == null && defaultInitializer != null) {
+      connectionInitializer = defaultInitializer;
+    }
+    return this;
+  }
+
   @Override
   public String getHeartbeatSql() {
     return heartbeatSql;

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

@@ -22,6 +22,7 @@ public interface DataSourceFactory {
    * Create the DataSourcePool given the name and configuration.
    */
   static DataSourcePool create(String name, DataSourceConfig config) {
+    config.defaultConnectionInitializer(DSManager.defaultInitializer());
     return DSManager.get().createPool(name, config);
   }
 

ebean-datasource-api/src/main/java/module-info.java

@@ -4,6 +4,7 @@
   requires transitive io.avaje.applog;
 
   uses io.ebean.datasource.DataSourceFactory;
+  uses io.ebean.datasource.NewConnectionInitializer;
 
   exports io.ebean.datasource;
 }