HHH-19364 begin migrating Processor to XxxxxSpecification

hibernate-core/src/main/java/org/hibernate/StatelessSession.java

@@ -383,8 +383,6 @@ public interface StatelessSession extends SharedSessionContract {
 	 *
 	 * @param entityGraph The {@link EntityGraph}, interpreted as a
 	 * {@linkplain org.hibernate.graph.GraphSemantic#LOAD load graph}
-	 * @param graphSemantic a {@link GraphSemantic} specifying
-	 *                      how the graph should be interpreted
 	 * @param ids The ids of the entities to retrieve
 	 * @return an ordered list of detached entity instances, with
 	 *         null elements representing missing entities

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

@@ -26,7 +26,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.transform.ResultTransformer;
 
@@ -935,9 +934,6 @@ default Query<R> setPage(Page page) {
 	@Override @Incubating
 	Query<R> setOrder(Order<? super R> order);
 
-	@Override @Incubating
-	Query<R> addRestriction(Restriction<? super R> restriction);
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// deprecated methods
 

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

@@ -35,7 +35,6 @@
 import jakarta.persistence.TemporalType;
 import org.hibernate.engine.profile.DefaultFetchProfile;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.query.restriction.Restriction;
 
 /**
  * Within the context of an active {@linkplain org.hibernate.Session session},
@@ -623,19 +622,6 @@ default Stream<R> stream() {
 	@Incubating
 	SelectionQuery<R> setOrder(Order<? super R> order);
 
-	/**
-	 * If the result type of this query is an entity class, add a
-	 * {@linkplain Restriction rule} for restricting the query results.
-	 *
-	 * @param restriction an instance of {@link Restriction}
-	 *
-	 * @see Restriction
-	 *
-	 * @since 7.0
-	 */
-	@Incubating
-	SelectionQuery<R> addRestriction(Restriction<? super R> restriction);
-
 	/**
 	 * Specifies whether follow-on locking should be applied
 	 */

hibernate-core/src/main/java/org/hibernate/query/restriction/Restriction.java

@@ -12,7 +12,6 @@
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.query.Order;
-import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.query.range.Range;
 
@@ -21,7 +20,7 @@
 /**
  * A rule for restricting query results. This allows restrictions to be added to
  * a {@link org.hibernate.query.programmatic.SelectionSpecification} by calling
- * {@link SelectionQuery#addRestriction(Restriction)}.
+ * {@link org.hibernate.query.programmatic.SelectionSpecification#restrict(Restriction)}.
  * <pre>
  * SelectionSpecification.create(Book.class)
  *         .restrict(Restriction.like(Book_.title, "%Hibernate%", false))

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

@@ -39,7 +39,6 @@
 import org.hibernate.query.Order;
 import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
 import org.hibernate.query.named.NamedQueryMemento;
@@ -301,11 +300,6 @@ public Query<R> setOrder(Order<? super R> order) {
 		throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
 	}
 
-	@Override
-	public Query<R> addRestriction(Restriction<? super R> restriction) {
-		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

@@ -55,7 +55,6 @@
 import org.hibernate.query.PathException;
 import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
 import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
@@ -1662,11 +1661,6 @@ public Query<R> setOrder(Order<? super R> order) {
 		throw new UnsupportedOperationException("Ordering not currently supported for native queries");
 	}
 
-	@Override
-	public Query<R> addRestriction(Restriction<? super R> restriction) {
-		throw new UnsupportedOperationException("Restrictions not currently supported for native queries");
-	}
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Hints
 

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

@@ -15,7 +15,6 @@
 import org.hibernate.query.Order;
 import org.hibernate.query.Page;
 import org.hibernate.query.QueryLogging;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.JpaSelection;
 import org.hibernate.query.hql.internal.QuerySplitter;
@@ -205,16 +204,16 @@ public SelectionQuery<R> setOrder(Order<? super R> order) {
 		return this;
 	}
 
-	@Override
-	public SelectionQuery<R> addRestriction(Restriction<? super R> restriction) {
-		final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext( SqmQuerySource.CRITERIA ) );
-		restriction.apply( selectStatement, selectStatement.<R>getRoot( 0, getExpectedResultType() ) );
-		// 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> addRestriction(Restriction<? super R> restriction) {
+//		final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext( SqmQuerySource.CRITERIA ) );
+//		restriction.apply( selectStatement, selectStatement.<R>getRoot( 0, getExpectedResultType() ) );
+//		// 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) {

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

@@ -47,7 +47,6 @@
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
 import org.hibernate.query.internal.ParameterMetadataImpl;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.spi.DelegatingQueryOptions;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.HqlInterpretation;
@@ -781,12 +780,6 @@ public Query<R> setOrder(Order<? super R> order) {
 		return this;
 	}
 
-	@Override
-	public Query<R> addRestriction(Restriction<? super R> restriction) {
-		super.addRestriction( restriction );
-		return this;
-	}
-
 	@Override
 	public Query<R> setOrder(List<? extends Order<? super R>> orders) {
 		super.setOrder(orders);

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

@@ -865,30 +865,25 @@ public Map<JpaCriteriaParameter<?>, SqmJpaCriteriaParameterWrapper<?>> getJpaCri
 
 	public static SqmSortSpecification sortSpecification(SqmSelectStatement<?> sqm, Order<?> order) {
 		final List<SqmSelectableNode<?>> items = sqm.getQuerySpec().getSelectClause().getSelectionItems();
-		final int element = order.getElement();
-		if ( element < 1) {
-			throw new IllegalQueryOperationException("Cannot order by element " + element
-					+ " (the first select item is element 1)");
-		}
-		if ( element > items.size() ) {
-			throw new IllegalQueryOperationException("Cannot order by element " + element
-					+ " (there are only " + items.size() + " select items)");
-		}
-		final SqmSelectableNode<?> selected = items.get( element-1 );
+		final SqmSelectableNode<?> selected = selectedNode( sqm, order ); // does validation by side effect!
+		return createSortSpecification( sqm, order, items, selected );
+	}
 
+	private static SqmSortSpecification createSortSpecification(
+			SqmSelectStatement<?> sqm, Order<?> order, List<SqmSelectableNode<?>> items, SqmSelectableNode<?> selected) {
 		final NodeBuilder builder = sqm.nodeBuilder();
 		if ( order.getEntityClass() == null ) {
 			// ordering by an element of the select list
 			return new SqmSortSpecification(
-					new SqmAliasedNodeRef( element, builder.getIntegerType(), builder ),
+					new SqmAliasedNodeRef( order.getElement(), builder.getIntegerType(), builder ),
 					order.getDirection(),
 					order.getNullPrecedence(),
 					order.isCaseInsensitive()
 			);
 		}
 		else {
 			// ordering by an attribute of the returned entity
-			if ( items.size() == 1) {
+			if ( items.size() <= 1) {
 				if ( selected instanceof SqmFrom<?, ?> root ) {
 					if ( !order.getEntityClass().isAssignableFrom( root.getJavaType() ) ) {
 						throw new IllegalQueryOperationException("Select item was of wrong entity type");
@@ -898,7 +893,10 @@ public static SqmSortSpecification sortSpecification(SqmSelectStatement<?> sqm,
 					while ( tokens.hasMoreTokens() ) {
 						path = path.get( tokens.nextToken() );
 					}
-					return builder.sort( path, order.getDirection(), order.getNullPrecedence(), order.isCaseInsensitive() );
+					return builder.sort( path,
+							order.getDirection(),
+							order.getNullPrecedence(),
+							order.isCaseInsensitive() );
 				}
 				else {
 					throw new IllegalQueryOperationException("Select item was not an entity type");
@@ -910,6 +908,32 @@ public static SqmSortSpecification sortSpecification(SqmSelectStatement<?> sqm,
 		}
 	}
 
+	private static SqmSelectableNode<?> selectedNode(SqmSelectStatement<?> sqm, Order<?> order) {
+		final int element = order.getElement();
+		if ( element < 1) {
+			throw new IllegalQueryOperationException("Cannot order by element " + element
+					+ " (the first select item is element 1)");
+		}
+		final var selectionItems = sqm.getQuerySpec().getSelectClause().getSelectionItems();
+		final int items = selectionItems.size();
+		if ( items == 0 && element == 1 ) {
+			if ( order.getEntityClass() == null || sqm.getQuerySpec().getRootList().size() > 1 ) {
+				throw new IllegalQueryOperationException("Cannot order by element " + element
+						+ " (there is no select list)");
+			}
+			else {
+				return sqm.getQuerySpec().getRootList().get(0);
+			}
+		}
+		else if ( element > items ) {
+			throw new IllegalQueryOperationException( "Cannot order by element " + element
+					+ " (there are only " + items + " select items)");
+		}
+		else {
+			return selectionItems.get( element - 1 );
+		}
+	}
+
 	public static boolean isSelectionAssignableToResultType(SqmSelection<?> selection, Class<?> expectedResultType) {
 		if ( expectedResultType == null ) {
 			return true;

hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java

@@ -31,7 +31,6 @@
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
-import org.hibernate.query.restriction.Restriction;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.SqmSelectionQuery;
 import org.hibernate.query.sqm.tree.SqmStatement;
@@ -310,12 +309,6 @@ public SqmSelectionQueryImplementor<R> setOrder(Order<? super R> order) {
 		return this;
 	}
 
-	@Override
-	public SqmSelectionQueryImplementor<R> addRestriction(Restriction<? super R> restriction) {
-		getDelegate().addRestriction( restriction );
-		return this;
-	}
-
 	@Override
 	public SqmSelectionQueryImplementor<R> setFollowOnLocking(boolean enable) {
 		getDelegate().setFollowOnLocking( enable );