github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor/findannotation (#1104)

Browse Source 
* refactor: renamed findAnnotation method that searches recursive to findAnnotationRecursive

* CHG: searching namedQueries & indices also recursive in superclasses

* FIX: Using the AnnotationBase methods on several places and documented them
This commit is contained in:
Roland Praml
2017-09-01 20:25:10 +12:00
committed by Rob Bygrave
parent e908d16ba8
commit 46cdc84e6b
10 changed files with 87 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+4 -4
View File
@@ -109,11 +109,11 @@ public class DeployInherit {
info.setParent(parent);
}
Inheritance ia = AnnotationBase.findAnnotation(cls, Inheritance.class);
Inheritance ia = AnnotationBase.findAnnotationRecursive(cls, Inheritance.class);
if (ia != null) {
ia.strategy();
}
DiscriminatorColumn da = AnnotationBase.findAnnotation(cls, DiscriminatorColumn.class);
DiscriminatorColumn da = AnnotationBase.findAnnotationRecursive(cls, DiscriminatorColumn.class);
if (da != null) {
// lowercase the discriminator column for RawSql and JSON
info.setColumnName(da.name().toLowerCase());
@@ -122,7 +122,7 @@ public class DeployInherit {
info.setColumnDefn(da.columnDefinition());
}
DiscriminatorValue dv = AnnotationBase.findAnnotation(cls, DiscriminatorValue.class);
DiscriminatorValue dv = AnnotationBase.findAnnotationRecursive(cls, DiscriminatorValue.class);
if (dv != null) {
info.setDiscriminatorValue(dv.value());
}
@@ -144,7 +144,7 @@ public class DeployInherit {
if (cls.equals(Object.class)) {
return false;
}
Annotation a = AnnotationBase.findAnnotation(cls, Inheritance.class);
Annotation a = AnnotationBase.findAnnotationRecursive(cls, Inheritance.class);
if (a != null) {
return true;
}