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

HHH-16633 typecasts to org.hibernate return types + handle projections correctly

This commit is contained in:
Gavin King 2023-06-17 15:32:05 +02:00
parent 56cf0c414c
commit e641cfceb7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,16 +304,17 @@ public class AnnotationMetaEntity extends AnnotationMeta {
final DeclaredType declaredType = (DeclaredType) returnType; final DeclaredType declaredType = (DeclaredType) returnType;
final List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments(); final List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
if ( typeArguments.size() == 0 ) { if ( typeArguments.size() == 0 ) {
final String typeName = declaredType.toString();
if ( containsAnnotation( declaredType.asElement(), Constants.ENTITY ) ) { if ( containsAnnotation( declaredType.asElement(), Constants.ENTITY ) ) {
addQueryMethod(method, methodName, declaredType.toString(), null); addQueryMethod(method, methodName, typeName, null);
} }
else { else {
final String containerTypeName = declaredType.toString(); if (isLegalRawResultType(typeName)) {
if (isLegalRawResultType(containerTypeName)) { addQueryMethod(method, methodName, null, typeName);
addQueryMethod(method, methodName, null, containerTypeName);
} }
else { else {
displayError(method, "incorrect return type '" + containerTypeName + "'"); // probably a projection
addQueryMethod(method, methodName, typeName, null);
} }
} }
} }
@ -342,7 +343,8 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private static boolean isLegalGenericResultType(String containerTypeName) { private static boolean isLegalGenericResultType(String containerTypeName) {
return containerTypeName.equals("java.util.List") return containerTypeName.equals("java.util.List")
|| containerTypeName.equals("jakarta.persistence.TypedQuery") || containerTypeName.equals("jakarta.persistence.TypedQuery")
|| containerTypeName.equals("org.hibernate.query.Query"); || containerTypeName.equals("org.hibernate.query.Query")
|| containerTypeName.equals("org.hibernate.query.SelectionQuery");
} }
private void addQueryMethod( private void addQueryMethod(

3
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/QueryMethod.java
View File

@ -86,7 +86,8 @@ public class QueryMethod implements MetaAttribute {
.append(")") .append(")")
.append(" {") .append(" {")
.append("\n return "); .append("\n return ");
if ( isNative && returnTypeName != null ) { if ( isNative && returnTypeName != null
|| containerTypeName != null && containerTypeName.startsWith("org.hibernate") ) {
declaration.append("(").append(type).append(") "); declaration.append("(").append(type).append(") ");
} }
declaration declaration