extract a method in SessionFactoryImpl

and remove an obsolete comment

Author: gavinking

hibernate-core/src/main/java/org/hibernate/context/spi/AbstractCurrentSessionContext.java

@@ -7,9 +7,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionBuilder;
 import org.hibernate.context.TenantIdentifierMismatchException;
-import org.hibernate.engine.spi.SessionBuilderImplementor;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * Base support for {@link CurrentSessionContext} implementors.
@@ -24,16 +22,16 @@ protected AbstractCurrentSessionContext(SessionFactoryImplementor factory) {
 	}
 
 	/**
-	 * Access to the SessionFactory
+	 * Access to the {@link org.hibernate.SessionFactory}.
 	 *
-	 * @return The SessionFactory being serviced by this context
+	 * @return The {@code SessionFactory} being serviced by this context
 	 */
 	public SessionFactoryImplementor factory() {
 		return factory;
 	}
 
 	protected SessionBuilder baseSessionBuilder() {
-		final SessionBuilderImplementor builder = factory.withOptions();
+		final var builder = factory.withOptions();
 		final var resolver = factory.getCurrentTenantIdentifierResolver();
 		if ( resolver != null ) {
 			builder.tenantIdentifier( resolver.resolveCurrentTenantIdentifier() );
@@ -45,7 +43,7 @@ protected void validateExistingSession(Session existingSession) {
 		final var resolver = factory.getCurrentTenantIdentifierResolver();
 		if ( resolver != null && resolver.validateExistingCurrentSessions() ) {
 			final Object currentValue = resolver.resolveCurrentTenantIdentifier();
-			final JavaType<Object> tenantIdentifierJavaType = factory.getTenantIdentifierJavaType();
+			final var tenantIdentifierJavaType = factory.getTenantIdentifierJavaType();
 			if ( !tenantIdentifierJavaType.areEqual( currentValue, existingSession.getTenantIdentifierValue() ) ) {
 				throw new TenantIdentifierMismatchException(
 						String.format(

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

@@ -640,8 +640,6 @@ public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityCl
 		return getJpaMetamodel().findEntityGraphsByJavaType( entityClass );
 	}
 
-	// todo : (5.2) review synchronizationType, persistenceContextType, transactionType usage
-
 	@Override
 	public Session createEntityManager() {
 		validateNotClosed();
@@ -1106,6 +1104,13 @@ public static Interceptor configuredInterceptor(Interceptor interceptor, boolean
 		return null;
 	}
 
+	private Object resolveTenantIdentifier() {
+		final var resolver = getCurrentTenantIdentifierResolver();
+		return resolver != null
+				? resolver.resolveCurrentTenantIdentifier()
+				: null;
+	}
+
 	public static class SessionBuilderImpl implements SessionBuilderImplementor, SessionCreationOptions {
 		private static final Logger log = CoreLogging.logger( SessionBuilderImpl.class );
 
@@ -1148,15 +1153,10 @@ public SessionBuilderImpl(SessionFactoryImpl sessionFactory) {
 			identifierRollback = options.isIdentifierRollbackEnabled();
 			cacheMode = options.getInitialSessionCacheMode();
 
-			final var currentTenantIdentifierResolver =
-					sessionFactory.getCurrentTenantIdentifierResolver();
-			if ( currentTenantIdentifierResolver != null ) {
-				tenantIdentifier = currentTenantIdentifierResolver.resolveCurrentTenantIdentifier();
-			}
+			tenantIdentifier = sessionFactory.resolveTenantIdentifier();
 			jdbcTimeZone = options.getJdbcTimeZone();
 		}
 
-
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// SessionCreationOptions
 
@@ -1405,11 +1405,7 @@ public StatelessSessionBuilderImpl(SessionFactoryImpl sessionFactory) {
 			final var options = sessionFactory.getSessionFactoryOptions();
 			statementInspector = options.getStatementInspector();
 			cacheMode = options.getInitialSessionCacheMode();
-
-			final var tenantIdentifierResolver = sessionFactory.getCurrentTenantIdentifierResolver();
-			if ( tenantIdentifierResolver != null ) {
-				tenantIdentifier = tenantIdentifierResolver.resolveCurrentTenantIdentifier();
-			}
+			tenantIdentifier = sessionFactory.resolveTenantIdentifier();
 		}
 
 		@Override