[#2220] Drop setOrder methods

see https://hibernate.atlassian.net/browse/HHH-19382

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/Mutiny.java

@@ -5,11 +5,6 @@
  */
 package org.hibernate.reactive.mutiny;
 
-import java.lang.invoke.MethodHandles;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
 import org.hibernate.Cache;
 import org.hibernate.CacheMode;
 import org.hibernate.Filter;
@@ -23,7 +18,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.jpa.internal.util.FlushModeTypeHelper;
 import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.query.Order;
 import org.hibernate.query.Page;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
@@ -49,6 +43,10 @@
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.Metamodel;
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
@@ -360,37 +358,6 @@ default SelectionQuery<R> setLockMode(String alias, LockModeType lockModeType) {
 			return setLockMode( alias, convertToLockMode(lockModeType) );
 		}
 
-//		/**
-//		 * Set the {@link LockOptions} to use for the whole query.
-//		 *
-//		 * @see org.hibernate.query.Query#setLockOptions(LockOptions)
-//		 */
-//		Query<R> setLockOptions(LockOptions lockOptions);
-
-		/**
-		 * 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
-		 *
-		 * @see org.hibernate.query.Query#setOrder(List)
-		 */
-		SelectionQuery<R> setOrder(List<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
-		 *
-		 * @see org.hibernate.query.Query#setOrder(Order)
-		 */
-		SelectionQuery<R> setOrder(Order<? super R> order);
-
 		/**
 		 * Set the {@link EntityGraph} that will be used as a fetch plan for
 		 * the root entity returned by this query.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinyQueryImpl.java

@@ -5,16 +5,11 @@
  */
 package org.hibernate.reactive.mutiny.impl;
 
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Supplier;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.LockMode;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.query.Order;
 import org.hibernate.query.Page;
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.mutiny.Mutiny.Query;
@@ -27,6 +22,9 @@
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Parameter;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
 
 public class MutinyQueryImpl<R> implements Query<R> {
 
@@ -74,18 +72,6 @@ public Query<R> setLockMode(LockMode lockMode) {
 		return this;
 	}
 
-	@Override
-	public Mutiny.SelectionQuery<R> setOrder(List<Order<? super R>> orders) {
-		delegate.setOrder( orders );
-		return this;
-	}
-
-	@Override
-	public Mutiny.SelectionQuery<R> setOrder(Order<? super R> order) {
-		delegate.setOrder( (List<Order<? super R>>) order );
-		return this;
-	}
-
 	@Override
 	public Query<R> setPlan(EntityGraph<R> entityGraph) {
 		delegate.applyGraph( (RootGraphImplementor<?>) entityGraph, GraphSemantic.FETCH );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySelectionQueryImpl.java

@@ -5,16 +5,11 @@
  */
 package org.hibernate.reactive.mutiny.impl;
 
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Supplier;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.LockMode;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.query.Order;
 import org.hibernate.query.Page;
 import org.hibernate.reactive.mutiny.Mutiny.SelectionQuery;
 import org.hibernate.reactive.query.ReactiveSelectionQuery;
@@ -26,6 +21,9 @@
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Parameter;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
 
 public class MutinySelectionQueryImpl<R> implements SelectionQuery<R> {
 	private final MutinySessionFactoryImpl factory;
@@ -196,19 +194,6 @@ public SelectionQuery<R> setLockMode(String alias, LockMode lockMode) {
 		return this;
 	}
 
-	@Override
-	public SelectionQuery<R> setOrder(List<Order<? super R>> orders) {
-		delegate.setOrder( orders );
-		return this;
-	}
-
-	@Override
-	public SelectionQuery<R> setOrder(Order<? super R> order) {
-		delegate.setOrder( order );
-		return this;
-	}
-
-
 	@Override
 	public SelectionQuery<R> setParameter(String name, Object value) {
 		delegate.setParameter( name, value );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveSelectionQuery.java

@@ -5,15 +5,6 @@
  */
 package org.hibernate.reactive.query;
 
-import java.time.Instant;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.LockMode;
@@ -22,7 +13,6 @@
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.query.BindableType;
 import org.hibernate.query.CommonQueryContract;
-import org.hibernate.query.Order;
 import org.hibernate.query.QueryParameter;
 
 import jakarta.persistence.CacheRetrieveMode;
@@ -31,6 +21,14 @@
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
+import java.time.Instant;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 
 /**
  * @see org.hibernate.query.SelectionQuery
@@ -123,10 +121,6 @@ default CompletionStage<List<R>> getReactiveResultList() {
 
 	void applyGraph(RootGraphImplementor<?> graph, GraphSemantic semantic);
 
-	ReactiveSelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList);
-
-	ReactiveSelectionQuery<R> setOrder(Order<? super R> order);
-
 	ReactiveSelectionQuery<R> enableFetchProfile(String profileName);
 
 	@Override

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

@@ -28,7 +28,6 @@
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.BasicDomainType;
 import org.hibernate.query.BindableType;
-import org.hibernate.query.Order;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
@@ -528,18 +527,6 @@ public ReactiveNativeQueryImpl<R> setLockMode(String alias, LockMode lockMode) {
 		return this;
 	}
 
-	@Override
-	public ReactiveNativeQueryImpl<R> setOrder(List<? extends Order<? super R>> orders) {
-		super.setOrder( orders );
-		return this;
-	}
-
-	@Override
-	public ReactiveNativeQueryImpl<R> setOrder(Order<? super R> order) {
-		super.setOrder( order );
-		return this;
-	}
-
 	@Override
 	public ReactiveNativeQueryImpl<R> setComment(String comment) {
 		super.setComment( comment );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java

@@ -9,13 +9,11 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.query.BindableType;
-import org.hibernate.query.Order;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.spi.SqmQuery;
 import org.hibernate.reactive.query.ReactiveSelectionQuery;
@@ -169,12 +167,6 @@ <P> ReactiveSqmSelectionQuery<R> setParameterList(
 	@Override
 	ReactiveSqmSelectionQuery<R> setTimeout(int timeout);
 
-	@Override
-	ReactiveSqmSelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList);
-
-	@Override
-	ReactiveSqmSelectionQuery<R> setOrder(Order<? super R> order);
-
 	@Override
 	ReactiveSqmSelectionQuery<R> setFetchSize(int fetchSize);
 

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

@@ -34,7 +34,6 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.BindableType;
 import org.hibernate.query.IllegalQueryOperationException;
-import org.hibernate.query.Order;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
@@ -478,18 +477,6 @@ public ReactiveQuerySqmImpl<R> setLockMode(String alias, LockMode lockMode) {
 		return this;
 	}
 
-	@Override
-	public ReactiveQuerySqmImpl<R> setOrder(List<? extends Order<? super R>> orders) {
-		super.setOrder( orders );
-		return this;
-	}
-
-	@Override
-	public ReactiveQuerySqmImpl<R> setOrder(Order<? super R> order) {
-		super.setOrder( order );
-		return this;
-	}
-
 	@Override
 	public <T> ReactiveQuerySqmImpl<T> setTupleTransformer(TupleTransformer<T> transformer) {
 		throw new UnsupportedOperationException();

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

@@ -6,17 +6,6 @@
 package org.hibernate.reactive.query.sqm.internal;
 
 
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-import java.util.stream.Stream;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -26,7 +15,6 @@
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.internal.util.collections.IdentitySet;
 import org.hibernate.query.BindableType;
-import org.hibernate.query.Order;
 import org.hibernate.query.QueryLogging;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
@@ -47,6 +35,16 @@
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
+import java.util.stream.Stream;
 
 import static org.hibernate.query.spi.SqlOmittingQueryOptions.omitSqlQueryOptions;
 
@@ -258,18 +256,6 @@ public ReactiveSqmSelectionQueryImpl<R> setFollowOnLocking(boolean enable) {
 		return this;
 	}
 
-	@Override
-	public ReactiveSqmSelectionQueryImpl<R> setOrder(List<? extends Order<? super R>> orders) {
-		super.setOrder( orders );
-		return this;
-	}
-
-	@Override
-	public ReactiveSqmSelectionQueryImpl<R> setOrder(Order<? super R> order) {
-		super.setOrder( order );
-		return this;
-	}
-
 	@Override
 	public ReactiveSqmSelectionQueryImpl<R> setFetchSize(int fetchSize) {
 		super.setFetchSize( fetchSize );