[hibernate#1885] change Stage#getCriteriaBuilder() and Mutiny#getCrit…

…eriaBuilder() to return HibernateCriteriaBuilder
dreab8 · Jan 30, 2025 · 6e308b9 · 6e308b9
1 parent 21f4912
commit 6e308b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/Mutiny.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/Mutiny.java
@@ -26,6 +26,7 @@
 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;
 import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.reactive.common.AffectedEntities;
@@ -2373,7 +2374,7 @@ default <T> Uni<T> withStatelessTransaction(Function<StatelessSession, Uni<T>> w
 		 * @return an instance of {@link CriteriaBuilder} for creating
 		 * criteria queries.
 		 */
-		CriteriaBuilder getCriteriaBuilder();
+		HibernateCriteriaBuilder getCriteriaBuilder();
 
 		/**
 		 * Obtain the JPA {@link Metamodel} for the persistence unit.

diff --git a/...ctive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionFactoryImpl.java b/...ctive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionFactoryImpl.java
@@ -15,6 +15,7 @@
 import org.hibernate.Cache;
 import org.hibernate.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
 import org.hibernate.reactive.context.Context;
 import org.hibernate.reactive.context.impl.BaseKey;
@@ -30,7 +31,6 @@
 import org.hibernate.stat.Statistics;
 
 import io.smallrye.mutiny.Uni;
-import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.metamodel.Metamodel;
 
 import static org.hibernate.reactive.common.InternalStateAssertions.assertUseOnEventLoop;
@@ -245,7 +245,7 @@ public <T> Uni<T> withStatelessTransaction(String tenantId, BiFunction<Mutiny.St
 	}
 
 	@Override
-	public CriteriaBuilder getCriteriaBuilder() {
+	public HibernateCriteriaBuilder getCriteriaBuilder() {
 		return delegate.getCriteriaBuilder();
 	}
 

diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/Stage.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/Stage.java
@@ -27,6 +27,7 @@
 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;
 import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.reactive.common.AffectedEntities;
@@ -2452,7 +2453,7 @@ default <T> CompletionStage<T> withStatelessTransaction(Function<StatelessSessio
 		 * @return an instance of {@link CriteriaBuilder} for creating
 		 * criteria queries.
 		 */
-		CriteriaBuilder getCriteriaBuilder();
+		HibernateCriteriaBuilder getCriteriaBuilder();
 
 		/**
 		 * Obtain the JPA {@link Metamodel} for the persistence unit.

diff --git a/...eactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java b/...eactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java
@@ -5,11 +5,11 @@
  */
 package org.hibernate.reactive.stage.impl;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.metamodel.Metamodel;
 import org.hibernate.Cache;
 import org.hibernate.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
 import org.hibernate.reactive.context.Context;
 import org.hibernate.reactive.context.impl.BaseKey;
@@ -274,7 +274,7 @@ public boolean isOpen() {
 	}
 
 	@Override
-	public CriteriaBuilder getCriteriaBuilder() {
+	public HibernateCriteriaBuilder getCriteriaBuilder() {
 		return delegate.getCriteriaBuilder();
 	}