github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7953] Discover JPA annotations also from overridden super class methods

Browse Source
This commit is contained in:
lukaseder 2018-10-26 12:36:07 +02:00
parent 64526434ac
commit c128561d45
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ/src/main/java/org/jooq/impl/DefaultRecordUnmapper.java
View File

@ -225,12 +225,10 @@ public class DefaultRecordUnmapper<E, R extends Record> implements RecordUnmappe
}
// Use only the first applicable method or member
if (method != null) {
if (method != null)
Tools.setValue(record, field, method.invoke(source));
}
else if (members.size() > 0) {
else if (members.size() > 0)
setValue(record, source, members.get(0), field);
}
}
return (R) record;

11
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -3223,7 +3223,7 @@ final class Tools {
if (suffix != null) {
try {
Method setter = type.getMethod("set" + suffix, method.getReturnType());
Method setter = type.getDeclaredMethod("set" + suffix, method.getReturnType());
// Setter annotation is more relevant
if (setter.getAnnotation(Column.class) == null)
@ -3369,6 +3369,15 @@ final class Tools {
if ((method.getModifiers() & Modifier.STATIC) == 0)
result.add(method);
do {
for (Method method : type.getDeclaredMethods())
if ((method.getModifiers() & Modifier.STATIC) == 0)
result.add(method);
type = type.getSuperclass();
}
while (type != null);
return result;
}