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

better handling of boxed types in @Find method parameter checking

This commit is contained in:
Gavin King 2024-03-18 12:30:42 +01:00
parent bf807f2694
commit f8c0df8724
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/BookAuthorRepository.java
View File

@ -44,6 +44,9 @@ public interface BookAuthorRepository {
@Find
Book[] books(@By("isbn") String[] isbns);
@Find
List<Book> booksWithPages(Iterable<Integer> pages);
@Find
Optional<Book> bookIfAny(String isbn);

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

@ -43,6 +43,7 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVariable;
@ -1445,6 +1446,10 @@ public class AnnotationMetaEntity extends AnnotationMeta {
return false;
}
else {
if ( attributeType.getKind().isPrimitive() ) {
final PrimitiveType primitiveType = (PrimitiveType) attributeType;
attributeType = types.boxedClass( primitiveType ).asType();
}
final TypeKind kind = parameterType.getKind();
switch (kind) {
case TYPEVAR:
@ -1467,7 +1472,8 @@ public class AnnotationMetaEntity extends AnnotationMeta {
return true;
default:
if ( kind.isPrimitive() ) {
if ( !types.isSameType( types.unboxedType(parameterType), attributeType) ) {
final PrimitiveType primitiveType = (PrimitiveType) parameterType;
if ( !types.isSameType( types.boxedClass(primitiveType).asType(), attributeType ) ) {
parameterTypeError( entityType, param, attributeType );
}
return false;