#42 - Regression DbName not read from MappedSuperclass / inheritance

Author: rbygrave

pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-parent</artifactId>
-    <version>1.3</version>
+    <version>1.4</version>
   </parent>
 
   <scm>

src/main/java/io/ebean/querybean/generator/FindDbName.java

@@ -4,6 +4,9 @@
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -15,13 +18,18 @@ class FindDbName {
   /**
    * Return the value of the DbName annotation or null if it isn't found on the element.
    */
-  static String value(TypeElement element) {
+  static String value(TypeElement element, Types typeUtils) {
 
     AnnotationMirror mirror = findDbNameMirror(element);
     if (mirror != null) {
       return readDbNameValue(mirror);
     }
-    return null;
+    final TypeMirror typeMirror = element.getSuperclass();
+    if (typeMirror.getKind() == TypeKind.NONE) {
+      return null;
+    }
+    final TypeElement element1 = (TypeElement)typeUtils.asElement(typeMirror);
+    return value(element1, typeUtils);
   }
 
   private static String readDbNameValue(AnnotationMirror mirror) {

src/main/java/io/ebean/querybean/generator/ProcessingContext.java

@@ -139,6 +139,13 @@ boolean isEntity(Element element) {
     return hasAnnotations(element, ENTITY);
   }
 
+  /**
+   * Find the DbName annotation and return name if found.
+   */
+  String findDbName(TypeElement element) {
+    return FindDbName.value(element, typeUtils);
+  }
+
   /**
    * Return true if it is a DbJson field.
    */

src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -59,7 +59,7 @@ class SimpleQueryBeanWriter {
   }
 
   private String findDbName() {
-    return FindDbName.value(element);
+    return processingContext.findDbName(element);
   }
 
   private boolean isEntity() {