HHH-18979 improved approach to multiple Restrictions

Author: gavinking

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

@@ -930,9 +930,6 @@ default Query<R> setPage(Page page) {
 	@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/Restriction.java

@@ -12,6 +12,8 @@
 import org.hibernate.Internal;
 import org.hibernate.query.range.Range;
 
+import java.util.List;
+
 /**
  * A rule for restricting query results.
  * <p>
@@ -158,14 +160,22 @@ static <T> Restriction<T> notContains(SingularAttribute<T, String> attribute, St
 		return contains( attribute, substring ).negated();
 	}
 
+	static <T> Restriction<T> and(List<? extends Restriction<? super T>> restrictions) {
+		return new Conjunction<>( restrictions );
+	}
+
+	static <T> Restriction<T> or(List<? extends Restriction<? super T>> restrictions) {
+		return new Disjunction<>( restrictions );
+	}
+
 	@SafeVarargs
-	static <T> Restriction<T> and(Restriction<T>... restrictions) {
-		return new Conjunction<>( java.util.List.of( restrictions ) );
+	static <T> Restriction<T> and(Restriction<? super T>... restrictions) {
+		return new Conjunction<T>( java.util.List.of( restrictions ) );
 	}
 
 	@SafeVarargs
-	static <T> Restriction<T> or(Restriction<T>... restrictions) {
-		return new Disjunction<>( java.util.List.of( restrictions ) );
+	static <T> Restriction<T> or(Restriction<? super T>... restrictions) {
+		return new Disjunction<T>( java.util.List.of( restrictions ) );
 	}
 
 	static <T> Restriction<T> unrestricted() {

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

@@ -618,19 +618,6 @@ 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,11 +310,6 @@ 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

@@ -1674,11 +1674,6 @@ public Query<R> addRestriction(Restriction<? super R> restriction) {
 		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");
-	}
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Hints
 

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

@@ -4,7 +4,6 @@
  */
 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;
@@ -40,7 +39,6 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -162,23 +160,6 @@ 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,12 +764,6 @@ 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,20 +294,14 @@ void handleRestrictionParameters(
 			final String paramName = paramNames.get(i);
 			final String paramType = paramTypes.get(i);
 			if ( isRestrictionParam(paramType) ) {
-				if ( paramType.startsWith(LIST) ) {
+				if ( paramType.startsWith(LIST) || paramType.endsWith("[]") ) {
 					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( "\t\t\t.addRestriction(" )
+							.append( annotationMetaEntity.importType(HIB_RESTRICTION) )
+							.append( ".and(" )
 							.append( paramName )
 							.append( "))\n" );
+
 				}
 				else {
 					declaration

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

@@ -9,6 +9,7 @@
 import org.hibernate.annotations.processing.HQL;
 import org.hibernate.query.Order;
 import org.hibernate.query.Restriction;
+import org.hibernate.query.range.Range;
 
 import java.util.List;
 
@@ -36,4 +37,7 @@ public interface Bookshelf {
 	List<Book> books4(Order<? super Book>... orders);
 	@HQL("from Book")
 	List<Book> book5(List<Restriction<? super Book>> restrictions, List<Order<? super Book>> orders);
+
+	@Find Book[] books(Range<String> isbn);
+	@Find List<Book> booksByTitle(Range<String> title);
 }