Skip to content

Support setOrder #1815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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.reactive.common.AffectedEntities;
import org.hibernate.reactive.common.Identifier;
Expand Down Expand Up @@ -353,6 +354,30 @@ default SelectionQuery<R> setLockMode(String alias, LockModeType lockModeType) {
// */
// 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
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;
Expand Down Expand Up @@ -68,6 +69,18 @@ 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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
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.SelectionQuery;
import org.hibernate.reactive.query.ReactiveSelectionQuery;

Expand Down Expand Up @@ -118,7 +118,7 @@ public SelectionQuery<R> setFirstResult(int startPosition) {
}

@Override
public Mutiny.SelectionQuery<R> setPage(Page page) {
public SelectionQuery<R> setPage(Page page) {
setMaxResults( page.getMaxResults() );
setFirstResult( page.getFirstResult() );
return this;
Expand Down Expand Up @@ -191,6 +191,19 @@ 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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
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;
Expand Down Expand Up @@ -123,6 +124,10 @@ default CompletionStage<List<R>> getReactiveResultList() {

void applyGraph(RootGraphImplementor<?> graph, GraphSemantic semantic);

ReactiveSelectionQuery<R> setOrder(List<Order<? super R>> orderList);

ReactiveSelectionQuery<R> setOrder(Order<? super R> order);

ReactiveSelectionQuery<R> enableFetchProfile(String profileName);

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.hibernate.internal.AbstractSharedSessionContract;
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;
Expand Down Expand Up @@ -473,6 +474,18 @@ public ReactiveNativeQueryImpl<R> setLockMode(String alias, LockMode lockMode) {
return this;
}

@Override
public ReactiveNativeQueryImpl<R> setOrder(List<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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
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;
Expand Down Expand Up @@ -167,6 +169,12 @@ <P> ReactiveSqmSelectionQuery<R> setParameterList(
@Override
ReactiveSqmSelectionQuery<R> setTimeout(int timeout);

@Override
ReactiveSqmSelectionQuery<R> setOrder(List<Order<? super R>> orders);

@Override
ReactiveSqmSelectionQuery<R> setOrder(Order<? super R> order);

@Override
ReactiveSqmSelectionQuery<R> setFetchSize(int fetchSize);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
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;
Expand Down Expand Up @@ -459,6 +460,18 @@ public ReactiveQuerySqmImpl<R> setLockMode(String alias, LockMode lockMode) {
return this;
}

@Override
public ReactiveQuerySqmImpl<R> setOrder(List<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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
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;
Expand Down Expand Up @@ -251,6 +252,18 @@ public ReactiveSqmSelectionQueryImpl<R> setFollowOnLocking(boolean enable) {
return this;
}

@Override
public ReactiveSqmSelectionQueryImpl<R> setOrder(List<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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
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.reactive.common.AffectedEntities;
import org.hibernate.reactive.common.Identifier;
Expand Down Expand Up @@ -347,6 +348,30 @@ default SelectionQuery<R> setLockMode(String alias, LockModeType lockModeType) {
// */
// 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
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.query.ReactiveQuery;
import org.hibernate.reactive.stage.Stage;
Expand Down Expand Up @@ -59,6 +60,18 @@ public Query<R> setLockMode(LockMode lockMode) {
return this;
}

@Override
public Stage.SelectionQuery<R> setOrder(List<Order<? super R>> orders) {
delegate.setOrder( orders );
return this;
}

@Override
public Stage.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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package org.hibernate.reactive.stage.impl;

import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.concurrent.CompletionStage;

Expand All @@ -13,7 +14,10 @@
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.logging.impl.Log;
import org.hibernate.reactive.logging.impl.LoggerFactory;
import org.hibernate.reactive.query.ReactiveSelectionQuery;
import org.hibernate.reactive.stage.Stage.SelectionQuery;

Expand All @@ -25,6 +29,7 @@
import jakarta.persistence.Parameter;

public class StageSelectionQueryImpl<T> implements SelectionQuery<T> {
private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
private final ReactiveSelectionQuery<T> delegate;

public StageSelectionQueryImpl(ReactiveSelectionQuery<T> delegate) {
Expand Down Expand Up @@ -188,6 +193,18 @@ public SelectionQuery<T> setLockMode(String alias, LockMode lockMode) {
return this;
}

@Override
public SelectionQuery<T> setOrder(List<Order<? super T>> orders) {
delegate.setOrder( orders );
return this;
}

@Override
public SelectionQuery<T> setOrder(Order<? super T> order) {
delegate.setOrder( order );
return this;
}

@Override
public SelectionQuery<T> setParameter(String name, Object value) {
delegate.setParameter( name, value );
Expand Down
Loading