Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

look for primary entity type in indirectly-implemented interfaces 

for Jakarta Data TCK work

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-04-04 11:31:34 +02:00 committed by Christian Beikov
parent ca54b2b09f
commit 25e76ef64d
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
View File

@ -462,7 +462,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
}
}
private @Nullable TypeElement primaryEntity(List<ExecutableElement> lifecycleMethods) {
private static @Nullable TypeElement primaryEntity(TypeElement element) {
for (TypeMirror typeMirror : element.getInterfaces()) {
final DeclaredType declaredType = (DeclaredType) typeMirror;
final TypeElement typeElement = (TypeElement) declaredType.asElement();
@ -477,8 +477,27 @@ public class AnnotationMetaEntity extends AnnotationMeta {
return (TypeElement) entityDeclared.asElement();
}
}
else {
final TypeElement primaryEntity = primaryEntity(typeElement);
if ( primaryEntity != null ) {
return primaryEntity;
}
}
}
TypeElement result = null;
return null;
}
private @Nullable TypeElement primaryEntity(List<ExecutableElement> lifecycleMethods) {
// first see if we are a subtype of DataRepository
// in that case, the first type argument determines
// the primary entity type
TypeElement result = primaryEntity(element);
if ( result != null ) {
return result;
}
// otherwise, we have to check all the lifecycle
// methods and determine if they all agree on the
// entity type; if so, it is the primary
final Types types = context.getTypeUtils();
for ( ExecutableElement element : lifecycleMethods ) {
if ( element.getParameters().size()==1 ) {