fix #16

greenlaw110 · greenlaw110 · commit 31a554adb773 · 2017-04-19T09:45:49.000+10:00
diff --git a/pom.xml b/pom.xml
@@ -18,6 +18,10 @@
 ********************************************
 *            version history
 ********************************************
+1.1.5
+- #16 NPE when no third party datasource configured
+- update sql-common to 1.0.2
+
 1.1.4
 - update to act-sql-common-1.0.1
 - #14 Ebean Agent loaded twice if there are two ebean db services
@@ -75,8 +79,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <git.url>git@github.com:actframework/act-ebean.git</git.url>
-    <act.version>1.1.1</act.version>
-    <act-sql-common.version>1.0.1</act-sql-common.version>
+    <act.version>1.1.2</act.version>
+    <act-sql-common.version>1.0.2</act-sql-common.version>
     <ebean.version>8.8.1</ebean.version>
     <ebean-agent.version>8.1.1</ebean-agent.version>
     <ebean-agent-loader.version>2.1.2</ebean-agent-loader.version>
diff --git a/src/main/java/act/db/ebean/EbeanService.java b/src/main/java/act/db/ebean/EbeanService.java
@@ -58,15 +58,18 @@ protected boolean supportDdl() {
     }
 
     @Override
-    protected void dataSourceInitialized() {
+    protected void dataSourceProvided(DataSource dataSource) {
         ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, this);
+        ebeanConfig.setDataSource(dataSource);
         app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));
         ebean = EbeanServerFactory.create(ebeanConfig);
     }
 
     @Override
     protected DataSource createDataSource() {
-        // Ebean has set the datasource to config while creating ebean server
+        ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, this);
+        app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));
+        ebean = EbeanServerFactory.create(ebeanConfig);
         return ebeanConfig.getDataSource();
     }
 
diff --git a/src/main/java/act/db/ebean/util/EbeanConfigAdaptor.java b/src/main/java/act/db/ebean/util/EbeanConfigAdaptor.java
@@ -9,7 +9,6 @@
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.inject.Singleton;
-import javax.sql.DataSource;
 import java.util.Properties;
 import java.util.Set;
 
@@ -25,12 +24,7 @@ public ServerConfig adaptFrom(SqlDbServiceConfig actConfig, SqlDbService svc) {
         ServerConfig config = new ServerConfig();
 
         config.setName(svc.id());
-        DataSource dataSource = svc.dataSource();
-        if (null == dataSource) {
-            config.setDataSourceConfig(adaptFrom(actConfig.dataSourceConfig, svc));
-        } else {
-            config.setDataSource(svc.dataSource());
-        }
+        config.setDataSourceConfig(adaptFrom(actConfig.dataSourceConfig, svc));
 
         config.setDdlGenerate(actConfig.ddlGeneratorConfig.create);
         config.setDdlRun(actConfig.ddlGeneratorConfig.create);

Original file line number	Diff line number	Diff line change
`@@ -58,15 +58,18 @@ protected boolean supportDdl() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- protected void dataSourceInitialized() {`
	`61`	`+ protected void dataSourceProvided(DataSource dataSource) {`
`62`	`62`	`ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, this);`
	`63`	`+ ebeanConfig.setDataSource(dataSource);`
`63`	`64`	`app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));`
`64`	`65`	`ebean = EbeanServerFactory.create(ebeanConfig);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Override`
`68`	`69`	`protected DataSource createDataSource() {`
`69`		`- // Ebean has set the datasource to config while creating ebean server`
	`70`	`+ ebeanConfig = new EbeanConfigAdaptor().adaptFrom(this.config, this);`
	`71`	`+ app().eventBus().trigger(new EbeanConfigLoaded(ebeanConfig));`
	`72`	`+ ebean = EbeanServerFactory.create(ebeanConfig);`
`70`	`73`	`return ebeanConfig.getDataSource();`
`71`	`74`	`}`
`72`	`75`