HHH-18979 handle vararg and List of Restriction and Order

Author: gavinking

hibernate-core/src/main/java/org/hibernate/query/Query.java

@@ -927,9 +927,12 @@ default Query<R> setPage(Page page) {
 	@Override @Incubating
 	Query<R> setOrder(Order<? super R> order);
 
-	@Override
+	@Override @Incubating
 	Query<R> addRestriction(Restriction<? super R> restriction);
 
+	@Override @Incubating
+	Query<R> addRestrictions(List<Restriction<? super R>> restrictionList);
+
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// deprecated methods
 

hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java

@@ -618,6 +618,19 @@ default Stream<R> stream() {
 	@Incubating
 	SelectionQuery<R> addRestriction(Restriction<? super R> restriction);
 
+	/**
+	 * If the result type of this query is an entity class, add a
+	 * {@linkplain Restriction rule} for restricting the query results.
+	 *
+	 * @param restrictionList a list of {@link Restriction}s
+	 *
+	 * @see Restriction
+	 *
+	 * @since 7.0
+	 */
+	@Incubating
+	SelectionQuery<R> addRestrictions(List<Restriction<? super R>> restrictionList);
+
 	/**
 	 * Specifies whether follow-on locking should be applied
 	 */

hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java

@@ -310,6 +310,11 @@ public Query<R> addRestriction(Restriction<? super R> restriction) {
 		throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
 	}
 
+	@Override
+	public Query<R> addRestrictions(List<Restriction<? super R>> restrictionList) {
+		throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
+	}
+
 	@Override
 	public String getComment() {
 		return super.getComment();

hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java

@@ -1671,7 +1671,12 @@ public Query<R> setOrder(Order<? super R> order) {
 
 	@Override
 	public Query<R> addRestriction(Restriction<? super R> restriction) {
-		throw new UnsupportedOperationException("Ordering not currently supported for native queries");
+		throw new UnsupportedOperationException("Restrictions not currently supported for native queries");
+	}
+
+	@Override
+	public Query<R> addRestrictions(List<Restriction<? super R>> restrictionList) {
+		throw new UnsupportedOperationException("Restrictions not currently supported for native queries");
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.query.sqm.internal;
 
+import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -39,6 +40,7 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -160,6 +162,23 @@ public SelectionQuery<R> addRestriction(Restriction<? super R> restriction) {
 		return this;
 	}
 
+	@Override
+	public SelectionQuery<R> addRestrictions(List<Restriction<? super R>> restrictionList) {
+		final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
+		final Root<? extends R> root = (Root<? extends R>) selectStatement.getRootList().get( 0 );
+		final List<Predicate> list = new ArrayList<>( restrictionList.size() );
+		list.add( selectStatement.getRestriction() );
+		for ( var restriction : restrictionList ) {
+			list.add( restriction.toPredicate( root, selectStatement.nodeBuilder() ) );
+		}
+		selectStatement.where( list.toArray(new Predicate[0]) );
+		// TODO: when the QueryInterpretationCache can handle caching criteria queries,
+		//       simply cache the new SQM as if it were a criteria query, and remove this:
+		getQueryOptions().setQueryPlanCachingEnabled( false );
+		setSqmStatement( selectStatement );
+		return this;
+	}
+
 	@Override
 	public SelectionQuery<R> setPage(Page page) {
 		setMaxResults( page.getMaxResults() );

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java

@@ -764,6 +764,12 @@ public Query<R> addRestriction(Restriction<? super R> restriction) {
 		return this;
 	}
 
+	@Override
+	public Query<R> addRestrictions(List<Restriction<? super R>> restrictionList) {
+		super.addRestrictions( restrictionList );
+		return this;
+	}
+
 	@Override
 	public Query<R> setOrder(List<? extends Order<? super R>> orders) {
 		super.setOrder(orders);

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

@@ -294,10 +294,27 @@ void handleRestrictionParameters(
 			final String paramName = paramNames.get(i);
 			final String paramType = paramTypes.get(i);
 			if ( isRestrictionParam(paramType) ) {
-				declaration
-						.append("\t\t\t.addRestriction(")
-						.append(paramName)
-						.append(")\n");
+				if ( paramType.startsWith(LIST) ) {
+					declaration
+							.append( "\t\t\t.addRestrictions(" )
+							.append( paramName )
+							.append( ")\n" );
+
+				}
+				else if ( paramType.endsWith("[]") ) {
+					declaration
+							.append( "\t\t\t.addRestrictions(" )
+							.append( annotationMetaEntity.importType(LIST) )
+							.append( ".of(" )
+							.append( paramName )
+							.append( "))\n" );
+				}
+				else {
+					declaration
+							.append( "\t\t\t.addRestriction(" )
+							.append( paramName )
+							.append( ")\n" );
+				}
 			}
 			else if ( isRangeParam(paramType) ) {
 				declaration
@@ -378,11 +395,12 @@ static boolean isOrderParam(String parameterType) {
 		return parameterType.startsWith(HIB_ORDER)
 			|| parameterType.startsWith(LIST + "<" + HIB_ORDER)
 			|| parameterType.startsWith(JD_SORT)
-			|| parameterType.startsWith(JD_ORDER);
+			|| parameterType.startsWith(JD_ORDER) && !parameterType.endsWith("[]");
 	}
 
 	static boolean isRestrictionParam(String parameterType) {
-		return parameterType.startsWith(HIB_RESTRICTION);
+		return parameterType.startsWith(HIB_RESTRICTION)
+			|| parameterType.startsWith(LIST + "<" + HIB_RESTRICTION);
 	}
 
 	static boolean isRangeParam(String parameterType) {

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

@@ -1590,7 +1590,7 @@ else if ( returnType.getKind() == TypeKind.DECLARED ) {
 				}
 				else {
 					for ( VariableElement parameter : method.getParameters() ) {
-						final String type = typeName(parameter.asType());
+						final String type = parameter.asType().toString();
 						if ( isPageParam(type) ) {
 							message( parameter, "pagination would have no effect", Diagnostic.Kind.ERROR);
 						}
@@ -1671,7 +1671,7 @@ private void createCriteriaFinder(
 	private void checkFinderParameter(TypeElement entity, VariableElement parameter) {
 		final Types types = context.getTypeUtils();
 		final TypeMirror parameterType = parameterType(parameter);
-		final String typeName = typeName( parameterType );
+		final String typeName = parameterType.toString();
 		if ( isOrderParam( typeName ) || isRestrictionParam( typeName ) ) {
 			final TypeMirror typeArgument = getTypeArgument( parameterType, entity );
 			if ( typeArgument == null ) {
@@ -1819,8 +1819,8 @@ private OrderBy orderByExpression(AnnotationMirror orderBy, TypeElement entityTy
 		}
 	}
 
-	private static boolean isFinderParameterMappingToAttribute(VariableElement param) {
-		final String typeName = typeName( param.asType() );
+	private static boolean isFinderParameterMappingToAttribute(VariableElement parameter) {
+		final String typeName = parameter.asType().toString();
 		return !isSpecialParam(typeName)
 			|| isRangeParam(typeName);
 	}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/Book.java

@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.restriction;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+public class Book {
+	@Id
+	String isbn;
+	String title;
+	String author;
+}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/restriction/Bookshelf.java

@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.restriction;
+
+import org.hibernate.StatelessSession;
+import org.hibernate.annotations.processing.Find;
+import org.hibernate.annotations.processing.HQL;
+import org.hibernate.query.Order;
+import org.hibernate.query.Restriction;
+
+import java.util.List;
+
+
+public interface Bookshelf {
+	StatelessSession session();
+	@Find Book book(String isbn);
+	@Find
+	List<Book> books(Restriction<? super Book> restriction);
+	@Find
+	List<Book> books(Restriction<? super Book>... restrictions);
+	@Find
+	List<Book> books(Order<? super Book> order);
+	@Find
+	List<Book> books(Order<? super Book>... orders);
+	@Find
+	List<Book> books(List<Restriction<? super Book>> restrictions, List<Order<? super Book>> orders);
+	@HQL("from Book")
+	List<Book> books1(Restriction<? super Book> restriction);
+	@HQL("from Book")
+	List<Book> books2(Restriction<? super Book>... restrictions);
+	@HQL("from Book")
+	List<Book> books3(Order<? super Book> order);
+	@HQL("from Book")
+	List<Book> books4(Order<? super Book>... orders);
+	@HQL("from Book")
+	List<Book> book5(List<Restriction<? super Book>> restrictions, List<Order<? super Book>> orders);
+}