catch up to act-ebean2-1.1.1

greenlaw110 · greenlaw110 · commit 557900a595d7 · 2017-06-14T21:14:48.000+10:00
diff --git a/pom.xml b/pom.xml
@@ -18,6 +18,9 @@
 ********************************************
 *            version history
 ********************************************
+1.2.1
+* catch up to ebean2-1.1.1
+
 1.2.0
 * catch up to act-1.4.0
 * catch up to act-sql-common to 1.1.0
diff --git a/src/main/java/act/db/ebean/EbeanDao.java b/src/main/java/act/db/ebean/EbeanDao.java
@@ -316,6 +316,10 @@ public EbeanQuery<MODEL_TYPE> createQuery() {
         return q();
     }
 
+    boolean ebeanServerProvided() {
+        return null != ebean;
+    }
+
     private enum R2 {
         betweenProperties() {
             @Override
diff --git a/src/main/java/act/db/ebean/EbeanDaoInjectionListener.java b/src/main/java/act/db/ebean/EbeanDaoInjectionListener.java
@@ -5,12 +5,13 @@
 import act.app.event.AppEventId;
 import act.db.DbService;
 import act.db.di.DaoInjectionListenerBase;
+import act.event.AppEventListenerBase;
 import org.osgl.$;
 import org.osgl.inject.BeanSpec;
 import org.osgl.util.Generics;
-import org.osgl.util.S;
 
 import java.lang.reflect.Type;
+import java.util.EventObject;
 import java.util.List;
 
 public class EbeanDaoInjectionListener extends DaoInjectionListenerBase {
@@ -22,6 +23,10 @@ public Class[] listenTo() {
 
     @Override
     public void onInjection(Object injectee, BeanSpec spec) {
+        final EbeanDao dao = $.cast(injectee);
+        if (dao.ebeanServerProvided()) {
+            return;
+        }
         List<Type> typeParameters = spec.typeParams();
         if (typeParameters.isEmpty()) {
             typeParameters = Generics.typeParamImplementations(spec.rawType(), EbeanDao.class);
@@ -34,14 +39,13 @@ public void onInjection(Object injectee, BeanSpec spec) {
         DbService dbService = App.instance().dbServiceManager().dbService(resolved._2);
         if (dbService instanceof EbeanService) {
             final EbeanService service = $.cast(dbService);
-            final EbeanDao dao = $.cast(injectee);
-            Act.jobManager().on(AppEventId.DB_SVC_LOADED, S.concat(resolved._2, "-ebean-on-dao-injection"), new Runnable() {
+            Act.eventBus().bind(AppEventId.DB_SVC_LOADED, new AppEventListenerBase() {
                 @Override
-                public void run() {
+                public void on(EventObject eventObject) throws Exception {
                     dao.ebean(service.ebean());
                     dao.modelType(resolved._1);
                 }
-            }, true);
+            });
         }
     }
 }
