[#2495] Adapt to changes to ActionQueque, SessionFactoryImpl and SessionCreationOptions in 7.2

dreab8 · DavideD · commit dc4d369c7859 · 2025-10-17T10:24:39.000+02:00
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveRefreshEventListener.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveRefreshEventListener.java
@@ -200,7 +200,7 @@ private static void evictEntity(Object entity, EntityPersister persister, Object
 			);
 			final SoftLock lock = cache.lockItem( source, ck, previousVersion );
 			cache.remove(source, ck );
-			source.getActionQueue().registerProcess( (success, session) -> cache.unlockItem( session, ck, lock ) );
+			source.getActionQueue().registerCallback( (success, session) -> cache.unlockItem( session, ck, lock ) );
 		}
 	}
 
@@ -314,7 +314,7 @@ private void evictCachedCollections(Type[] types, Object id, EventSource source)
 					);
 					final SoftLock lock = cache.lockItem( source, ck, null );
 					cache.remove( source, ck );
-					actionQueue.registerProcess( (success, session) -> cache.unlockItem( session, ck, lock ) );
+					actionQueue.registerCallback( (success, session) -> cache.unlockItem( session, ck, lock ) );
 				}
 			}
 			else if ( type.isComponentType() ) {
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionFactoryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionFactoryImpl.java
@@ -13,7 +13,8 @@
 import java.util.function.Supplier;
 
 import org.hibernate.Cache;
-import org.hibernate.internal.SessionCreationOptions;
+import org.hibernate.engine.creation.internal.SessionBuilderImpl;
+import org.hibernate.engine.creation.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
@@ -133,11 +134,11 @@ public Uni<Mutiny.StatelessSession> openStatelessSession(String tenantId) {
 	}
 
 	private SessionCreationOptions options() {
-		return new SessionFactoryImpl.SessionBuilderImpl( delegate );
+		return new SessionBuilderImpl( delegate );
 	}
 
 	private SessionCreationOptions options(String tenantIdentifier) {
-		return new SessionFactoryImpl.SessionBuilderImpl( delegate )
+		return (SessionCreationOptions) new SessionBuilderImpl( delegate )
 				.tenantIdentifier( tenantIdentifier );
 	}
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java
@@ -5,6 +5,14 @@
  */
 package org.hibernate.reactive.session.impl;
 
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
+
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -20,7 +28,7 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
+import org.hibernate.engine.creation.internal.SessionCreationOptions;
 import org.hibernate.engine.spi.EffectiveEntityGraph;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;
@@ -48,7 +56,6 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.internal.SessionImpl;
 import org.hibernate.jpa.spi.NativeQueryTupleTransformer;
@@ -87,6 +94,7 @@
 import org.hibernate.reactive.common.InternalStateAssertions;
 import org.hibernate.reactive.common.ResultSetMapping;
 import org.hibernate.reactive.engine.ReactiveActionQueue;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.reactive.event.ReactiveDeleteEventListener;
 import org.hibernate.reactive.event.ReactiveFlushEventListener;
 import org.hibernate.reactive.event.ReactiveLoadEventListener;
@@ -123,13 +131,6 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.metamodel.Attribute;
-import java.lang.invoke.MethodHandles;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Supplier;
 
 import static java.lang.Boolean.TRUE;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
@@ -167,7 +168,8 @@ public class ReactiveSessionImpl extends SessionImpl implements ReactiveSession,
 	private transient ExceptionConverter exceptionConverter;
 
 	public ReactiveSessionImpl(
-			SessionFactoryImpl delegate, SessionCreationOptions options,
+			SessionFactoryImpl delegate,
+			SessionCreationOptions options,
 			ReactiveConnection connection) {
 		super( delegate, options );
 		InternalStateAssertions.assertUseOnEventLoop();
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java
@@ -5,6 +5,12 @@
  */
 package org.hibernate.reactive.session.impl;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.SessionException;
@@ -14,7 +20,7 @@
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
+import org.hibernate.engine.creation.internal.SessionCreationOptions;
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.PersistenceContext;
@@ -27,7 +33,6 @@
 import org.hibernate.graph.internal.RootGraphImpl;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.id.IdentifierGenerationException;
-import org.hibernate.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.internal.StatelessSessionImpl;
 import org.hibernate.jpa.spi.NativeQueryTupleTransformer;
@@ -55,6 +60,7 @@
 import org.hibernate.query.sqm.tree.update.SqmUpdateStatement;
 import org.hibernate.reactive.common.AffectedEntities;
 import org.hibernate.reactive.common.ResultSetMapping;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.persister.collection.impl.ReactiveCollectionPersister;
@@ -83,11 +89,6 @@
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
 
 import static java.lang.Boolean.TRUE;
 import static java.lang.invoke.MethodHandles.lookup;
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java
@@ -7,7 +7,8 @@
 
 import jakarta.persistence.metamodel.Metamodel;
 import org.hibernate.Cache;
-import org.hibernate.internal.SessionCreationOptions;
+import org.hibernate.engine.creation.internal.SessionBuilderImpl;
+import org.hibernate.engine.creation.internal.SessionCreationOptions;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
@@ -124,11 +125,11 @@ private <S> CompletionStage<S> create(ReactiveConnection connection, Supplier<S>
 	}
 
 	private SessionCreationOptions options() {
-		return new SessionFactoryImpl.SessionBuilderImpl( delegate );
+		return new SessionBuilderImpl( delegate );
 	}
 
 	private SessionCreationOptions options(String tenantIdentifier) {
-		return new SessionFactoryImpl.SessionBuilderImpl( delegate )
+		return (SessionCreationOptions) new SessionBuilderImpl( delegate )
 				.tenantIdentifier( tenantIdentifier );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ private static void evictEntity(Object entity, EntityPersister persister, Object`
`200`	`200`	`);`
`201`	`201`	`final SoftLock lock = cache.lockItem( source, ck, previousVersion );`
`202`	`202`	`cache.remove(source, ck );`
`203`		`- source.getActionQueue().registerProcess( (success, session) -> cache.unlockItem( session, ck, lock ) );`
	`203`	`+ source.getActionQueue().registerCallback( (success, session) -> cache.unlockItem( session, ck, lock ) );`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`@@ -314,7 +314,7 @@ private void evictCachedCollections(Type[] types, Object id, EventSource source)`
`314`	`314`	`);`
`315`	`315`	`final SoftLock lock = cache.lockItem( source, ck, null );`
`316`	`316`	`cache.remove( source, ck );`
`317`		`- actionQueue.registerProcess( (success, session) -> cache.unlockItem( session, ck, lock ) );`
	`317`	`+ actionQueue.registerCallback( (success, session) -> cache.unlockItem( session, ck, lock ) );`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`	`else if ( type.isComponentType() ) {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`import java.util.function.Supplier;`
`14`	`14`
`15`	`15`	`import org.hibernate.Cache;`
`16`		`-import org.hibernate.internal.SessionCreationOptions;`
	`16`	`+import org.hibernate.engine.creation.internal.SessionBuilderImpl;`
	`17`	`+import org.hibernate.engine.creation.internal.SessionCreationOptions;`
`17`	`18`	`import org.hibernate.internal.SessionFactoryImpl;`
`18`	`19`	`import org.hibernate.query.criteria.HibernateCriteriaBuilder;`
`19`	`20`	`import org.hibernate.reactive.common.spi.Implementor;`
`@@ -133,11 +134,11 @@ public Uni<Mutiny.StatelessSession> openStatelessSession(String tenantId) {`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`private SessionCreationOptions options() {`
`136`		`- return new SessionFactoryImpl.SessionBuilderImpl( delegate );`
	`137`	`+ return new SessionBuilderImpl( delegate );`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`private SessionCreationOptions options(String tenantIdentifier) {`
`140`		`- return new SessionFactoryImpl.SessionBuilderImpl( delegate )`
	`141`	`+ return (SessionCreationOptions) new SessionBuilderImpl( delegate )`
`141`	`142`	`.tenantIdentifier( tenantIdentifier );`
`142`	`143`	`}`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`
`8`	`8`	`import jakarta.persistence.metamodel.Metamodel;`
`9`	`9`	`import org.hibernate.Cache;`
`10`		`-import org.hibernate.internal.SessionCreationOptions;`
	`10`	`+import org.hibernate.engine.creation.internal.SessionBuilderImpl;`
	`11`	`+import org.hibernate.engine.creation.internal.SessionCreationOptions;`
`11`	`12`	`import org.hibernate.internal.SessionFactoryImpl;`
`12`	`13`	`import org.hibernate.query.criteria.HibernateCriteriaBuilder;`
`13`	`14`	`import org.hibernate.reactive.common.spi.Implementor;`
`@@ -124,11 +125,11 @@ private <S> CompletionStage<S> create(ReactiveConnection connection, Supplier<S>`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`private SessionCreationOptions options() {`
`127`		`- return new SessionFactoryImpl.SessionBuilderImpl( delegate );`
	`128`	`+ return new SessionBuilderImpl( delegate );`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`private SessionCreationOptions options(String tenantIdentifier) {`
`131`		`- return new SessionFactoryImpl.SessionBuilderImpl( delegate )`
	`132`	`+ return (SessionCreationOptions) new SessionBuilderImpl( delegate )`
`132`	`133`	`.tenantIdentifier( tenantIdentifier );`
`133`	`134`	`}`
`134`	`135`