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

report error if parameter of @Find matches a collection

This commit is contained in:
Gavin King 2024-03-05 20:17:40 +01:00
parent db1b3b3f40
commit 19023a491e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1370,6 +1370,13 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private @Nullable FieldType validateFinderParameter(TypeElement entityType, VariableElement param) { private @Nullable FieldType validateFinderParameter(TypeElement entityType, VariableElement param) {
final Element member = memberMatchingPath( entityType, parameterName( param ) ); final Element member = memberMatchingPath( entityType, parameterName( param ) );
if ( member != null) { if ( member != null) {
if ( containsAnnotation( member, MANY_TO_MANY, ONE_TO_MANY, ELEMENT_COLLECTION ) ) {
context.message( param,
"matching field is a collection",
Diagnostic.Kind.ERROR );
return null;
}
final String memberType = memberType( member ).toString(); final String memberType = memberType( member ).toString();
final String paramType = param.asType().toString(); final String paramType = param.asType().toString();
if ( !isLegalAssignment( paramType, memberType ) ) { if ( !isLegalAssignment( paramType, memberType ) ) {
@ -1379,17 +1386,18 @@ public class AnnotationMetaEntity extends AnnotationMeta {
Diagnostic.Kind.ERROR ); Diagnostic.Kind.ERROR );
} }
if ( containsAnnotation( member, Constants.ID, Constants.EMBEDDED_ID ) ) { if ( containsAnnotation( member, ID, EMBEDDED_ID ) ) {
return FieldType.ID; return FieldType.ID;
} }
else if ( containsAnnotation( member, Constants.NATURAL_ID ) ) { else if ( containsAnnotation( member, NATURAL_ID ) ) {
return FieldType.NATURAL_ID; return FieldType.NATURAL_ID;
} }
else { else {
return FieldType.BASIC; return FieldType.BASIC;
} }
} }
final AnnotationMirror idClass = getAnnotationMirror( entityType, Constants.ID_CLASS );
final AnnotationMirror idClass = getAnnotationMirror( entityType, ID_CLASS );
if ( idClass != null ) { if ( idClass != null ) {
final Object value = getAnnotationValue( idClass, "value" ); final Object value = getAnnotationValue( idClass, "value" );
if ( value instanceof TypeMirror ) { if ( value instanceof TypeMirror ) {
@ -1398,6 +1406,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
} }
} }
} }
context.message( param, context.message( param,
"no matching field named '" "no matching field named '"
+ parameterName( param ).replace('$', '.') + parameterName( param ).replace('$', '.')