Skip to content

Commit 5e5c92c

Browse files
committed
[#1885] change Stage#getCriteriaBuilder() and Mutiny#getCriteriaBuilder() to return HibernateCriteriaBuilder
1 parent b839bfb commit 5e5c92c

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hibernate.proxy.HibernateProxy;
2727
import org.hibernate.query.Order;
2828
import org.hibernate.query.Page;
29+
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
2930
import org.hibernate.query.criteria.JpaCriteriaInsert;
3031
import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
3132
import org.hibernate.reactive.common.AffectedEntities;
@@ -2373,7 +2374,7 @@ default <T> Uni<T> withStatelessTransaction(Function<StatelessSession, Uni<T>> w
23732374
* @return an instance of {@link CriteriaBuilder} for creating
23742375
* criteria queries.
23752376
*/
2376-
CriteriaBuilder getCriteriaBuilder();
2377+
HibernateCriteriaBuilder getCriteriaBuilder();
23772378

23782379
/**
23792380
* Obtain the JPA {@link Metamodel} for the persistence unit.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.hibernate.Cache;
1616
import org.hibernate.internal.SessionCreationOptions;
1717
import org.hibernate.internal.SessionFactoryImpl;
18+
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
1819
import org.hibernate.reactive.common.spi.Implementor;
1920
import org.hibernate.reactive.context.Context;
2021
import org.hibernate.reactive.context.impl.BaseKey;
@@ -30,7 +31,6 @@
3031
import org.hibernate.stat.Statistics;
3132

3233
import io.smallrye.mutiny.Uni;
33-
import jakarta.persistence.criteria.CriteriaBuilder;
3434
import jakarta.persistence.metamodel.Metamodel;
3535

3636
import static org.hibernate.reactive.common.InternalStateAssertions.assertUseOnEventLoop;
@@ -245,7 +245,7 @@ public <T> Uni<T> withStatelessTransaction(String tenantId, BiFunction<Mutiny.St
245245
}
246246

247247
@Override
248-
public CriteriaBuilder getCriteriaBuilder() {
248+
public HibernateCriteriaBuilder getCriteriaBuilder() {
249249
return delegate.getCriteriaBuilder();
250250
}
251251

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/Stage.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.hibernate.proxy.HibernateProxy;
2828
import org.hibernate.query.Order;
2929
import org.hibernate.query.Page;
30+
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
3031
import org.hibernate.query.criteria.JpaCriteriaInsert;
3132
import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
3233
import org.hibernate.reactive.common.AffectedEntities;
@@ -2452,7 +2453,7 @@ default <T> CompletionStage<T> withStatelessTransaction(Function<StatelessSessio
24522453
* @return an instance of {@link CriteriaBuilder} for creating
24532454
* criteria queries.
24542455
*/
2455-
CriteriaBuilder getCriteriaBuilder();
2456+
HibernateCriteriaBuilder getCriteriaBuilder();
24562457

24572458
/**
24582459
* Obtain the JPA {@link Metamodel} for the persistence unit.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*/
66
package org.hibernate.reactive.stage.impl;
77

8-
import jakarta.persistence.criteria.CriteriaBuilder;
98
import jakarta.persistence.metamodel.Metamodel;
109
import org.hibernate.Cache;
1110
import org.hibernate.internal.SessionCreationOptions;
1211
import org.hibernate.internal.SessionFactoryImpl;
12+
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
1313
import org.hibernate.reactive.common.spi.Implementor;
1414
import org.hibernate.reactive.context.Context;
1515
import org.hibernate.reactive.context.impl.BaseKey;
@@ -274,7 +274,7 @@ public boolean isOpen() {
274274
}
275275

276276
@Override
277-
public CriteriaBuilder getCriteriaBuilder() {
277+
public HibernateCriteriaBuilder getCriteriaBuilder() {
278278
return delegate.getCriteriaBuilder();
279279
}
280280

0 commit comments

Comments
 (0)