HHH-19318 unbreak follow-on locking for StatelessSession

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java

@@ -7,7 +7,6 @@
 import jakarta.persistence.ConnectionConsumer;
 import jakarta.persistence.ConnectionFunction;
 import org.hibernate.HibernateException;
-import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.engine.jdbc.LobCreationContext;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
@@ -95,11 +94,6 @@ default SessionImplementor getSession() {
 	 */
 	void forceFlush(EntityKey e) throws HibernateException;
 
-	/**
-	 * Cascade the lock operation to the given child entity.
-	 */
-	void lock(String entityName, Object child, LockOptions lockOptions);
-
 	@Override
 	default SessionImplementor asSessionImplementor() {
 		return this;

hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java

@@ -15,6 +15,7 @@
 import org.hibernate.Incubating;
 import org.hibernate.Interceptor;
 import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.StatelessSession;
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.dialect.Dialect;
@@ -586,6 +587,11 @@ default boolean isStatelessSession() {
 		return false;
 	}
 
+	/**
+	 * Cascade the lock operation to the given child entity.
+	 */
+	void lock(String entityName, Object child, LockOptions lockOptions);
+
 	/**
 	 * Attempts to load the entity from the second-level cache.
 	 *

hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java

@@ -18,6 +18,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.SharedSessionContract;
 import org.hibernate.Transaction;
 import org.hibernate.cache.spi.CacheTransactionSynchronization;
@@ -693,6 +694,11 @@ public FormatMapper getXmlFormatMapper() {
 		return delegate.getXmlFormatMapper();
 	}
 
+	@Override
+	public void lock(String entityName, Object child, LockOptions lockOptions) {
+		delegate.lock( entityName, child, lockOptions );
+	}
+
 	@Override
 	public Object loadFromSecondLevelCache(EntityPersister persister, EntityKey entityKey, Object instanceToLoad, LockMode lockMode) {
 		return delegate.loadFromSecondLevelCache( persister, entityKey, instanceToLoad, lockMode );

hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java

@@ -9,9 +9,11 @@
 import java.util.Set;
 import java.util.function.BiConsumer;
 
+import org.hibernate.AssertionFailure;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.SessionException;
 import org.hibernate.StatelessSession;
 import org.hibernate.TransientObjectException;
@@ -26,6 +28,7 @@
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.EffectiveEntityGraph;
+import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityHolder;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
@@ -70,6 +73,7 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.id.IdentifierGenerationException;
+import org.hibernate.loader.ast.internal.LoaderHelper;
 import org.hibernate.loader.ast.spi.CascadingFetchProfile;
 import org.hibernate.loader.internal.CacheLoadHelper;
 import org.hibernate.persister.collection.CollectionPersister;
@@ -1347,6 +1351,17 @@ protected void removeCacheItem(Object ck, CollectionPersister persister) {
 		}
 	}
 
+	@Override
+	public void lock(String entityName, Object child, LockOptions lockOptions) {
+		final EntityPersister persister = getEntityPersister( entityName, child );
+		persister.lock( persister.getIdentifier( child ), persister.getVersion( child ), child, lockOptions, this );
+		final EntityEntry entry = getPersistenceContextInternal().getEntry( child );
+		if ( entry == null ) {
+			throw new AssertionFailure( "no entry in temporary persistence context" );
+		}
+		LoaderHelper.upgradeLock( child, entry, lockOptions, this );
+	}
+
 	@Override
 	public Object loadFromSecondLevelCache(EntityPersister persister, EntityKey entityKey, Object instanceToLoad, LockMode lockMode) {
 		return CacheLoadHelper.loadFromSecondLevelCache( this, instanceToLoad, lockMode, persister, entityKey );

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -134,13 +134,9 @@ public DeferredResultSetAccess(
 	 * For Hibernate Reactive
 	 */
 	protected void registerAfterLoadAction(ExecutionContext executionContext, LockOptions lockOptionsToUse) {
-		executionContext.getCallback().registerAfterLoadAction( (entity, persister, session) ->
-				session.asSessionImplementor().lock(
-						persister.getEntityName(),
-						entity,
-						lockOptionsToUse
-				)
-		);
+		executionContext.getCallback()
+				.registerAfterLoadAction( (entity, persister, session) ->
+						session.lock( persister.getEntityName(), entity, lockOptionsToUse ) );
 	}
 
 	private static boolean useFollowOnLocking(