HHH-19364 completely remove use of addOrder

Author: gavinking

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

@@ -80,34 +80,35 @@ String specificationType() {
 
 	@Override
 	void createQuery(StringBuilder declaration) {
-		if ( isUsingSpecification() ) {
+		declaration
+				.append(localSessionName())
+				.append(".")
+				.append(createQueryMethod())
+				.append('(');
+		if (isUsingSpecification() ) {
 			declaration
-					.append( "\t\t\t.createQuery(" )
-					.append( localSessionName() )
-					.append( ")\n" );
+					.append("_spec.buildCriteriaQuery(_builder)");
 		}
 		else {
-			declaration
-					.append(localSessionName())
-					.append(".")
-					.append(createQueryMethod())
-					.append("(_query)\n");
+			declaration.append("_query");
 		}
+		declaration.append(")\n");
 	}
 
 	@Override
 	void createSpecification(StringBuilder declaration) {
 		if ( isUsingSpecification() ) {
 			declaration
+					.append( "\tvar _spec = " )
 					.append( annotationMetaEntity.importType( specificationType() ) )
-					.append( ".create(_query)\n" );
+					.append( ".create(_query);\n" );
 		}
 	}
 
 	@Override
 	boolean isUsingSpecification() {
-		return !isReactive()
-			&& ( hasRestriction() || hasOrder() && !isJakartaCursoredPage(containerType) );
+		return hasRestriction()
+			|| hasOrder() && !isJakartaCursoredPage(containerType);
 	}
 
 	void createCriteriaQuery(StringBuilder declaration) {
@@ -126,10 +127,11 @@ void createCriteriaQuery(StringBuilder declaration) {
 	private void createBuilder(StringBuilder declaration) {
 		declaration
 				.append("\tvar _builder = ")
-				.append(localSessionName())
-				.append(isUsingEntityManager()
-						? ".getEntityManagerFactory()"
-						: ".getFactory()")
+				.append(localSessionName());
+		if ( isReactive() ) {
+			declaration.append(".getFactory()");
+		}
+		declaration
 				.append(".getCriteriaBuilder();\n");
 	}
 

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

@@ -279,25 +279,13 @@ void handleSorting(
 			StringBuilder declaration, List<String> paramTypes,
 			@Nullable String containerType) {
 		if ( !isJakartaCursoredPage(containerType)
-				&& isUsingSpecification()
 				&& hasOrdering(paramTypes) ) {
+			if ( !isUsingSpecification() ) {
+				throw new AssertionError();
+			}
 			declaration
-					.append("\t\t\t.resort(_orders)\n");
-		}
-	}
-
-	boolean applyOrder(
-			StringBuilder declaration, List<String> paramTypes,
-			@Nullable String containerType, boolean unwrapped) {
-		if ( !isJakartaCursoredPage(containerType)
-				&& !isUsingSpecification()
-				&& hasOrdering(paramTypes) ) {
-			unwrapQuery( declaration, unwrapped );
-			declaration
-					.append("\t\t\t.setOrder(_orders)\n");
-			return true;
+					.append("\t_spec.resort(_orders);\n");
 		}
-		return unwrapped;
 	}
 
 	void handlePageParameters(
@@ -322,25 +310,25 @@ void handleRestrictionParameters(
 			if ( isRestrictionParam(paramType) ) {
 				if ( paramType.startsWith(LIST) || paramType.endsWith("[]") ) {
 					declaration
-							.append( "\t\t\t.restrict(" )
+							.append( "\t_spec.restrict(" )
 							.append( annotationMetaEntity.importType(HIB_RESTRICTION) )
 							.append( ".all(" )
 							.append( paramName )
-							.append( "))\n" );
+							.append( "));\n" );
 
 				}
 				else {
 					declaration
-							.append( "\t\t\t.restrict(" )
+							.append( "\t_spec.restrict(" )
 							.append( paramName )
-							.append( ")\n" );
+							.append( ");\n" );
 				}
 			}
 			else if ( isRangeParam(paramType) && returnTypeName!= null ) {
 				final TypeElement entityElement = annotationMetaEntity.getContext().getElementUtils()
 						.getTypeElement( returnTypeName );
 				declaration
-						.append("\t\t\t.restrict(")
+						.append("\t_spec.restrict(")
 						.append(annotationMetaEntity.importType(HIB_RESTRICTION))
 						.append(".restrict(")
 						.append(annotationMetaEntity.importType(
@@ -349,7 +337,7 @@ else if ( isRangeParam(paramType) && returnTypeName!= null ) {
 						.append(paramName)
 						.append(", ")
 						.append(paramName)
-						.append("))\n");
+						.append("));\n");
 			}
 		}
 	}
@@ -387,7 +375,7 @@ static void closingBrace(StringBuilder declaration) {
 	}
 
 	void unwrapQuery(StringBuilder declaration, boolean unwrapped) {
-		if ( !unwrapped && isUsingEntityManager() && !isUsingSpecification() ) {
+		if ( !unwrapped && isUsingEntityManager() ) {
 			declaration
 					.append("\t\t\t.unwrap(")
 					.append(annotationMetaEntity.importType(HIB_SELECTION_QUERY))
@@ -547,9 +535,6 @@ 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() ) {
@@ -784,7 +769,7 @@ protected void executeSelect(
 					}
 					break;
 				default:
-					if ( isUsingEntityManager() && !unwrapped && mustUnwrap && !isUsingSpecification() ) {
+					if ( isUsingEntityManager() && !unwrapped && mustUnwrap ) {
 						declaration
 								.append("\t\t\t.unwrap(")
 								.append(annotationMetaEntity.importType(containerType))

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

@@ -54,9 +54,9 @@ boolean singleResult() {
 
 	@Override
 	void executeQuery(StringBuilder declaration, List<String> paramTypes) {
-		tryReturn(declaration);
 		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		tryReturn(declaration);
 		createQuery( declaration );
 		execute( declaration );
 	}

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

@@ -54,17 +54,16 @@ boolean singleResult() {
 	void executeQuery(StringBuilder declaration, List<String> paramTypes) {
 		declaration
 				.append('\n');
-		collectOrdering( declaration, paramTypes );
-		tryReturn( declaration, paramTypes, containerType );
-		castResult( declaration );
 		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		collectOrdering( declaration, paramTypes );
 		handleSorting( declaration, paramTypes, containerType );
+		tryReturn( declaration, paramTypes, containerType );
+		castResult( declaration );
 		createQuery( declaration );
 		handlePageParameters( declaration, paramTypes, containerType );
 		boolean unwrapped = !isUsingEntityManager();
 		unwrapped = enableFetchProfile( declaration, unwrapped );
-		unwrapped = applyOrder( declaration, paramTypes, containerType, unwrapped );
 		execute( declaration, paramTypes, unwrapped );
 	}
 

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

@@ -92,19 +92,17 @@ public String getAttributeDeclarationString() {
 		comment( declaration );
 		modifiers( paramTypes, declaration );
 		preamble( declaration, paramTypes );
+		createSpecification( declaration );
+		handleRestrictionParameters( declaration, paramTypes );
 		collectOrdering( declaration, paramTypes );
+		handleSorting( declaration, paramTypes, containerType );
 		chainSession( declaration );
 		tryReturn( declaration, paramTypes, containerType );
 		castResult( declaration );
-		createSpecification( declaration );
-		handleRestrictionParameters( declaration, paramTypes );
-		handleSorting( declaration, paramTypes, containerType );
 		createQuery( declaration );
 		setParameters( declaration, paramTypes, "");
 		handlePageParameters( declaration, paramTypes, containerType );
-		boolean unwrapped = !isUsingEntityManager();
-		unwrapped = applyOrder( declaration, paramTypes, containerType, unwrapped );
-		execute( declaration, unwrapped );
+		execute( declaration, !isUsingEntityManager() );
 		convertExceptions( declaration );
 		chainSessionEnd( isUpdate, declaration );
 		closingBrace( declaration );
@@ -121,9 +119,15 @@ String specificationType() {
 	void createQuery(StringBuilder declaration) {
 		if ( isUsingSpecification() ) {
 			declaration
-					.append( "\t\t\t.createQuery(" )
-					.append( localSessionName() )
-					.append( ")\n" );
+					.append(localSessionName())
+					.append(".createQuery(_spec.buildCriteriaQuery(")
+					.append(localSessionName());
+			if ( isReactive() ) {
+				declaration.append(".getFactory()");
+			}
+			declaration
+					.append(".getCriteriaBuilder()") // TODO no such method in Reactive!
+					.append( "))\n" );
 		}
 		else {
 			// can't use Specification
@@ -147,19 +151,19 @@ void createQuery(StringBuilder declaration) {
 	void createSpecification(StringBuilder declaration) {
 		if ( returnTypeClass != null && isUsingSpecification() ) {
 			declaration
+					.append( "\tvar _spec = " )
 					.append( annotationMetaEntity.importType( specificationType() ) )
 					.append( ".create(" )
 					.append( annotationMetaEntity.importType( returnTypeClass ) )
 					.append( ".class, " )
 					.append( getConstantName() )
-					.append( ")\n" );
+					.append( ");\n" );
 		}
 	}
 
 	@Override
 	boolean isUsingSpecification() {
 		return returnTypeClass != null
-			&& !isReactive()
 			&& ( hasRestriction() || hasOrder() && !isJakartaCursoredPage(containerType) );
 	}