produce error for a Sort parameter on a repo method which returns a projection

this would have saved my ass on Quarkus Insights

Author: gavinking

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

@@ -1791,17 +1791,37 @@ private void createCriteriaFinder(
 		);
 	}
 
-	private void checkFinderParameter(TypeElement entity, VariableElement parameter) {
+	private void checkFinderParameter(@Nullable TypeElement entity, VariableElement parameter) {
 		final Types types = context.getTypeUtils();
 		final TypeMirror parameterType = parameterType(parameter);
 		final String typeName = parameterType.toString();
-		if ( isOrderParam( typeName ) || isRestrictionParam( typeName ) ) {
+		if ( isRestrictionParam( typeName ) ) {
 			final TypeMirror typeArgument = getTypeArgument( parameterType );
-			if ( typeArgument == null ) {
-				missingTypeArgError( entity.getSimpleName().toString(), parameter, typeName );
+			final TypeElement implicitEntityType = entity == null ? primaryEntity : entity;
+			if ( implicitEntityType != null ) {
+				if ( typeArgument == null ) {
+					missingTypeArgError( implicitEntityType.getSimpleName().toString(), parameter, typeName );
+				}
+				else if ( !types.isSameType( typeArgument, implicitEntityType.asType() ) ) {
+					wrongTypeArgError( implicitEntityType.getSimpleName().toString(), parameter, typeName );
+				}
 			}
-			else if ( !types.isSameType( typeArgument, entity.asType() ) ) {
-				wrongTypeArgError( entity.getSimpleName().toString(), parameter, typeName );
+//			else {
+//				message( parameter, "repository method does have well-defined entity type", Diagnostic.Kind.ERROR );
+//			}
+		}
+		else if ( isOrderParam( typeName ) ) {
+			final TypeMirror typeArgument = getTypeArgument( parameterType );
+			if ( entity != null ) {
+				if ( typeArgument == null ) {
+					missingTypeArgError( entity.getSimpleName().toString(), parameter, typeName );
+				}
+				else if ( !types.isSameType( typeArgument, entity.asType() ) ) {
+					wrongTypeArgError( entity.getSimpleName().toString(), parameter, typeName );
+				}
+			}
+			else {
+				message( parameter, "repository method does not return entity type", Diagnostic.Kind.ERROR );
 			}
 		}
 	}
@@ -1881,7 +1901,7 @@ else if (parameterType.startsWith(JD_SORT)) {
 	}
 
 	private List<OrderBy> orderByList(ExecutableElement method, TypeElement returnType) {
-		final TypeElement entityType = implicitEntityType( returnType );
+		final TypeElement entityType = explicitEntityType( returnType );
 		if ( entityType != null ) {
 			final AnnotationMirror orderByList = getAnnotationMirror( method, JD_ORDER_BY_LIST );
 			if ( orderByList != null ) {
@@ -2611,7 +2631,7 @@ else if ( primaryEntity != null ) {
 		}
 	}
 
-	private @Nullable TypeElement implicitEntityType(@Nullable TypeElement resultType) {
+	private @Nullable TypeElement explicitEntityType(@Nullable TypeElement resultType) {
 		if ( resultType != null && hasAnnotation(resultType, ENTITY) ) {
 			return resultType;
 		}
@@ -3224,24 +3244,20 @@ private void checkParameters(
 		}
 		if ( returnType != null ) {
 			for ( VariableElement parameter : method.getParameters() ) {
-				final TypeElement entity = implicitEntityType(returnType);
-				if ( entity != null ) {
-					checkFinderParameter(entity, parameter);
-				}
-				// else? what?
+				checkFinderParameter( explicitEntityType(returnType), parameter );
 			}
 		}
 	}
 
-	private @Nullable TypeElement implicitEntityType(@Nullable TypeMirror resultType) {
+	private @Nullable TypeElement explicitEntityType(@Nullable TypeMirror resultType) {
 		if ( resultType != null && resultType.getKind() == TypeKind.DECLARED) {
 			final DeclaredType declaredType = (DeclaredType) resultType;
 			final Element typeElement = declaredType.asElement();
 			if ( hasAnnotation(typeElement, ENTITY) ) {
 				return (TypeElement) typeElement;
 			}
 		}
-		return primaryEntity;
+		return null;
 	}
 
 	private static boolean typeNameEquals(TypeMirror parameterType, String typeName) {

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Books.java

@@ -36,5 +36,5 @@ public abstract class Books {
 	static class Summary { Summary(String title, String publisher, String isbn) {} }
 
 	@HQL("select title, publisher.name, isbn from Book")
-	abstract List<Summary> summarize(Session session, Order<Summary> order);
+	abstract List<Summary> summarize(Session session);
 }