HHH-19774, HHH-19771 tests and initial work on TransactionCompletionCallbacks sharing

gavinking · gavinking · commit 5cca19a24dca · 2025-09-12T18:58:26.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -901,7 +901,7 @@ public boolean isAllowOutOfTransactionUpdateOperations() {
 	}
 
 
-	@Override
+	@Override @Deprecated(forRemoval = true)
 	public boolean isReleaseResourcesOnCloseEnabled() {
 		return releaseResourcesOnCloseEnabled;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/CommonSharedSessionCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/CommonSharedSessionCreationOptions.java
@@ -8,6 +8,7 @@
 import org.hibernate.Interceptor;
 import org.hibernate.Transaction;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
@@ -43,6 +44,7 @@ public interface CommonSharedSessionCreationOptions {
 	boolean isTransactionCoordinatorShared();
 	TransactionCoordinator getTransactionCoordinator();
 	JdbcCoordinator getJdbcCoordinator();
+	TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor();
 	Transaction getTransaction();
 
 	TimeZone getJdbcTimeZone();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java
@@ -9,9 +9,9 @@
 import org.hibernate.Interceptor;
 import org.hibernate.SessionEventListener;
 import org.hibernate.Transaction;
-import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
@@ -140,7 +140,7 @@ public Transaction getTransaction() {
 	}
 
 	@Override
-	public TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks() {
-		return null;
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacks() {
+		return options.getTransactionCompletionCallbacksImplementor();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java
@@ -12,10 +12,10 @@
 import org.hibernate.SessionException;
 import org.hibernate.Transaction;
 import org.hibernate.engine.creation.spi.SharedSessionBuilderImplementor;
-import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
@@ -277,6 +277,14 @@ public Transaction getTransaction() {
 				: null;
 	}
 
+	@Override
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacks() {
+		return shareTransactionContext
+				? original.getTransactionCompletionCallbacksImplementor()
+				: null;
+	}
+
+
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// CommonSharedSessionCreationOptions
 
@@ -309,11 +317,6 @@ public CacheMode getInitialCacheMode() {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// SharedSessionCreationOptions
 
-	@Override
-	public TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks() {
-		return null;
-	}
-
 	@Override
 	public boolean shouldAutoJoinTransactions() {
 		return autoJoinTransactions;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionCreationOptions.java
@@ -5,8 +5,8 @@
 package org.hibernate.engine.creation.internal;
 
 import org.hibernate.Transaction;
-import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
 
 /**
@@ -25,5 +25,5 @@ public interface SharedSessionCreationOptions extends SessionCreationOptions {
 	TransactionCoordinator getTransactionCoordinator();
 	JdbcCoordinator getJdbcCoordinator();
 	Transaction getTransaction();
-	TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks();
+	TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacks();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java
@@ -14,6 +14,7 @@
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.StatelessSessionImplementor;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
@@ -167,6 +168,13 @@ public JdbcCoordinator getJdbcCoordinator() {
 				: null;
 	}
 
+	@Override
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return shareTransactionContext
+				? original.getTransactionCompletionCallbacksImplementor()
+				: null;
+	}
+
 	@Override
 	public Transaction getTransaction() {
 		return shareTransactionContext
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/TransactionCompletionCallbacksImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/TransactionCompletionCallbacksImpl.java
@@ -5,12 +5,12 @@
 package org.hibernate.engine.internal;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.engine.spi.TransactionCompletionCallbacks;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 
 /**
  * @author Steve Ebersole
  */
-public class TransactionCompletionCallbacksImpl implements TransactionCompletionCallbacks {
+public class TransactionCompletionCallbacksImpl implements TransactionCompletionCallbacksImplementor {
 	private final SharedSessionContractImplementor session;
 
 	private BeforeTransactionCompletionProcessQueue beforeTransactionProcesses;
@@ -28,11 +28,13 @@ public void registerCallback(BeforeCompletionCallback process) {
 		beforeTransactionProcesses.register( process );
 	}
 
+	@Override
 	public boolean hasBeforeCompletionCallbacks() {
 		return beforeTransactionProcesses != null
 			&& beforeTransactionProcesses.hasActions();
 	}
 
+	@Override
 	public void beforeTransactionCompletion() {
 		if ( beforeTransactionProcesses != null && beforeTransactionProcesses.hasActions() ) {
 			beforeTransactionProcesses.beforeTransactionCompletion();
@@ -47,23 +49,27 @@ public void registerCallback(AfterCompletionCallback process) {
 		afterTransactionProcesses.register( process );
 	}
 
+	@Override
 	public boolean hasAfterCompletionCallbacks() {
 		return afterTransactionProcesses != null && afterTransactionProcesses.hasActions();
 	}
 
+	@Override
 	public void afterTransactionCompletion(boolean success) {
 		if ( afterTransactionProcesses != null && afterTransactionProcesses.hasActions() ) {
 			afterTransactionProcesses.afterTransactionCompletion( success );
 		}
 	}
 
+	@Override
 	public void addSpaceToInvalidate(String space) {
 		if ( afterTransactionProcesses == null ) {
 			afterTransactionProcesses = new AfterTransactionCompletionProcessQueue( session );
 		}
 		afterTransactionProcesses.addSpaceToInvalidate( space );
-}
+	}
 
+	@Override
 	public TransactionCompletionCallbacksImpl forSharing() {
 		if ( beforeTransactionProcesses == null ) {
 			beforeTransactionProcesses = new BeforeTransactionCompletionProcessQueue( session );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -95,7 +95,7 @@ public class ActionQueue implements TransactionCompletionCallbacks {
 
 
 	private transient boolean isTransactionCoordinatorShared;
-	private TransactionCompletionCallbacksImpl transactionCompletionCallbacks;;
+	private TransactionCompletionCallbacksImplementor transactionCompletionCallbacks;;
 
 	// Extract this as a constant to perform efficient iterations:
 	// method values() otherwise allocates a new array on each invocation.
@@ -725,7 +725,7 @@ public int numberOfInsertions() {
 		return insertions == null ? 0 : insertions.size();
 	}
 
-	public TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks() {
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacks() {
 		return transactionCompletionCallbacks.forSharing();
 	}
 
@@ -738,7 +738,7 @@ public TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks() {
 	 * @param isTransactionCoordinatorShared Flag indicating shared transaction context.
 	 */
 	public void setTransactionCompletionCallbacks(
-			TransactionCompletionCallbacksImpl callbacks,
+			TransactionCompletionCallbacksImplementor callbacks,
 			boolean isTransactionCoordinatorShared) {
 		this.isTransactionCoordinatorShared = isTransactionCoordinatorShared;
 		this.transactionCompletionCallbacks = callbacks;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
@@ -1175,6 +1175,11 @@ public TransactionCompletionCallbacks getTransactionCompletionCallbacks() {
 		return delegate.getTransactionCompletionCallbacks();
 	}
 
+	@Override
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return delegate.getTransactionCompletionCallbacksImplementor();
+	}
+
 	@Override
 	public Object instantiate(EntityPersister persister, Object id) throws HibernateException {
 		return delegate.instantiate( persister, id );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
@@ -78,6 +78,11 @@ default TransactionCompletionCallbacks getTransactionCompletionCallbacks() {
 		return getActionQueue();
 	}
 
+	@Override
+	default TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return getActionQueue().getTransactionCompletionCallbacks();
+	}
+
 	/**
 	 * Should this session be automatically closed after the current
 	 * transaction completes?
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
@@ -264,6 +264,14 @@ default void checkTransactionNeededForUpdateOperation(String exceptionMessage) {
 	@Incubating
 	TransactionCompletionCallbacks getTransactionCompletionCallbacks();
 
+	/**
+	 * Access to registered callbacks for transaction completion processing.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor();
+
 	/**
 	 * Instantiate an {@link EntityKey} with the given id and for the
 	 * entity represented by the given {@link EntityPersister}.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
@@ -732,4 +732,9 @@ public Transaction getCurrentTransaction() {
 	public SharedSessionBuilder sessionWithOptions() {
 		return delegate.sessionWithOptions();
 	}
+
+	@Override
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return delegate.getTransactionCompletionCallbacksImplementor();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/TransactionCompletionCallbacksImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/TransactionCompletionCallbacksImplementor.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.engine.spi;
+
+import org.hibernate.Incubating;
+
+/**
+ * @since 7.2
+ *
+ * @author Gavin King
+ *
+ */
+@Incubating // is this separate interface really needed?
+public interface TransactionCompletionCallbacksImplementor extends TransactionCompletionCallbacks {
+	/**
+	 * Are there any registered before-completion callbacks?
+	 */
+	boolean hasBeforeCompletionCallbacks();
+
+	/**
+	 * Are there any registered after-completion callbacks?
+	 */
+	boolean hasAfterCompletionCallbacks();
+
+	/**
+	 * Execute registered before-completion callbacks, if any.
+	 */
+	void beforeTransactionCompletion();
+
+	/**
+	 * Execute registered after-completion callbacks, if any.
+	 */
+	void afterTransactionCompletion(boolean success);
+
+	/**
+	 * Register a cache space to be invalidated after successful transaction completion.
+	 */
+	void addSpaceToInvalidate(String space);
+
+	/**
+	 * Ensure internal queues are initialized for sharing between sessions that share
+	 * the same transaction coordinator. Returns this instance for convenience/fluency.
+	 */
+	TransactionCompletionCallbacksImplementor forSharing();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -546,7 +546,7 @@ public SessionBuilderImplementor withOptions() {
 		return new SessionBuilderImpl( this ) {
 			@Override
 			protected SessionImplementor createSession() {
-				return new SessionImpl( (SessionFactoryImpl) sessionFactory, this );
+				return new SessionImpl( SessionFactoryImpl.this, this );
 			}
 		};
 	}
@@ -556,7 +556,7 @@ public StatelessSessionBuilder withStatelessOptions() {
 		return new StatelessSessionBuilderImpl( this ) {
 			@Override
 			protected StatelessSessionImplementor createStatelessSession() {
-				return new StatelessSessionImpl( (SessionFactoryImpl) sessionFactory, this );
+				return new StatelessSessionImpl( SessionFactoryImpl.this, this );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -1984,7 +1984,7 @@ public int getFetchBatchSize() {
 		return loadQueryInfluencers.getBatchSize();
 	}
 
-	@Override
+	@Override @Deprecated(forRemoval = true)
 	public LobHelper getLobHelper() {
 		return Hibernate.getLobHelper();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -20,13 +20,15 @@
 import org.hibernate.collection.spi.CollectionSemantics;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.creation.internal.SessionCreationOptions;
+import org.hibernate.engine.creation.internal.SharedSessionCreationOptions;
 import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.StatelessSessionImplementor;
 import org.hibernate.engine.spi.TransactionCompletionCallbacks;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.event.monitor.spi.DiagnosticEvent;
 import org.hibernate.event.service.spi.EventListenerGroups;
@@ -117,14 +119,18 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
 	private final LoadQueryInfluencers influencers;
 	private final PersistenceContext temporaryPersistenceContext;
 	private final boolean connectionProvided;
-	private final TransactionCompletionCallbacksImpl transactionCompletionCallbacks;
+	private final TransactionCompletionCallbacksImplementor transactionCompletionCallbacks;
 
 	private final EventListenerGroups eventListenerGroups;
 
 	public StatelessSessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) {
 		super( factory, options );
 		connectionProvided = options.getConnection() != null;
-		transactionCompletionCallbacks = new TransactionCompletionCallbacksImpl( this );
+		transactionCompletionCallbacks =
+				options instanceof SharedSessionCreationOptions sharedOptions
+					&& sharedOptions.isTransactionCoordinatorShared()
+						? sharedOptions.getTransactionCompletionCallbacks()
+						: new TransactionCompletionCallbacksImpl( this );
 		temporaryPersistenceContext = createPersistenceContext( this );
 		influencers = new LoadQueryInfluencers( getFactory() );
 		eventListenerGroups = factory.getEventListenerGroups();
@@ -1428,6 +1434,11 @@ public Object loadFromSecondLevelCache(EntityPersister persister, EntityKey enti
 		return CacheLoadHelper.loadFromSecondLevelCache( this, instanceToLoad, lockMode, persister, entityKey );
 	}
 
+	@Override
+	public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return transactionCompletionCallbacks.forSharing();
+	}
+
 	@Override
 	public <T> T unwrap(Class<T> type) {
 		checkOpen();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java
@@ -41,11 +41,6 @@ public String[] getMappings() {
 		return new String[] { "interceptor/User.hbm.xml", "interceptor/Image.hbm.xml" };
 	}
 
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
-
 	@Test
 	public void testCollectionIntercept() {
 		Session s = openSession( new CollectionInterceptor() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/DummyInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/DummyInterceptor.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java

Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,7 @@ public boolean isAllowOutOfTransactionUpdateOperations() {`
`901`	`901`	`}`
`902`	`902`
`903`	`903`
`904`		`- @Override`
	`904`	`+ @Override @Deprecated(forRemoval = true)`
`905`	`905`	`public boolean isReleaseResourcesOnCloseEnabled() {`
`906`	`906`	`return releaseResourcesOnCloseEnabled;`
`907`	`907`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`import org.hibernate.Interceptor;`
`10`	`10`	`import org.hibernate.SessionEventListener;`
`11`	`11`	`import org.hibernate.Transaction;`
`12`		`-import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;`
`13`	`12`	`import org.hibernate.engine.jdbc.spi.JdbcCoordinator;`
`14`	`13`	`import org.hibernate.engine.spi.SessionFactoryImplementor;`
	`14`	`+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;`
`15`	`15`	`import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;`
`16`	`16`	`import org.hibernate.resource.jdbc.spi.StatementInspector;`
`17`	`17`	`import org.hibernate.resource.transaction.spi.TransactionCoordinator;`
`@@ -140,7 +140,7 @@ public Transaction getTransaction() {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Override`
`143`		`- public TransactionCompletionCallbacksImpl getTransactionCompletionCallbacks() {`
`144`		`- return null;`
	`143`	`+ public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacks() {`
	`144`	`+ return options.getTransactionCompletionCallbacksImplementor();`
`145`	`145`	`}`
`146`	`146`	`}`