Add transactional support for StatelessSession (next to regular Session)

Exposes JPA-style shared proxy instances through LocalSessionFactoryBean.

Closes gh-7184

Author: jhoeller

spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java

@@ -37,7 +37,7 @@
  */
 public class EntityManagerHolder extends ResourceHolderSupport {
 
-	private final @Nullable EntityManager entityManager;
+	protected @Nullable EntityManager entityManager;
 
 	private boolean transactionActive;
 
@@ -78,4 +78,8 @@ public void clear() {
 		this.savepointManager = null;
 	}
 
+	protected void closeAll() {
+		EntityManagerFactoryUtils.closeEntityManager(this.entityManager);
+	}
+
 }

spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java

@@ -640,11 +640,8 @@ protected void doCleanupAfterCompletion(Object transaction) {
 
 		// Remove the entity manager holder from the thread.
 		if (txObject.isNewEntityManagerHolder()) {
-			EntityManager em = txObject.getEntityManagerHolder().getEntityManager();
-			if (logger.isDebugEnabled()) {
-				logger.debug("Closing JPA EntityManager [" + em + "] after transaction");
-			}
-			EntityManagerFactoryUtils.closeEntityManager(em);
+			logger.debug("Closing JPA EntityManager after transaction");
+			txObject.getEntityManagerHolder().closeAll();
 		}
 		else {
 			logger.debug("Not closing pre-bound JPA EntityManager after transaction");

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/HibernateTransactionManager.java

@@ -17,7 +17,6 @@
 package org.springframework.orm.jpa.hibernate;
 
 import java.sql.Connection;
-import java.util.Map;
 import java.util.function.Consumer;
 
 import javax.sql.DataSource;
@@ -29,12 +28,8 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
-import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
-import org.hibernate.service.UnknownServiceException;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeansException;
@@ -372,7 +367,7 @@ public void afterPropertiesSet() {
 
 		// Check for SessionFactory's DataSource.
 		if (this.autodetectDataSource && getDataSource() == null) {
-			DataSource sfds = determineDataSource();
+			DataSource sfds = SpringSessionContext.determineDataSource(obtainSessionFactory());
 			if (sfds != null) {
 				// Use the SessionFactory's DataSource for exposing transactions to JDBC code.
 				if (logger.isDebugEnabled()) {
@@ -384,36 +379,6 @@ public void afterPropertiesSet() {
 		}
 	}
 
-	/**
-	 * Determine the DataSource of the given SessionFactory.
-	 * @return the DataSource, or {@code null} if none found
-	 * @see ConnectionProvider
-	 */
-	protected @Nullable DataSource determineDataSource() {
-		SessionFactory sessionFactory = obtainSessionFactory();
-		Map<String, Object> props = sessionFactory.getProperties();
-		if (props != null) {
-			Object dataSourceValue = props.get(Environment.JAKARTA_NON_JTA_DATASOURCE);
-			if (dataSourceValue instanceof DataSource dataSourceToUse) {
-				return dataSourceToUse;
-			}
-		}
-		if (sessionFactory instanceof SessionFactoryImplementor sfi) {
-			try {
-				ConnectionProvider cp = sfi.getServiceRegistry().getService(ConnectionProvider.class);
-				if (cp != null) {
-					return cp.unwrap(DataSource.class);
-				}
-			}
-			catch (UnknownServiceException ex) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("No ConnectionProvider found - cannot determine DataSource for SessionFactory: " + ex);
-				}
-			}
-		}
-		return null;
-	}
-
 
 	@Override
 	public Object getResourceFactory() {
@@ -735,7 +700,7 @@ protected void doCleanupAfterCompletion(Object transaction) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Closing Hibernate Session [" + session + "] after transaction");
 			}
-			EntityManagerFactoryUtils.closeEntityManager(session);
+			txObject.getSessionHolder().closeAll();
 		}
 		else {
 			if (logger.isDebugEnabled()) {

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java

@@ -23,7 +23,9 @@
 import javax.sql.DataSource;
 
 import org.hibernate.Interceptor;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.StatelessSession;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
@@ -41,6 +43,7 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.SmartFactoryBean;
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ResourceLoaderAware;
@@ -77,7 +80,7 @@
  * @see org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
  */
 public class LocalSessionFactoryBean extends HibernateExceptionTranslator
-		implements FactoryBean<SessionFactory>, ResourceLoaderAware, BeanFactoryAware,
+		implements SmartFactoryBean<SessionFactory>, ResourceLoaderAware, BeanFactoryAware,
 		InitializingBean, SmartInitializingSingleton, DisposableBean {
 
 	private @Nullable DataSource dataSource;
@@ -134,6 +137,10 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
 
 	private @Nullable SessionFactory sessionFactory;
 
+	private @Nullable Session sharedSession;
+
+	private @Nullable StatelessSession sharedStatelessSession;
+
 
 	/**
 	 * Set the DataSource to be used by the SessionFactory.
@@ -565,6 +572,8 @@ public void afterPropertiesSet() throws IOException {
 		// Build SessionFactory instance.
 		this.configuration = sfb;
 		this.sessionFactory = buildSessionFactory(sfb);
+		this.sharedSession = SharedSessionCreator.createSharedSession(this.sessionFactory);
+		this.sharedStatelessSession = SharedSessionCreator.createSharedStatelessSession(this.sessionFactory);
 	}
 
 	@Override
@@ -614,9 +623,24 @@ public Class<?> getObjectType() {
 		return (this.sessionFactory != null ? this.sessionFactory.getClass() : SessionFactory.class);
 	}
 
+	/**
+	 * Return either the singleton SessionFactory or a shared (Stateless)Session proxy.
+	 */
+	@Override
+	public <S> @Nullable S getObject(Class<S> type) throws Exception {
+		if (Session.class.isAssignableFrom(type)) {
+			return type.cast(this.sharedSession);
+		}
+		if (StatelessSession.class.isAssignableFrom(type)) {
+			return type.cast(this.sharedStatelessSession);
+		}
+		return SmartFactoryBean.super.getObject(type);
+	}
+
 	@Override
-	public boolean isSingleton() {
-		return true;
+	public boolean supportsType(Class<?> type) {
+		return (type == Session.class || type == StatelessSession.class ||
+				SmartFactoryBean.super.supportsType(type));
 	}
 
 

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/SessionHolder.java

@@ -18,10 +18,12 @@
 
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
+import org.hibernate.StatelessSession;
 import org.hibernate.Transaction;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.orm.jpa.EntityManagerHolder;
+import org.springframework.util.Assert;
 
 /**
  * Resource holder wrapping a Hibernate {@link Session} (plus an optional {@link Transaction}).
@@ -37,6 +39,8 @@
  */
 class SessionHolder extends EntityManagerHolder {
 
+	private @Nullable StatelessSession statelessSession;
+
 	private @Nullable Transaction transaction;
 
 	private @Nullable FlushMode previousFlushMode;
@@ -46,11 +50,37 @@ public SessionHolder(Session session) {
 		super(session);
 	}
 
+	public SessionHolder(StatelessSession session) {
+		super(null);
+		this.statelessSession = session;
+	}
+
+
+	public void setSession(Session session) {
+		this.entityManager = session;
+	}
 
 	public Session getSession() {
 		return (Session) getEntityManager();
 	}
 
+	public boolean hasSession() {
+		return (this.entityManager != null);
+	}
+
+	public void setStatelessSession(StatelessSession statelessSession) {
+		this.statelessSession = statelessSession;
+	}
+
+	public StatelessSession getStatelessSession() {
+		Assert.state(this.statelessSession != null, "No StatelessSession available");
+		return this.statelessSession;
+	}
+
+	public boolean hasStatelessSession() {
+		return (this.statelessSession != null);
+	}
+
 	public void setTransaction(@Nullable Transaction transaction) {
 		this.transaction = transaction;
 		setTransactionActive(transaction != null);
@@ -76,4 +106,12 @@ public void clear() {
 		this.previousFlushMode = null;
 	}
 
+	@Override
+	protected void closeAll() {
+		super.closeAll();
+		if (this.statelessSession != null && this.statelessSession.isOpen()) {
+			this.statelessSession.close();
+		}
+	}
+
 }