HHH-19382 - Drop incubating SelectionQuery#setOrder methods

Author: sebersole

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java

@@ -44,7 +44,6 @@
 import org.hibernate.query.BindableType;
 import org.hibernate.query.KeyedPage;
 import org.hibernate.query.KeyedResultList;
-import org.hibernate.query.Order;
 import org.hibernate.query.OutputableType;
 import org.hibernate.query.Query;
 import org.hibernate.query.QueryParameter;
@@ -411,16 +410,6 @@ public QueryParameterBindings getParameterBindings() {
 		return parameterBindings;
 	}
 
-	@Override
-	public Query<R> setOrder(List<? extends Order<? super R>> orderList) {
-		throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");
-	}
-
-	@Override
-	public Query<R> setOrder(Order<? super R> order) {
-		throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");
-	}
-
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Parameter registrations

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

@@ -19,7 +19,7 @@
  * <p>
  * This is a convenience class which allows query result ordering rules to be
  * passed around the system before being applied to a {@link Query} by calling
- * {@link org.hibernate.query.programmatic.SelectionSpecification#sort(Order)}.
+ * {@link org.hibernate.query.specification.SelectionSpecification#sort(Order)}.
  * <pre>
  * SelectionSpecification.create(Book.class,
  *             "from Book b join b.authors a where a.name = :name")
@@ -30,7 +30,7 @@
  * </pre>
  * <p>
  * {@code Order}s may be stacked using {@link List#of} and
- * {@link org.hibernate.query.programmatic.SelectionSpecification#resort(List)}.
+ * {@link org.hibernate.query.specification.SelectionSpecification#resort(List)}.
  * <pre>
  * SelectionSpecification.create(Book.class,
  *             "from Book b join b.authors a where a.name = :name")
@@ -51,8 +51,8 @@
  *          used by Hibernate Data Repositories to implement Jakarta Data
  *          query methods.
  *
- * @see org.hibernate.query.programmatic.SelectionSpecification#sort(Order)
- * @see org.hibernate.query.programmatic.SelectionSpecification#resort(List)
+ * @see org.hibernate.query.specification.SelectionSpecification#sort(Order)
+ * @see org.hibernate.query.specification.SelectionSpecification#resort(List)
  * @see org.hibernate.query.restriction.Restriction
  *
  * @author Gavin King

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

@@ -928,11 +928,6 @@ default Query<R> setPage(Page page) {
 	@Override
 	Query<R> setLockMode(LockModeType lockMode);
 
-	@Override @Incubating
-	Query<R> setOrder(List<? extends Order<? super R>> orderList);
-
-	@Override @Incubating
-	Query<R> setOrder(Order<? super R> order);
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// deprecated methods

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

@@ -596,32 +596,6 @@ default Stream<R> stream() {
 	 */
 	SelectionQuery<R> setLockMode(String alias, LockMode lockMode);
 
-	/**
-	 * If the result type of this query is an entity class, add one or more
-	 * {@linkplain Order rules} for ordering the query results.
-	 *
-	 * @param orderList one or more instances of {@link Order}
-	 *
-	 * @see Order
-	 *
-	 * @since 6.3
-	 */
-	@Incubating
-	SelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList);
-
-	/**
-	 * If the result type of this query is an entity class, add a
-	 * {@linkplain Order rule} for ordering the query results.
-	 *
-	 * @param order an instance of {@link Order}
-	 *
-	 * @see Order
-	 *
-	 * @since 6.3
-	 */
-	@Incubating
-	SelectionQuery<R> setOrder(Order<? super R> order);
-
 	/**
 	 * Specifies whether follow-on locking should be applied
 	 */

hibernate-core/src/main/java/org/hibernate/query/programmatic/package-info.java

@@ -19,8 +19,8 @@
 
 /**
  * A rule for restricting query results. This allows restrictions to be added to
- * a {@link org.hibernate.query.programmatic.SelectionSpecification} by calling
- * {@link org.hibernate.query.programmatic.SelectionSpecification#restrict(Restriction)}.
+ * a {@link org.hibernate.query.specification.SelectionSpecification} by calling
+ * {@link org.hibernate.query.specification.SelectionSpecification#restrict(Restriction)}.
  * <pre>
  * SelectionSpecification.create(Book.class)
  *         .restrict(Restriction.like(Book_.title, "%Hibernate%", false))
@@ -47,9 +47,9 @@
  *          is used by Hibernate Data Repositories to implement Jakarta Data
  *          query methods.
  *
- * @see org.hibernate.query.programmatic.SelectionSpecification
- * @see org.hibernate.query.programmatic.MutationSpecification
- * @see org.hibernate.query.programmatic.QuerySpecification#restrict(Restriction)
+ * @see org.hibernate.query.specification.SelectionSpecification
+ * @see org.hibernate.query.specification.MutationSpecification
+ * @see org.hibernate.query.specification.QuerySpecification#restrict(Restriction)
  *
  * @see Path
  * @see Order

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

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.programmatic;
+package org.hibernate.query.specification;
 
 import jakarta.persistence.criteria.CommonAbstractCriteria;
 import jakarta.persistence.criteria.CriteriaUpdate;
@@ -14,7 +14,7 @@
 import org.hibernate.StatelessSession;
 import org.hibernate.query.IllegalMutationQueryException;
 import org.hibernate.query.MutationQuery;
-import org.hibernate.query.programmatic.internal.MutationSpecificationImpl;
+import org.hibernate.query.specification.internal.MutationSpecificationImpl;
 import org.hibernate.query.restriction.Restriction;
 
 /**

hibernate-core/src/main/java/org/hibernate/query/programmatic/MutationSpecification.java renamed to hibernate-core/src/main/java/org/hibernate/query/specification/MutationSpecification.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.programmatic;
+package org.hibernate.query.specification;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;

hibernate-core/src/main/java/org/hibernate/query/programmatic/QuerySpecification.java renamed to hibernate-core/src/main/java/org/hibernate/query/specification/QuerySpecification.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.programmatic;
+package org.hibernate.query.specification;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -15,7 +15,7 @@
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.Order;
 import org.hibernate.query.SelectionQuery;
-import org.hibernate.query.programmatic.internal.SelectionSpecificationImpl;
+import org.hibernate.query.specification.internal.SelectionSpecificationImpl;
 import org.hibernate.query.restriction.Path;
 import org.hibernate.query.restriction.Restriction;
 

hibernate-core/src/main/java/org/hibernate/query/programmatic/SelectionSpecification.java renamed to hibernate-core/src/main/java/org/hibernate/query/specification/SelectionSpecification.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.programmatic.internal;
+package org.hibernate.query.specification.internal;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;
@@ -15,7 +15,7 @@
 import org.hibernate.SharedSessionContract;
 import org.hibernate.StatelessSession;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.query.programmatic.MutationSpecification;
+import org.hibernate.query.specification.MutationSpecification;
 import org.hibernate.query.IllegalMutationQueryException;
 import org.hibernate.query.MutationQuery;
 import org.hibernate.query.restriction.Restriction;