Skip to content

Commit 0292679

Browse files
beikovbeikov
committed
Remove addRestriction and setOrder APIs from SelectionQuery
1 parent 20c2288 commit 0292679

File tree

9 files changed

+1
-176
lines changed

9 files changed

+1
-176
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.hibernate.query.BindableType;
4545
import org.hibernate.query.KeyedPage;
4646
import org.hibernate.query.KeyedResultList;
47-
import org.hibernate.query.Order;
4847
import org.hibernate.query.OutputableType;
4948
import org.hibernate.query.Query;
5049
import org.hibernate.query.QueryParameter;
@@ -411,16 +410,6 @@ public QueryParameterBindings getParameterBindings() {
411410
return parameterBindings;
412411
}
413412

414-
@Override
415-
public Query<R> setOrder(List<? extends Order<? super R>> orderList) {
416-
throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");
417-
}
418-
419-
@Override
420-
public Query<R> setOrder(Order<? super R> order) {
421-
throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");
422-
}
423-
424413

425414
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
426415
// Parameter registrations

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.hibernate.dialect.Dialect;
2727
import org.hibernate.graph.GraphSemantic;
2828
import org.hibernate.graph.RootGraph;
29-
import org.hibernate.query.restriction.Restriction;
3029
import org.hibernate.query.spi.QueryOptions;
3130
import org.hibernate.transform.ResultTransformer;
3231

@@ -929,15 +928,6 @@ default Query<R> setPage(Page page) {
929928
@Override
930929
Query<R> setLockMode(LockModeType lockMode);
931930

932-
@Override @Incubating
933-
Query<R> setOrder(List<? extends Order<? super R>> orderList);
934-
935-
@Override @Incubating
936-
Query<R> setOrder(Order<? super R> order);
937-
938-
@Override @Incubating
939-
Query<R> addRestriction(Restriction<? super R> restriction);
940-
941931
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
942932
// deprecated methods
943933

‎hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.hibernate.query;
66

77
import jakarta.persistence.EntityGraph;
8+
import org.hibernate.Incubating;
89
import org.hibernate.query.criteria.JpaCriteriaInsert;
910

1011
import jakarta.persistence.TypedQueryReference;

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -603,45 +603,6 @@ default Stream<R> stream() {
603603
*/
604604
SelectionQuery<R> setLockMode(String alias, LockMode lockMode);
605605

606-
/**
607-
* If the result type of this query is an entity class, add one or more
608-
* {@linkplain Order rules} for ordering the query results.
609-
*
610-
* @param orderList one or more instances of {@link Order}
611-
*
612-
* @see Order
613-
*
614-
* @since 6.3
615-
*/
616-
@Incubating
617-
SelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList);
618-
619-
/**
620-
* If the result type of this query is an entity class, add a
621-
* {@linkplain Order rule} for ordering the query results.
622-
*
623-
* @param order an instance of {@link Order}
624-
*
625-
* @see Order
626-
*
627-
* @since 6.3
628-
*/
629-
@Incubating
630-
SelectionQuery<R> setOrder(Order<? super R> order);
631-
632-
/**
633-
* If the result type of this query is an entity class, add a
634-
* {@linkplain Restriction rule} for restricting the query results.
635-
*
636-
* @param restriction an instance of {@link Restriction}
637-
*
638-
* @see Restriction
639-
*
640-
* @since 7.0
641-
*/
642-
@Incubating
643-
SelectionQuery<R> addRestriction(Restriction<? super R> restriction);
644-
645606
/**
646607
* Specifies whether follow-on locking should be applied
647608
*/

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.Collection;
1010
import java.util.Date;
1111
import java.util.HashSet;
12-
import java.util.List;
1312
import java.util.Map;
1413
import java.util.Set;
1514

@@ -36,10 +35,7 @@
3635
import org.hibernate.query.IllegalQueryOperationException;
3736
import org.hibernate.query.KeyedPage;
3837
import org.hibernate.query.KeyedResultList;
39-
import org.hibernate.query.Order;
40-
import org.hibernate.query.Query;
4138
import org.hibernate.query.QueryParameter;
42-
import org.hibernate.query.restriction.Restriction;
4339
import org.hibernate.query.ResultListTransformer;
4440
import org.hibernate.query.TupleTransformer;
4541
import org.hibernate.query.named.NamedQueryMemento;
@@ -291,21 +287,6 @@ public QueryImplementor<R> setLockMode(LockModeType lockModeType) {
291287
return this;
292288
}
293289

294-
@Override
295-
public Query<R> setOrder(List<? extends Order<? super R>> orders) {
296-
throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
297-
}
298-
299-
@Override
300-
public Query<R> setOrder(Order<? super R> order) {
301-
throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
302-
}
303-
304-
@Override
305-
public Query<R> addRestriction(Restriction<? super R> restriction) {
306-
throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
307-
}
308-
309290
@Override
310291
public String getComment() {
311292
return super.getComment();

‎hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@
5151
import org.hibernate.query.KeyedPage;
5252
import org.hibernate.query.KeyedResultList;
5353
import org.hibernate.query.NativeQuery;
54-
import org.hibernate.query.Order;
5554
import org.hibernate.query.PathException;
5655
import org.hibernate.query.Query;
5756
import org.hibernate.query.QueryParameter;
58-
import org.hibernate.query.restriction.Restriction;
5957
import org.hibernate.query.ResultListTransformer;
6058
import org.hibernate.query.TupleTransformer;
6159
import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
@@ -1652,21 +1650,6 @@ public NativeQueryImplementor<R> setFirstResult(int startPosition) {
16521650
return this;
16531651
}
16541652

1655-
@Override
1656-
public Query<R> setOrder(List<? extends Order<? super R>> orderList) {
1657-
throw new UnsupportedOperationException("Ordering not currently supported for native queries");
1658-
}
1659-
1660-
@Override
1661-
public Query<R> setOrder(Order<? super R> order) {
1662-
throw new UnsupportedOperationException("Ordering not currently supported for native queries");
1663-
}
1664-
1665-
@Override
1666-
public Query<R> addRestriction(Restriction<? super R> restriction) {
1667-
throw new UnsupportedOperationException("Restrictions not currently supported for native queries");
1668-
}
1669-
16701653
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16711654
// Hints
16721655

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

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import org.hibernate.query.IllegalSelectQueryException;
1111
import org.hibernate.query.KeyedPage;
1212
import org.hibernate.query.KeyedResultList;
13-
import org.hibernate.query.Order;
1413
import org.hibernate.query.Page;
1514
import org.hibernate.query.QueryLogging;
16-
import org.hibernate.query.restriction.Restriction;
1715
import org.hibernate.query.SelectionQuery;
1816
import org.hibernate.query.criteria.JpaSelection;
1917
import org.hibernate.query.hql.internal.QuerySplitter;
@@ -41,14 +39,12 @@
4139
import jakarta.persistence.TupleElement;
4240
import jakarta.persistence.criteria.CompoundSelection;
4341

44-
import static java.util.stream.Collectors.toList;
4542
import static org.hibernate.cfg.QuerySettings.FAIL_ON_PAGINATION_OVER_COLLECTION_FETCH;
4643
import static org.hibernate.query.KeyedPage.KeyInterpretation.KEY_OF_FIRST_ON_NEXT_PAGE;
4744
import static org.hibernate.query.sqm.internal.KeyedResult.collectKeys;
4845
import static org.hibernate.query.sqm.internal.KeyedResult.collectResults;
4946
import static org.hibernate.query.sqm.internal.SqmUtil.isHqlTuple;
5047
import static org.hibernate.query.sqm.internal.SqmUtil.isSelectionAssignableToResultType;
51-
import static org.hibernate.query.sqm.internal.SqmUtil.sortSpecification;
5248
import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
5349

5450
/**
@@ -118,40 +114,6 @@ private SqmSelectStatement<R> getSqmSelectStatement() {
118114
}
119115
}
120116

121-
@Override
122-
public SelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList) {
123-
final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
124-
selectStatement.orderBy( orderList.stream().map( order -> sortSpecification( selectStatement, order ) )
125-
.collect( toList() ) );
126-
// TODO: when the QueryInterpretationCache can handle caching criteria queries,
127-
// simply cache the new SQM as if it were a criteria query, and remove this:
128-
getQueryOptions().setQueryPlanCachingEnabled( false );
129-
setSqmStatement( selectStatement );
130-
return this;
131-
}
132-
133-
134-
@Override
135-
public SelectionQuery<R> setOrder(Order<? super R> order) {
136-
final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
137-
selectStatement.orderBy( sortSpecification( selectStatement, order ) );
138-
// TODO: when the QueryInterpretationCache can handle caching criteria queries,
139-
// simply cache the new SQM as if it were a criteria query, and remove this:
140-
getQueryOptions().setQueryPlanCachingEnabled( false );
141-
setSqmStatement( selectStatement );
142-
return this;
143-
}
144-
145-
@Override
146-
public SelectionQuery<R> addRestriction(Restriction<? super R> restriction) {
147-
final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
148-
restriction.apply( selectStatement, selectStatement.<R>getRoot( 0, getExpectedResultType() ) );
149-
// TODO: when the QueryInterpretationCache can handle caching criteria queries,
150-
// simply cache the new SQM as if it were a criteria query, and remove this:
151-
getQueryOptions().setQueryPlanCachingEnabled( false );
152-
setSqmStatement( selectStatement );
153-
return this;
154-
}
155117

156118
@Override
157119
public SelectionQuery<R> setPage(Page page) {

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@
3838
import org.hibernate.persister.entity.EntityPersister;
3939
import org.hibernate.query.BindableType;
4040
import org.hibernate.query.IllegalQueryOperationException;
41-
import org.hibernate.query.Order;
4241
import org.hibernate.query.Page;
4342
import org.hibernate.query.Query;
4443
import org.hibernate.query.QueryParameter;
45-
import org.hibernate.query.restriction.Restriction;
4644
import org.hibernate.query.ResultListTransformer;
4745
import org.hibernate.query.TupleTransformer;
4846
import org.hibernate.query.criteria.internal.NamedCriteriaQueryMementoImpl;
@@ -768,24 +766,6 @@ public LockModeType getLockMode() {
768766
return getLockOptions().getLockMode().toJpaLockMode();
769767
}
770768

771-
@Override
772-
public Query<R> setOrder(Order<? super R> order) {
773-
super.setOrder(order);
774-
return this;
775-
}
776-
777-
@Override
778-
public Query<R> addRestriction(Restriction<? super R> restriction) {
779-
super.addRestriction( restriction );
780-
return this;
781-
}
782-
783-
@Override
784-
public Query<R> setOrder(List<? extends Order<? super R>> orders) {
785-
super.setOrder(orders);
786-
return this;
787-
}
788-
789769
@Override
790770
public Query<R> setPage(Page page) {
791771
super.setPage(page);

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@
2424
import org.hibernate.query.BindableType;
2525
import org.hibernate.query.KeyedPage;
2626
import org.hibernate.query.KeyedResultList;
27-
import org.hibernate.query.Order;
2827
import org.hibernate.query.Page;
2928
import org.hibernate.query.ParameterMetadata;
3029
import org.hibernate.query.QueryFlushMode;
3130
import org.hibernate.query.QueryParameter;
3231
import org.hibernate.query.ResultListTransformer;
3332
import org.hibernate.query.TupleTransformer;
34-
import org.hibernate.query.restriction.Restriction;
3533
import org.hibernate.query.spi.QueryOptions;
3634
import org.hibernate.query.sqm.SqmSelectionQuery;
3735
import org.hibernate.query.sqm.tree.SqmStatement;
@@ -296,26 +294,6 @@ public SqmSelectionQueryImplementor<R> setLockMode(String alias, LockMode lockMo
296294
return this;
297295
}
298296

299-
@Override
300-
@Incubating
301-
public SqmSelectionQueryImplementor<R> setOrder(List<? extends Order<? super R>> orders) {
302-
getDelegate().setOrder( orders );
303-
return this;
304-
}
305-
306-
@Override
307-
@Incubating
308-
public SqmSelectionQueryImplementor<R> setOrder(Order<? super R> order) {
309-
getDelegate().setOrder( order );
310-
return this;
311-
}
312-
313-
@Override
314-
public SqmSelectionQueryImplementor<R> addRestriction(Restriction<? super R> restriction) {
315-
getDelegate().addRestriction( restriction );
316-
return this;
317-
}
318-
319297
@Override
320298
public SqmSelectionQueryImplementor<R> setFollowOnLocking(boolean enable) {
321299
getDelegate().setFollowOnLocking( enable );

0 commit comments

Comments
 (0)