fix actframework#234

greenlaw110 · greenlaw110 · commit 20303647f9b0 · 2017-06-11T23:36:42.000+10:00
diff --git a/pom.xml b/pom.xml
@@ -256,7 +256,7 @@
     <jline.version>2.14.3</jline.version>
     <joda-time.version>2.9.9</joda-time.version>
     <okhttp.version>3.8.0</okhttp.version>
-    <osgl-tool.version>1.1.0</osgl-tool.version>
+    <osgl-tool.version>1.2.0</osgl-tool.version>
     <osgl-genie.version>1.1.2</osgl-genie.version>
     <osgl-mvc.version>1.1.1</osgl-mvc.version>
     <osgl-storage.version>1.2.0</osgl-storage.version>
diff --git a/src/main/java/act/app/App.java b/src/main/java/act/app/App.java
@@ -606,7 +606,7 @@ public synchronized void refresh() {
             emit(DEPENDENCY_INJECTOR_PROVISIONED);
             emit(SINGLETON_PROVISIONED);
             config().preloadConfigurations();
-            jobManager().on(AppEventId.DB_SVC_LOADED, new Runnable() {
+            Runnable runnable = new Runnable() {
                 @Override
                 public void run() {
                     if (null != blockIssueCause) {
@@ -619,7 +619,12 @@ public void run() {
                     LOGGER.info("App[%s] loaded in %sms", name(), $.ms() - ms);
                     emit(POST_START);
                 }
-            }, true);
+            };
+            if (!dbServiceManager().hasDbService() || eventEmitted(DB_SVC_LOADED)) {
+                runnable.run();
+            } else {
+                jobManager().on(DB_SVC_LOADED, runnable, true);
+            }
         } catch (BlockIssueSignal e) {
             // ignore
         }
@@ -1028,7 +1033,7 @@ private void initServiceResourceManager() {
 
     private void clearServiceResourceManager() {
         if (null != appServiceRegistry) {
-            eventBus().emit(STOP);
+            emit(STOP);
             appServiceRegistry.destroy();
             dependencyInjector = null;
             if (null != cache) {
diff --git a/src/main/java/act/app/DbServiceManager.java b/src/main/java/act/app/DbServiceManager.java
@@ -112,7 +112,7 @@ public void visit(ClassNode classNode) throws $.Break {
                 @Override
                 public void on(EventObject event) throws Exception {
                     daoInitializer.run();
-                    eventBus.emit(AppEventId.DB_SVC_LOADED);
+                    app.emit(AppEventId.DB_SVC_LOADED);
                 }
             });
         } else {
@@ -122,13 +122,17 @@ public void on(DbServiceInitialized event) throws Exception {
                     asyncInitializers.remove(event.source());
                     if (asyncInitializers.isEmpty()) {
                         daoInitializer.run();
-                        eventBus.emit(AppEventId.DB_SVC_LOADED);
+                        app.emit(AppEventId.DB_SVC_LOADED);
                     }
                 }
             });
         }
     }
 
+    boolean hasDbService() {
+        return serviceMap.isEmpty();
+    }
+
     private void configureSequenceGenerator(final App app) {
         app.jobManager().on(AppEventId.DEPENDENCY_INJECTOR_PROVISIONED, new Runnable() {
             @Override
diff --git a/src/main/java/act/app/conf/AutoConfigPlugin.java b/src/main/java/act/app/conf/AutoConfigPlugin.java
@@ -146,6 +146,9 @@ void load() {
         void loadClass(Class<?> c, String ns) {
             Class[] ca = c.getClasses();
             for (Class c0 : ca) {
+                if (c0 == c) {
+                    continue;
+                }
                 int mod = c0.getModifiers();
                 if (Modifier.isStatic(mod)) {
                     loadClass(c0, ns + "." + c0.getSimpleName());
diff --git a/src/main/java/act/conf/AppConfig.java b/src/main/java/act/conf/AppConfig.java
@@ -2575,7 +2575,7 @@ private void loadJarProperties(Properties p) {
      * @param conf the application configurator
      */
     public void _merge(AppConfigurator conf) {
-        app.eventBus().trigger(AppEventId.CONFIG_PREMERGE);
+        app.emit(AppEventId.CONFIG_PREMERGE);
         if (mergeTracker.contains(conf)) {
             return;
         }
diff --git a/src/main/java/act/event/EventBus.java b/src/main/java/act/event/EventBus.java
@@ -283,14 +283,18 @@ private void callOn(ActEvent event, Map<Class<? extends EventObject>, List<ActEv
         callOn(event, list, async);
     }
 
+    /**
+     * Emit an internal event.
+     *
+     * Not to be used by app developer
+     *
+     * @param eventId the app event ID
+     * @return this event bus
+     */
     public synchronized EventBus emit(AppEventId eventId) {
         return emit(appEventLookup.get(eventId));
     }
 
-    public synchronized EventBus trigger(AppEventId eventId) {
-        return emit(eventId);
-    }
-
     public synchronized EventBus emit(final AppEvent event) {
         if (isDestroyed()) {
             return this;

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void visit(ClassNode classNode) throws $.Break {`
`112`	`112`	`@Override`
`113`	`113`	`public void on(EventObject event) throws Exception {`
`114`	`114`	`daoInitializer.run();`
`115`		`- eventBus.emit(AppEventId.DB_SVC_LOADED);`
	`115`	`+ app.emit(AppEventId.DB_SVC_LOADED);`
`116`	`116`	`}`
`117`	`117`	`});`
`118`	`118`	`} else {`
`@@ -122,13 +122,17 @@ public void on(DbServiceInitialized event) throws Exception {`
`122`	`122`	`asyncInitializers.remove(event.source());`
`123`	`123`	`if (asyncInitializers.isEmpty()) {`
`124`	`124`	`daoInitializer.run();`
`125`		`- eventBus.emit(AppEventId.DB_SVC_LOADED);`
	`125`	`+ app.emit(AppEventId.DB_SVC_LOADED);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`});`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ boolean hasDbService() {`
	`133`	`+ return serviceMap.isEmpty();`
	`134`	`+ }`
	`135`	`+`
`132`	`136`	`private void configureSequenceGenerator(final App app) {`
`133`	`137`	`app.jobManager().on(AppEventId.DEPENDENCY_INJECTOR_PROVISIONED, new Runnable() {`
`134`	`138`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -2575,7 +2575,7 @@ private void loadJarProperties(Properties p) {`
`2575`	`2575`	`* @param conf the application configurator`
`2576`	`2576`	`*/`
`2577`	`2577`	`public void _merge(AppConfigurator conf) {`
`2578`		`- app.eventBus().trigger(AppEventId.CONFIG_PREMERGE);`
	`2578`	`+ app.emit(AppEventId.CONFIG_PREMERGE);`
`2579`	`2579`	`if (mergeTracker.contains(conf)) {`
`2580`	`2580`	`return;`
`2581`	`2581`	`}`