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

HHH-16633 support @IdClass in finder methods

This commit is contained in:
Gavin King 2023-07-10 18:40:10 +02:00
parent 10b17a6430
commit b1bdd74432
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java
View File

@ -360,7 +360,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
if ( isPersistent( memberOfClass, membersKind ) ) {
final AnnotationMetaAttribute result =
memberOfClass.asType()
.accept( new MetaAttributeGenerationVisitor(this, context ), memberOfClass );
.accept( new MetaAttributeGenerationVisitor( this, context ), memberOfClass );
if ( result != null ) {
members.put( result.getPropertyName(), result );
}
@ -390,35 +390,36 @@ public class AnnotationMetaEntity extends AnnotationMeta {
final DeclaredType declaredType = (DeclaredType) returnType;
final TypeElement typeElement = (TypeElement) declaredType.asElement();
final List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
if ( typeArguments.size() == 0 ) {
if ( containsAnnotation( declaredType.asElement(), Constants.ENTITY ) ) {
addQueryMethod( method, declaredType, null );
}
else {
if ( isLegalRawResultType( typeElement.getQualifiedName().toString() ) ) {
addQueryMethod( method, null, typeElement );
}
else {
// probably a projection
switch ( typeArguments.size() ) {
case 0:
if ( containsAnnotation( declaredType.asElement(), Constants.ENTITY ) ) {
addQueryMethod( method, declaredType, null );
}
}
}
else if ( typeArguments.size() == 1 ) {
final Element containerType = declaredType.asElement();
if ( isLegalGenericResultType( containerType.toString() ) ) {
addQueryMethod( method, typeArguments.get(0), typeElement );
}
else {
else {
if ( isLegalRawResultType( typeElement.getQualifiedName().toString() ) ) {
addQueryMethod( method, null, typeElement );
}
else {
// probably a projection
addQueryMethod( method, declaredType, null );
}
}
break;
case 1:
if ( isLegalGenericResultType( typeElement.toString() ) ) {
addQueryMethod( method, typeArguments.get(0), typeElement );
}
else {
context.message( method,
"incorrect return type '" + typeElement + "'",
Diagnostic.Kind.ERROR );
}
break;
default:
context.message( method,
"incorrect return type '" + containerType + "'",
"incorrect return type '" + declaredType + "'",
Diagnostic.Kind.ERROR );
}
}
else {
context.message( method,
"incorrect return type '" + declaredType + "'",
Diagnostic.Kind.ERROR );
break;
}
}
}
@ -691,6 +692,15 @@ public class AnnotationMetaEntity extends AnnotationMeta {
}
}
}
final AnnotationMirror idClass = getAnnotationMirror( entity, Constants.ID_CLASS );
if ( idClass != null ) {
final Object value = getAnnotationValue( idClass, "value" );
if ( value instanceof TypeMirror ) {
if ( context.getTypeUtils().isSameType( param.asType(), (TypeMirror) value ) ) {
return FieldType.ID;
}
}
}
context.message( param,
"no matching field named '" + param.getSimpleName()
+ "' in entity class '" + entity.getQualifiedName() + "'",

1
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/Constants.java
View File

@ -23,6 +23,7 @@ public final class Constants {
public static final String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass";
public static final String EMBEDDABLE = "jakarta.persistence.Embeddable";
public static final String ID = "jakarta.persistence.Id";
public static final String ID_CLASS = "jakarta.persistence.IdClass";
public static final String EMBEDDED_ID = "jakarta.persistence.EmbeddedId";
public static final String NATURAL_ID = "org.hibernate.annotations.NaturalId";
public static final String TRANSIENT = "jakarta.persistence.Transient";