actframework#543 MasterEntityMetaInfoRepo - support MappedSuperClass annotation registratio

greenlaw110 · greenlaw110 · commit 4950c72082b6 · 2018-03-04T06:45:36.000+11:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # ActFramework Change Log
 
 **1.7.4** 
+* `MasterEntityMetaInfoRepo` - support `MappedSuperClass` annotation registration #543
 * Add `NamedProvider` for `CacheService` #542
 * `ProjectLayout` - provide layout for gradle_groovy combination #541
 * Cannot run a groovy program even in PROD mode #540
diff --git a/src/main/java/act/db/meta/EntityInfoByteCodeScanner.java b/src/main/java/act/db/meta/EntityInfoByteCodeScanner.java
@@ -22,6 +22,7 @@
 
 import act.app.AppByteCodeScannerBase;
 import act.asm.AnnotationVisitor;
+import act.asm.ClassVisitor;
 import act.asm.FieldVisitor;
 import act.asm.Type;
 import act.db.CreatedAt;
@@ -73,12 +74,20 @@ private class _ByteCodeVisitor extends ByteCodeVisitor {
 
         boolean isMappedSuperClass;
         boolean isEntity;
+        boolean isEntityListener;
         String className;
         boolean foundCreatedAt;
         boolean foundLastModifiedAt;
         boolean foundId;
         MasterEntityMetaInfoRepo metaInfoRepo;
 
+        public _ByteCodeVisitor(ClassVisitor cv) {
+            super(cv);
+        }
+
+        public _ByteCodeVisitor() {
+        }
+
         @Override
         public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
             super.visit(version, access, name, signature, superName, interfaces);
@@ -89,22 +98,28 @@ public void visit(int version, int access, String name, String signature, String
         @Override
         public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
             AnnotationVisitor av = super.visitAnnotation(desc, visible);
-            isEntity = metaInfoRepo.isEntity(desc);
-            if (isEntity || isMappedSuperClass) {
-                repo.registerEntityOrMappedSuperClass(className);
-                if (isEntity) {
-                    return new AnnotationVisitor(ASM5, av) {
-                        @Override
-                        public void visit(String name, Object value) {
-                            if ("name".equals(name) || "value".equals(name)) {
-                                repo.registerEntityName(className, (String) value);
+            if (!isEntity && !isMappedSuperClass) {
+                isEntity = metaInfoRepo.isEntity(desc);
+                isMappedSuperClass = metaInfoRepo.isMappedSuperClass(desc);
+                if (isEntity || isMappedSuperClass) {
+                    repo.registerEntityOrMappedSuperClass(className);
+                    if (isEntity) {
+                        return new AnnotationVisitor(ASM5, av) {
+                            @Override
+                            public void visit(String name, Object value) {
+                                if ("name".equals(name) || "value".equals(name)) {
+                                    repo.registerEntityName(className, (String) value);
+                                }
+                                super.visit(name, value);
                             }
-                            super.visit(name, value);
-                        }
-                    };
+                        };
+                    }
+                }
+            } else if (!isEntityListener) {
+                isEntityListener = metaInfoRepo.isEntityListener(desc);
+                if (isEntityListener) {
+                    repo.markEntityListenersFound(className);
                 }
-            } else if (metaInfoRepo.isEntityListener(desc)) {
-                repo.markEntityListenersFound(className);
             }
             return av;
         }
diff --git a/src/main/java/act/db/meta/MasterEntityMetaInfoRepo.java b/src/main/java/act/db/meta/MasterEntityMetaInfoRepo.java
@@ -42,14 +42,14 @@ public class MasterEntityMetaInfoRepo extends EntityMetaInfoRepo {
     private Map<String, EntityMetaInfoRepo> regions = new HashMap<>();
 
     private Set<String> entityAnnotations = new HashSet<>();
-
+    private Set<String> mappedSuperClassAnnotations = new HashSet<>();
     private Set<String> entityListenerAnnotations = new HashSet<>();
 
     @Inject
     public MasterEntityMetaInfoRepo(final App app) {
         super(app);
         registerEntityAnnotation(Entity.class);
-        registerEntityAnnotation(MappedSuperclass.class);
+        registerMappedSuperClassAnnotation(MappedSuperclass.class);
         registerEntityListenerAnnotation(EntityListeners.class);
         final MasterEntityMetaInfoRepo me = this;
         JobManager jobManager = app.jobManager();
@@ -85,6 +85,10 @@ public void registerEntityAnnotation(Class<? extends Annotation> annoType) {
         entityAnnotations.add(Type.getType(annoType).getDescriptor());
     }
 
+    public void registerMappedSuperClassAnnotation(Class<? extends Annotation> annoType) {
+        mappedSuperClassAnnotations.add(Type.getType(annoType).getDescriptor());
+    }
+
     public void registerEntityListenerAnnotation(Class<? extends Annotation> annoType) {
         entityListenerAnnotations.add(Type.getType(annoType).getDescriptor());
     }
@@ -93,6 +97,10 @@ public boolean isEntity(String descriptor) {
         return entityAnnotations.contains(descriptor);
     }
 
+    public boolean isMappedSuperClass(String descriptor) {
+        return mappedSuperClassAnnotations.contains(descriptor);
+    }
+
     public boolean isEntityListener(String descriptor) {
         return entityListenerAnnotations.contains(descriptor);
     }
