work on the new session builder infrastructure

and fix a big bug in tx/connection sharing between stateful
and stateless sessions!

Author: gavinking

hibernate-core/src/main/java/org/hibernate/SessionBuilder.java

@@ -169,6 +169,7 @@ public interface SessionBuilder extends CommonBuilder {
 	 *
 	 * @return {@code this}, for method chaining
 	 */
+	@Override
 	SessionBuilder jdbcTimeZone(TimeZone timeZone);
 
 	/**

hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java

@@ -71,6 +71,12 @@ public interface SharedSessionBuilder extends SessionBuilder, CommonSharedBuilde
 	@Override
 	SharedSessionBuilder statementInspector(UnaryOperator<String> operator);
 
+	@Override
+	SharedSessionBuilder statementInspector();
+
+	@Override
+	SharedSessionBuilder noStatementInspector();
+
 	@Override @Deprecated
 	SharedSessionBuilder connectionHandlingMode(PhysicalConnectionHandlingMode mode);
 

hibernate-core/src/main/java/org/hibernate/SharedStatelessSessionBuilder.java

@@ -6,6 +6,8 @@
 
 import org.hibernate.engine.creation.CommonSharedBuilder;
 
+import java.sql.Connection;
+import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
 /**
@@ -21,7 +23,7 @@
  * @author Steve Ebersole
  */
 @Incubating
-public interface SharedStatelessSessionBuilder extends CommonSharedBuilder {
+public interface SharedStatelessSessionBuilder extends StatelessSessionBuilder, CommonSharedBuilder {
 	/**
 	 * Open the stateless session.
 	 */
@@ -55,4 +57,13 @@ public interface SharedStatelessSessionBuilder extends CommonSharedBuilder {
 
 	@Override
 	SharedStatelessSessionBuilder initialCacheMode(CacheMode cacheMode);
+
+	@Override
+	SharedStatelessSessionBuilder connection(Connection connection);
+
+	@Override
+	SharedStatelessSessionBuilder connectionHandling(ConnectionAcquisitionMode acquisitionMode, ConnectionReleaseMode releaseMode);
+
+	@Override
+	SharedStatelessSessionBuilder jdbcTimeZone(TimeZone timeZone);
 }

hibernate-core/src/main/java/org/hibernate/StatelessSession.java

@@ -79,10 +79,6 @@
  * @author Gavin King
  */
 public interface StatelessSession extends SharedSessionContract {
-	/**
-	 * Close the stateless session and release the JDBC connection.
-	 */
-	void close();
 
 	/**
 	 * Insert a record.

hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java

@@ -5,6 +5,7 @@
 package org.hibernate;
 
 import java.sql.Connection;
+import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
 import org.hibernate.engine.creation.CommonBuilder;
@@ -43,6 +44,9 @@ public interface StatelessSessionBuilder extends CommonBuilder {
 	@Override
 	StatelessSessionBuilder statementInspector(UnaryOperator<String> operator);
 
+	@Override
+	StatelessSessionBuilder jdbcTimeZone(TimeZone timeZone);
+
 	/**
 	 * Define the tenant identifier to be associated with the opened session.
 	 *

hibernate-core/src/main/java/org/hibernate/engine/creation/CommonBuilder.java

@@ -15,6 +15,7 @@
 import org.hibernate.StatelessSession;
 
 import java.sql.Connection;
+import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
 /**
@@ -157,4 +158,12 @@ public interface CommonBuilder {
 	 * @see SharedSessionContract#getCacheMode()
 	 */
 	CommonBuilder initialCacheMode(CacheMode cacheMode);
+
+	/**
+	 * Specify the {@linkplain org.hibernate.cfg.JdbcSettings#JDBC_TIME_ZONE
+	 * JDBC time zone} for the session.
+	 *
+	 * @return {@code this}, for method chaining
+	 */
+	CommonBuilder jdbcTimeZone(TimeZone timeZone);
 }

hibernate-core/src/main/java/org/hibernate/engine/creation/CommonSharedBuilder.java

@@ -5,11 +5,15 @@
 package org.hibernate.engine.creation;
 
 import org.hibernate.CacheMode;
+import org.hibernate.ConnectionAcquisitionMode;
+import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.Incubating;
 import org.hibernate.Interceptor;
 import org.hibernate.Session;
 import org.hibernate.StatelessSession;
 
+import java.sql.Connection;
+import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
 /**
@@ -48,6 +52,7 @@ public interface CommonSharedBuilder extends CommonBuilder {
 	 * Signifies that no SQL {@linkplain org.hibernate.resource.jdbc.spi.StatementInspector statement inspector}
 	 * should be used.
 	 */
+	@Override
 	CommonSharedBuilder noStatementInspector();
 
 	@Override
@@ -67,4 +72,13 @@ public interface CommonSharedBuilder extends CommonBuilder {
 
 	@Override
 	CommonSharedBuilder tenantIdentifier(Object tenantIdentifier);
+
+	@Override
+	CommonBuilder connection(Connection connection);
+
+	@Override
+	CommonSharedBuilder connectionHandling(ConnectionAcquisitionMode acquisitionMode, ConnectionReleaseMode releaseMode);
+
+	@Override
+	CommonSharedBuilder jdbcTimeZone(TimeZone timeZone);
 }

hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java

@@ -15,6 +15,7 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.sql.Connection;
+import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
 /**
@@ -33,13 +34,15 @@ public abstract class AbstractCommonBuilder<T extends CommonBuilder> implements
 	protected Object tenantIdentifier;
 	protected boolean readOnly;
 	protected CacheMode cacheMode;
+	protected TimeZone jdbcTimeZone;
 
 	public AbstractCommonBuilder(SessionFactoryImplementor factory) {
 		sessionFactory = factory;
 		final var options = factory.getSessionFactoryOptions();
 		statementInspector = options.getStatementInspector();
 		cacheMode = options.getInitialSessionCacheMode();
 		connectionHandlingMode = options.getPhysicalConnectionHandlingMode();
+		jdbcTimeZone = options.getJdbcTimeZone();
 		tenantIdentifier = factory.resolveTenantIdentifier();
 	}
 
@@ -143,4 +146,10 @@ public T noStatementInspector() {
 		this.statementInspector = null;
 		return getThis();
 	}
+
+	@Override
+	public T jdbcTimeZone(TimeZone timeZone) {
+		jdbcTimeZone = timeZone;
+		return getThis();
+	}
 }

hibernate-core/src/main/java/org/hibernate/engine/creation/internal/CommonSharedSessionCreationOptions.java

@@ -8,9 +8,13 @@
 import org.hibernate.Interceptor;
 import org.hibernate.Transaction;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
 
+import java.util.TimeZone;
+
+
 /**
  * Creation options for shared {@linkplain org.hibernate.engine.spi.SessionImplementor stateful}
  * and {@linkplain org.hibernate.engine.spi.StatelessSessionImplementor stateless} sessions.
@@ -34,8 +38,12 @@ public interface CommonSharedSessionCreationOptions {
 
 	CacheMode getInitialCacheMode();
 
+	PhysicalConnectionHandlingMode getPhysicalConnectionHandlingMode();
+
 	boolean isTransactionCoordinatorShared();
 	TransactionCoordinator getTransactionCoordinator();
 	JdbcCoordinator getJdbcCoordinator();
 	Transaction getTransaction();
+
+	TimeZone getJdbcTimeZone();
 }

hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java

@@ -38,7 +38,6 @@ public abstract class SessionBuilderImpl
 	private boolean autoClose;
 	private boolean autoClear;
 	private boolean identifierRollback;
-	private TimeZone jdbcTimeZone;
 	private FlushMode flushMode;
 
 	private final int defaultBatchFetchSize;
@@ -55,7 +54,6 @@ public SessionBuilderImpl(SessionFactoryImplementor sessionFactory) {
 		final var options = sessionFactory.getSessionFactoryOptions();
 		autoClose = options.isAutoCloseSessionEnabled();
 		identifierRollback = options.isIdentifierRollbackEnabled();
-		jdbcTimeZone = options.getJdbcTimeZone();
 		defaultBatchFetchSize = options.getDefaultBatchFetchSize();
 		subselectFetchEnabled = options.isSubselectFetchEnabled();
 	}
@@ -119,13 +117,6 @@ public PhysicalConnectionHandlingMode getPhysicalConnectionHandlingMode() {
 		return connectionHandlingMode;
 	}
 
-	@Override
-	public String getTenantIdentifier() {
-		return tenantIdentifier != null
-				? sessionFactory.getTenantIdentifierJavaType().toString( tenantIdentifier )
-				: null;
-	}
-
 	@Override
 	public Object getTenantIdentifierValue() {
 		return tenantIdentifier;
@@ -241,10 +232,4 @@ public SessionBuilderImplementor clearEventListeners() {
 		}
 		return this;
 	}
-
-	@Override
-	public SessionBuilderImplementor jdbcTimeZone(TimeZone timeZone) {
-		jdbcTimeZone = timeZone;
-		return this;
-	}
 }