HHH-19364 start migrating to SelectionSpecification for Orders in Processor

Author: gavinking

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

@@ -80,7 +80,7 @@ String specificationType() {
 
 	@Override
 	void createQuery(StringBuilder declaration) {
-		if ( !isReactive() && hasRestriction() ) {
+		if ( isUsingSpecification() ) {
 			declaration
 					.append( "\t\t\t.createQuery(" )
 					.append( localSessionName() )
@@ -95,8 +95,9 @@ void createQuery(StringBuilder declaration) {
 		}
 	}
 
+	@Override
 	void createSpecification(StringBuilder declaration) {
-		if ( !isReactive() && hasRestriction() ) {
+		if ( isUsingSpecification() ) {
 			declaration
 					.append( annotationMetaEntity.importType( specificationType() ) )
 					.append( ".create(_query)\n" );
@@ -105,12 +106,8 @@ void createSpecification(StringBuilder declaration) {
 
 	@Override
 	boolean isUsingSpecification() {
-		return !isReactive() && hasRestriction();
-	}
-
-	private boolean hasRestriction() {
-		return parameterTypes().stream()
-				.anyMatch( type -> isRestrictionParam( type ) || isRangeParam( type ) );
+		return !isReactive()
+			&& ( hasRestriction() || hasOrder() && !isJakartaCursoredPage(containerType) );
 	}
 
 	void createCriteriaQuery(StringBuilder declaration) {

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

@@ -110,6 +110,17 @@ String parameterList() {
 				.orElse("");
 	}
 
+	boolean hasRestriction() {
+		return paramTypes.stream()
+				.anyMatch( type -> isRestrictionParam( type )
+								|| isRangeParam( type ) );
+	}
+
+	boolean hasOrder() {
+		return paramTypes.stream().anyMatch(AbstractQueryMethod::isOrderParam)
+			|| !orderBys.isEmpty();
+	}
+
 	String strip(final String fullType) {
 		String type = fullType;
 		// strip off type annotations
@@ -264,10 +275,23 @@ else if ( jakartaPageRequest ) {
 		}
 	}
 
+	void handleSorting(
+			StringBuilder declaration, List<String> paramTypes,
+			@Nullable String containerType) {
+		if ( !isJakartaCursoredPage(containerType)
+				&& isUsingSpecification()
+				&& hasOrdering(paramTypes) ) {
+			declaration
+					.append("\t\t\t.resort(_orders)\n");
+		}
+	}
+
 	boolean applyOrder(
 			StringBuilder declaration, List<String> paramTypes,
 			@Nullable String containerType, boolean unwrapped) {
-		if ( !isJakartaCursoredPage(containerType) && hasOrdering(paramTypes) ) {
+		if ( !isJakartaCursoredPage(containerType)
+				&& !isUsingSpecification()
+				&& hasOrdering(paramTypes) ) {
 			unwrapQuery( declaration, unwrapped );
 			declaration
 					.append("\t\t\t.setOrder(_orders)\n");
@@ -461,6 +485,8 @@ void makeKeyedPage(StringBuilder declaration, List<String> paramTypes) {
 
 	void createQuery(StringBuilder declaration) {}
 
+	void createSpecification(StringBuilder declaration) {}
+
 	void setParameters(StringBuilder declaration, List<String> paramTypes, String indent) {}
 
 	void tryReturn(StringBuilder declaration, List<String> paramTypes, @Nullable String containerType) {
@@ -521,6 +547,9 @@ private void totalResults(StringBuilder declaration, List<String> paramTypes) {
 			declaration
 					.append(parameterName(JD_PAGE_REQUEST, paramTypes, paramNames))
 					.append(".requestTotal()\n\t\t\t\t\t\t? ");
+			// TODO: indentation is all messed up here!
+			createSpecification( declaration );
+			handleRestrictionParameters( declaration, paramTypes );
 			createQuery( declaration );
 			setParameters( declaration, paramTypes, "\t\t\t\t\t");
 			if ( isUsingEntityManager() ) {

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

@@ -59,6 +59,7 @@ void executeQuery(StringBuilder declaration, List<String> paramTypes) {
 		castResult( declaration );
 		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		handleSorting( declaration, paramTypes, containerType );
 		createQuery( declaration );
 		handlePageParameters( declaration, paramTypes, containerType );
 		boolean unwrapped = !isUsingEntityManager();

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

@@ -98,6 +98,7 @@ public String getAttributeDeclarationString() {
 		castResult( declaration );
 		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		handleSorting( declaration, paramTypes, containerType );
 		createQuery( declaration );
 		setParameters( declaration, paramTypes, "");
 		handlePageParameters( declaration, paramTypes, containerType );
@@ -118,7 +119,7 @@ String specificationType() {
 
 	@Override
 	void createQuery(StringBuilder declaration) {
-		if ( returnTypeClass != null && !isReactive() && hasRestriction() ) {
+		if ( isUsingSpecification() ) {
 			declaration
 					.append( "\t\t\t.createQuery(" )
 					.append( localSessionName() )
@@ -142,8 +143,9 @@ void createQuery(StringBuilder declaration) {
 		}
 	}
 
-	private void createSpecification(StringBuilder declaration) {
-		if ( returnTypeClass != null && !isReactive() && hasRestriction() ) {
+	@Override
+	void createSpecification(StringBuilder declaration) {
+		if ( returnTypeClass != null && isUsingSpecification() ) {
 			declaration
 					.append( annotationMetaEntity.importType( specificationType() ) )
 					.append( ".create(" )
@@ -156,12 +158,9 @@ private void createSpecification(StringBuilder declaration) {
 
 	@Override
 	boolean isUsingSpecification() {
-		return returnTypeClass != null && !isReactive() && hasRestriction();
-	}
-
-	private boolean hasRestriction() {
-		return parameterTypes().stream()
-				.anyMatch( type -> isRestrictionParam( type ) || isRangeParam( type ) );
+		return returnTypeClass != null
+			&& !isReactive()
+			&& ( hasRestriction() || hasOrder() && !isJakartaCursoredPage(containerType) );
 	}
 
 	private String createQueryMethod() {