fix actframework#88

greenlaw110 · greenlaw110 · commit d48d990b1782 · 2017-03-12T10:14:37.000+11:00
diff --git a/src/main/java/act/controller/meta/ControllerClassMetaInfoManager.java b/src/main/java/act/controller/meta/ControllerClassMetaInfoManager.java
@@ -1,14 +1,17 @@
 package act.controller.meta;
 
+import act.Act;
 import act.app.App;
+import act.app.AppClassLoader;
+import act.app.event.AppEventId;
 import act.asm.Type;
-import act.util.AsmTypes;
+import act.util.ClassInfoRepository;
+import act.util.ClassNode;
 import act.util.DestroyableBase;
 import org.osgl.util.C;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import java.util.List;
 import java.util.Map;
 
 import static act.Destroyable.Util.destroyAll;
@@ -17,52 +20,28 @@
 public class ControllerClassMetaInfoManager extends DestroyableBase {
 
     private Map<String, ControllerClassMetaInfo> controllers = C.newMap();
-    private Map<Type, List<ControllerClassMetaInfo>> subTypeInfo = C.newMap();
-    private App app;
 
     @Inject
     public ControllerClassMetaInfoManager(App app) {
-        this.app = app;
+        app.jobManager().on(AppEventId.APP_CODE_SCANNED, new Runnable() {
+            @Override
+            public void run() {
+                buildControllerHierarchies();
+            }
+        });
     }
 
     @Override
     protected void releaseResources() {
         destroyAll(controllers.values(), ApplicationScoped.class);
         controllers.clear();
-        for (List<ControllerClassMetaInfo> l : subTypeInfo.values()) {
-            destroyAll(l);
-        }
-        subTypeInfo.clear();
         super.releaseResources();
     }
 
     public void registerControllerMetaInfo(ControllerClassMetaInfo metaInfo) {
         String className = Type.getObjectType(metaInfo.className()).getClassName();
         controllers.put(className, metaInfo);
-        if (metaInfo.isController()) {
-            Type superType = metaInfo.superType();
-            if (!AsmTypes.OBJECT_TYPE.equals(superType)) {
-                ControllerClassMetaInfo superInfo = controllerMetaInfo(superType.getClassName());
-                if (null != superInfo) {
-                    metaInfo.parent(superInfo);
-                }
-                List<ControllerClassMetaInfo> subTypes = subTypeInfo.get(superType);
-                if (null == subTypes) {
-                    subTypes = C.newList();
-                    subTypeInfo.put(superType, subTypes);
-                }
-                subTypes.add(metaInfo);
-            }
-        }
-        List<ControllerClassMetaInfo> subTypes = subTypeInfo.get(metaInfo.type());
-        if (null != subTypes) {
-            for (ControllerClassMetaInfo subTypeInfo : subTypes) {
-                subTypeInfo.parent(metaInfo);
-            }
-            subTypeInfo.remove(metaInfo.type());
-        }
-        app.eventBus().trigger(new ControllerMetaInfoRegistered(metaInfo));
-        App.logger.trace("Controller meta info registered for: %s", className);
+        App.LOGGER.trace("Controller meta info registered for: %s", className);
     }
 
     public ControllerClassMetaInfo controllerMetaInfo(String className) {
@@ -75,4 +54,31 @@ public void mergeActionMetaInfo(App app) {
         }
     }
 
+    public void buildControllerHierarchies() {
+        AppClassLoader cl = Act.app().classLoader();
+        ControllerClassMetaInfoManager manager = cl.controllerClassMetaInfoManager();
+        ClassInfoRepository repo = cl.classInfoRepository();
+        for (ControllerClassMetaInfo info : manager.controllers.values()) {
+            buildSuperClassMetaInfo(info, manager, repo);
+        }
+    }
+
+    private static void buildSuperClassMetaInfo(ControllerClassMetaInfo info, ControllerClassMetaInfoManager manager, ClassInfoRepository repo) {
+        String className = info.className();
+        ClassNode node = repo.node(className);
+        if (null == node) {
+            return;
+        }
+        ClassNode parent = node.parent();
+        final String OBJECT = Object.class.getName();
+        while (null != parent && !OBJECT.equals(parent.name())) {
+            ControllerClassMetaInfo parentInfo = manager.controllerMetaInfo(parent.name());
+            if (null != parentInfo) {
+                info.parent(parentInfo);
+                break;
+            }
+            parent = parent.parent();
+        }
+    }
+
 }
diff --git a/src/test/java/act/controller/bytecode/ControllerByteCodeScannerTest.java b/src/test/java/act/controller/bytecode/ControllerByteCodeScannerTest.java
@@ -166,6 +166,7 @@ public void verifyWithAppContextStaticNoReturnNoParam() {
     }
 
     @Test
+    @Ignore // moved to testapp
     public void testInheritedInterceptor() throws Exception {
         scan(ControllerWithInheritedInterceptor.class);
 
@@ -214,6 +215,7 @@ private void scan(Class<?> c) {
             classLoader.preloadClassFile(base, file);
         }
         classLoader.scan();
+        classLoader.controllerClassMetaInfoManager().buildControllerHierarchies();
         infoSrc.mergeActionMetaInfo(mockApp);
     }
 
diff --git a/testapp/pom.xml b/testapp/pom.xml
@@ -49,7 +49,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <act.version>[1.0.1, 2.0.0)</act.version>
+    <act.version>[1.0.1, 1.0.100)</act.version>
     <act.storage.version>[0.7.0, 2.0.0)</act.storage.version>
     <act.morphia.version>[1.0.0, 2.0.0)</act.morphia.version>
     <app.entry>testapp.TestApp</app.entry>
diff --git a/testapp/src/main/java/testapp/endpoint/ContextHierarchiTestBed.java b/testapp/src/main/java/testapp/endpoint/ContextHierarchiTestBed.java
@@ -0,0 +1,21 @@
+package testapp.endpoint;
+
+import act.controller.Controller;
+import org.osgl.mvc.annotation.GetAction;
+
+@Controller("/cht")
+public class ContextHierarchiTestBed {
+
+    public static class IntermediateController extends ContextHierarchiTestBed {
+
+    }
+
+    public static class Endpoint extends IntermediateController {
+
+        @GetAction("cht_test")
+        public void test() {
+        }
+
+    }
+
+}
diff --git a/testapp/src/test/java/testapp/endpoint/ContextHierarchiTest.java b/testapp/src/test/java/testapp/endpoint/ContextHierarchiTest.java
@@ -0,0 +1,16 @@
+package testapp.endpoint;
+
+import org.junit.Test;
+
+/**
+ * Refer to https://github.com/actframework/actframework/issues/88
+ */
+public class ContextHierarchiTest extends EndpointTester {
+
+    @Test
+    public void test() throws Exception {
+        url("/cht/cht_test");
+        checkRespCode();
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ public void verifyWithAppContextStaticNoReturnNoParam() {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Test`
	`169`	`+ @Ignore // moved to testapp`
`169`	`170`	`public void testInheritedInterceptor() throws Exception {`
`170`	`171`	`scan(ControllerWithInheritedInterceptor.class);`
`171`	`172`
`@@ -214,6 +215,7 @@ private void scan(Class<?> c) {`
`214`	`215`	`classLoader.preloadClassFile(base, file);`
`215`	`216`	`}`
`216`	`217`	`classLoader.scan();`
	`218`	`+ classLoader.controllerClassMetaInfoManager().buildControllerHierarchies();`
`217`	`219`	`infoSrc.mergeActionMetaInfo(mockApp);`
`218`	`220`	`}`
`219`	`221`