Skip to content

Commit 7e14baa

Browse files
committed
HHH-18990 move Path and Restriction to their own package
1 parent 53b915f commit 7e14baa

File tree

27 files changed

+42
-39
lines changed

27 files changed

+42
-39
lines changed

documentation/src/main/asciidoc/introduction/Interacting.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ List<Book> matchingBooks = query.getResultList();
10671067

10681068
Notice that:
10691069

1070-
- The link:{doc-javadoc-url}org/hibernate/query/Restriction.html[`Restriction`] interface has static methods for constructing a variety of different kinds of restriction in a completely typesafe way.
1070+
- The link:{doc-javadoc-url}org/hibernate/query/restriction/Restriction.html[`Restriction`] interface has static methods for constructing a variety of different kinds of restriction in a completely typesafe way.
10711071
- Similarly, the link:{doc-javadoc-url}org/hibernate/query/Order.html[`Order`] class has a variety of static methods for constructing different kinds of ordering criteria.
10721072

10731073
We need the following methods of `SelectionQuery`:
@@ -1085,7 +1085,7 @@ Unfortunately, `Restriction` and `Order` can't be used with JPA's `TypedQuery` i
10851085

10861086
Alternatively, `Restriction` and `Order` can be used with <<paging-and-ordering,generated query or finder methods>>, and even with link:{doc-data-repositories-url}[Jakarta Data repositories].
10871087

1088-
The interface link:{doc-javadoc-url}org/hibernate/query/Path.html[`Path`] may be used to express restrictions on fields of an embedded or associated entity class.
1088+
The interface link:{doc-javadoc-url}org/hibernate/query/restriction/Path.html[`Path`] may be used to express restrictions on fields of an embedded or associated entity class.
10891089

10901090
[source,java]
10911091
----

hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
* </ul>
170170
* <p>
171171
* Finally, a method might have a parameter of type
172-
* {@link org.hibernate.query.Restriction Restriction<? super E>},
172+
* {@link org.hibernate.query.restriction.Restriction Restriction<? super E>},
173173
* allowing the caller to apply an arbitrary filtering criterion to
174174
* the query results.
175175
* <p>

hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
* </ul>
136136
* <p>
137137
* Finally, a method might have a parameter of type
138-
* {@link org.hibernate.query.Restriction Restriction<? super E>},
138+
* {@link org.hibernate.query.restriction.Restriction Restriction<? super E>},
139139
* allowing the caller to apply an arbitrary filtering criterion to
140140
* the query results.
141141
* <p>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
*
5252
* @see SelectionQuery#setOrder(Order)
5353
* @see SelectionQuery#setOrder(java.util.List)
54-
* @see Restriction
54+
* @see org.hibernate.query.restriction.Restriction
5555
*
5656
* @author Gavin King
5757
*

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
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;
2930
import org.hibernate.query.spi.QueryOptions;
3031
import org.hibernate.transform.ResultTransformer;
3132

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import jakarta.persistence.TemporalType;
3636
import org.hibernate.engine.profile.DefaultFetchProfile;
3737
import org.hibernate.graph.GraphSemantic;
38+
import org.hibernate.query.restriction.Restriction;
3839

3940
/**
4041
* Within the context of an active {@linkplain org.hibernate.Session session},

hibernate-core/src/main/java/org/hibernate/query/range/Range.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import jakarta.persistence.criteria.Predicate;
1010
import org.hibernate.Incubating;
1111
import org.hibernate.Internal;
12-
import org.hibernate.query.Restriction;
1312

1413
import java.util.List;
1514

@@ -22,7 +21,7 @@
2221
*
2322
* @param <U> The type of the value being restricted
2423
*
25-
* @see Restriction
24+
* @see org.hibernate.query.restriction.Restriction
2625
*
2726
* @author Gavin King
2827
*

hibernate-core/src/main/java/org/hibernate/query/AttributeRange.java renamed to hibernate-core/src/main/java/org/hibernate/query/restriction/AttributeRange.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: LGPL-2.1-or-later
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
5-
package org.hibernate.query;
5+
package org.hibernate.query.restriction;
66

77
import jakarta.persistence.criteria.CriteriaBuilder;
88
import jakarta.persistence.criteria.Predicate;

hibernate-core/src/main/java/org/hibernate/query/Conjunction.java renamed to hibernate-core/src/main/java/org/hibernate/query/restriction/Conjunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: LGPL-2.1-or-later
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
5-
package org.hibernate.query;
5+
package org.hibernate.query.restriction;
66

77
import jakarta.persistence.criteria.CriteriaBuilder;
88
import jakarta.persistence.criteria.Predicate;

hibernate-core/src/main/java/org/hibernate/query/Disjunction.java renamed to hibernate-core/src/main/java/org/hibernate/query/restriction/Disjunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: LGPL-2.1-or-later
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
5-
package org.hibernate.query;
5+
package org.hibernate.query.restriction;
66

77
import jakarta.persistence.criteria.CriteriaBuilder;
88
import jakarta.persistence.criteria.Predicate;

0 commit comments

Comments
 (0)