HHH-18958 If NamedQuery.returnClass attribute is present use it when generating method return type

Author: cigaly

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java

@@ -110,16 +110,20 @@ private void handleNamedQuery(AnnotationMirror mirror, boolean checkHql) {
 					if ( !isJakartaDataStyle()
 							&& statement instanceof SqmSelectStatement<?> selectStatement ) {
 						if ( isQueryMethodName( name ) ) {
+							final AnnotationValue annotationValue = getAnnotationValue( mirror, "resultClass" );
+							final String resultType = annotationValue != null
+									? annotationValue.getValue().toString()
+									: resultType( selectStatement, context );
 							putMember( name,
-									// TODO: respect @NamedQuery(resultClass)
 									new NamedQueryMethod(
 											this,
 											selectStatement,
 											name.substring(1),
 											isRepository(),
 											getSessionType(),
 											getSessionVariableName(),
-											context.addNonnullAnnotation()
+											context.addNonnullAnnotation(),
+											resultType
 									)
 							);
 						}

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NamedQueryMethod.java

@@ -15,7 +15,6 @@
 import java.util.TreeSet;
 
 import static org.hibernate.processor.util.StringUtil.nameToFieldName;
-import static org.hibernate.processor.util.SqmTypeUtils.resultType;
 
 /**
  * @author Gavin King
@@ -28,6 +27,7 @@ class NamedQueryMethod implements MetaAttribute {
 	private final boolean reactive;
 	private final String sessionVariableName;
 	private final boolean addNonnullAnnotation;
+	private final String resultClass;
 
 	public NamedQueryMethod(
 			AnnotationMeta annotationMeta,
@@ -36,14 +36,16 @@ public NamedQueryMethod(
 			boolean belongsToRepository,
 			@Nullable String sessionType,
 			String sessionVariableName,
-			boolean addNonnullAnnotation) {
+			boolean addNonnullAnnotation,
+			String resultClass) {
 		this.annotationMeta = annotationMeta;
 		this.select = select;
 		this.name = name;
 		this.belongsToRepository = belongsToRepository;
 		this.reactive = Constants.MUTINY_SESSION.equals(sessionType);
 		this.sessionVariableName = sessionVariableName;
 		this.addNonnullAnnotation = addNonnullAnnotation;
+		this.resultClass = resultClass;
 	}
 
 	@Override
@@ -72,7 +74,7 @@ public String getAttributeDeclarationString() {
 				.append(".createNamedQuery(")
 				.append(fieldName())
 				.append(", ")
-				.append( annotationMeta.importType( resultType( select, annotationMeta.getContext() ) ) )
+				.append( annotationMeta.importType( resultClass ) )
 				.append( ".class)");
 		for ( SqmParameter<?> param : sortedParameters ) {
 			declaration
@@ -123,7 +125,7 @@ private void returnType(StringBuilder declaration) {
 		declaration
 				.append(annotationMeta.importType(Constants.LIST))
 				.append('<')
-				.append( annotationMeta.importType( resultType( select, annotationMeta.getContext() ) ) )
+				.append( annotationMeta.importType( resultClass ) )
 				.append("> ")
 				.append(name);
 		if ( reactive ) {