HHH-19364 use SelectionSpecification for Restrictions in Processor

Author: gavinking

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

@@ -74,13 +74,43 @@ public String getAttributeDeclarationString() {
 
 	abstract String createQueryMethod();
 
+	String specificationType() {
+		return "org.hibernate.query.programmatic.SelectionSpecification";
+	}
+
 	@Override
 	void createQuery(StringBuilder declaration) {
-		declaration
-				.append(localSessionName())
-				.append(".")
-				.append(createQueryMethod())
-				.append("(_query)\n");
+		if ( !isReactive() && hasRestriction() ) {
+			declaration
+					.append( "\t\t\t.createQuery(" )
+					.append( localSessionName() )
+					.append( ")\n" );
+		}
+		else {
+			declaration
+					.append(localSessionName())
+					.append(".")
+					.append(createQueryMethod())
+					.append("(_query)\n");
+		}
+	}
+
+	void createSpecification(StringBuilder declaration) {
+		if ( !isReactive() && hasRestriction() ) {
+			declaration
+					.append( annotationMetaEntity.importType( specificationType() ) )
+					.append( ".create(_query)\n" );
+		}
+	}
+
+	@Override
+	boolean isUsingSpecification() {
+		return !isReactive() && hasRestriction();
+	}
+
+	private boolean hasRestriction() {
+		return parameterTypes().stream()
+				.anyMatch( type -> isRestrictionParam( type ) || isRangeParam( type ) );
 	}
 
 	void createCriteriaQuery(StringBuilder declaration) {

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

@@ -298,7 +298,7 @@ void handleRestrictionParameters(
 			if ( isRestrictionParam(paramType) ) {
 				if ( paramType.startsWith(LIST) || paramType.endsWith("[]") ) {
 					declaration
-							.append( "\t\t\t.addRestriction(" )
+							.append( "\t\t\t.restrict(" )
 							.append( annotationMetaEntity.importType(HIB_RESTRICTION) )
 							.append( ".all(" )
 							.append( paramName )
@@ -307,7 +307,7 @@ void handleRestrictionParameters(
 				}
 				else {
 					declaration
-							.append( "\t\t\t.addRestriction(" )
+							.append( "\t\t\t.restrict(" )
 							.append( paramName )
 							.append( ")\n" );
 				}
@@ -316,7 +316,7 @@ else if ( isRangeParam(paramType) && returnTypeName!= null ) {
 				final TypeElement entityElement = annotationMetaEntity.getContext().getElementUtils()
 						.getTypeElement( returnTypeName );
 				declaration
-						.append("\t\t\t.addRestriction(")
+						.append("\t\t\t.restrict(")
 						.append(annotationMetaEntity.importType(HIB_RESTRICTION))
 						.append(".restrict(")
 						.append(annotationMetaEntity.importType(
@@ -363,7 +363,7 @@ static void closingBrace(StringBuilder declaration) {
 	}
 
 	void unwrapQuery(StringBuilder declaration, boolean unwrapped) {
-		if ( !unwrapped && isUsingEntityManager() ) {
+		if ( !unwrapped && isUsingEntityManager() && !isUsingSpecification() ) {
 			declaration
 					.append("\t\t\t.unwrap(")
 					.append(annotationMetaEntity.importType(HIB_SELECTION_QUERY))
@@ -650,6 +650,10 @@ private boolean hasOrdering(List<String> paramTypes) {
 			|| !orderBys.isEmpty();
 	}
 
+	boolean isUsingSpecification() {
+		return false;
+	}
+
 	protected void executeSelect(
 			StringBuilder declaration,
 			List<String> paramTypes,
@@ -751,7 +755,7 @@ protected void executeSelect(
 					}
 					break;
 				default:
-					if ( isUsingEntityManager() && !unwrapped && mustUnwrap ) {
+					if ( isUsingEntityManager() && !unwrapped && mustUnwrap && !isUsingSpecification() ) {
 						declaration
 								.append("\t\t\t.unwrap(")
 								.append(annotationMetaEntity.importType(containerType))

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

@@ -55,6 +55,8 @@ boolean singleResult() {
 	@Override
 	void executeQuery(StringBuilder declaration, List<String> paramTypes) {
 		tryReturn(declaration);
+		createSpecification( declaration );
+		handleRestrictionParameters( declaration, paramTypes );
 		createQuery( declaration );
 		execute( declaration );
 	}
@@ -75,6 +77,11 @@ String createQueryMethod() {
 				: "createMutationQuery";
 	}
 
+	@Override
+	String specificationType() {
+		return "org.hibernate.query.programmatic.MutationSpecification";
+	}
+
 	private void execute(StringBuilder declaration) {
 		declaration
 				.append("\t\t\t.executeUpdate()");

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

@@ -57,8 +57,9 @@ void executeQuery(StringBuilder declaration, List<String> paramTypes) {
 		collectOrdering( declaration, paramTypes );
 		tryReturn( declaration, paramTypes, containerType );
 		castResult( declaration );
-		createQuery( declaration );
+		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		createQuery( declaration );
 		handlePageParameters( declaration, paramTypes, containerType );
 		boolean unwrapped = !isUsingEntityManager();
 		unwrapped = enableFetchProfile( declaration, unwrapped );

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

@@ -96,8 +96,9 @@ public String getAttributeDeclarationString() {
 		chainSession( declaration );
 		tryReturn( declaration, paramTypes, containerType );
 		castResult( declaration );
-		createQuery( declaration );
+		createSpecification( declaration );
 		handleRestrictionParameters( declaration, paramTypes );
+		createQuery( declaration );
 		setParameters( declaration, paramTypes, "");
 		handlePageParameters( declaration, paramTypes, containerType );
 		boolean unwrapped = !isUsingEntityManager();
@@ -109,21 +110,58 @@ public String getAttributeDeclarationString() {
 		return declaration.toString();
 	}
 
+	String specificationType() {
+		return isUpdate
+				? "org.hibernate.query.programmatic.MutationSpecification"
+				: "org.hibernate.query.programmatic.SelectionSpecification";
+	}
+
 	@Override
 	void createQuery(StringBuilder declaration) {
-		declaration
-				.append(localSessionName())
-				.append('.')
-				.append(createQueryMethod())
-				.append("(")
-				.append(getConstantName());
-		if ( returnTypeClass != null && !isUpdate ) {
+		if ( returnTypeClass != null && !isReactive() && hasRestriction() ) {
+			declaration
+					.append( "\t\t\t.createQuery(" )
+					.append( localSessionName() )
+					.append( ")\n" );
+		}
+		else {
+			// can't use Specification
+			declaration
+					.append(localSessionName())
+					.append('.')
+					.append(createQueryMethod())
+					.append("(")
+					.append(getConstantName());
+			if ( returnTypeClass != null && !isUpdate ) {
+				declaration
+						.append(", ")
+						.append(annotationMetaEntity.importType(returnTypeClass))
+						.append(".class");
+			}
+			declaration.append(")\n");
+		}
+	}
+
+	private void createSpecification(StringBuilder declaration) {
+		if ( returnTypeClass != null && !isReactive() && hasRestriction() ) {
 			declaration
-					.append(", ")
-					.append(annotationMetaEntity.importType(returnTypeClass))
-					.append(".class");
+					.append( annotationMetaEntity.importType( specificationType() ) )
+					.append( ".create(" )
+					.append( annotationMetaEntity.importType( returnTypeClass ) )
+					.append( ".class, " )
+					.append( getConstantName() )
+					.append( ")\n" );
 		}
-		declaration.append(")\n");
+	}
+
+	@Override
+	boolean isUsingSpecification() {
+		return returnTypeClass != null && !isReactive() && hasRestriction();
+	}
+
+	private boolean hasRestriction() {
+		return parameterTypes().stream()
+				.anyMatch( type -> isRestrictionParam( type ) || isRangeParam( type ) );
 	}
 
 	private String createQueryMethod() {