HHH-19008 completely remove FastSessionServices

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java

@@ -14,7 +14,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.service.spi.EventListenerGroups;
-import org.hibernate.internal.FastSessionServices;
+
 import org.hibernate.persister.collection.CollectionPersister;
 
 import static org.hibernate.internal.util.StringHelper.unqualify;
@@ -204,13 +204,4 @@ protected EventListenerGroups getEventListenerGroups() {
 		return session.getFactory().getEventListenerGroups();
 	}
 
-	/**
-	 * @deprecated This is a layer-breaker
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	protected FastSessionServices getFastSessionServices() {
-		return session.getFactory().getFastSessionServices();
-	}
-
-
 }

hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java

@@ -11,7 +11,6 @@
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.service.spi.EventListenerGroups;
-import org.hibernate.internal.FastSessionServices;
 import org.hibernate.persister.entity.EntityPersister;
 
 import static org.hibernate.internal.util.StringHelper.unqualify;
@@ -199,11 +198,4 @@ protected EventListenerGroups getEventListenerGroups() {
 		return session.getFactory().getEventListenerGroups();
 	}
 
-	/**
-	 * @deprecated This is a layer-breaker
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	protected FastSessionServices getFastSessionServices() {
-		return session.getFactory().getFastSessionServices();
-	}
 }

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

@@ -41,7 +41,6 @@
 import org.hibernate.event.spi.EventEngine;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
-import org.hibernate.internal.FastSessionServices;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
@@ -304,11 +303,6 @@ public JavaType<Object> getTenantIdentifierJavaType() {
 		return delegate.getTenantIdentifierJavaType();
 	}
 
-	@Override
-	public FastSessionServices getFastSessionServices() {
-		return delegate.getFastSessionServices();
-	}
-
 	@Override
 	public Type getIdentifierType(String className) throws MappingException {
 		return delegate.getIdentifierType( className );

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

@@ -23,7 +23,6 @@
 import org.hibernate.event.spi.EventEngine;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
-import org.hibernate.internal.FastSessionServices;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
 import org.hibernate.proxy.EntityNotFoundDelegate;
@@ -165,15 +164,6 @@ default MappingMetamodelImplementor getMappingMetamodel() {
 	@Internal @Incubating
 	EventListenerGroups getEventListenerGroups();
 
-	/**
-	 * @return the {@link FastSessionServices} instance associated with this factory
-	 *
-	 * @deprecated {@link FastSessionServices} belongs to an internal non-SPI package,
-	 *             and so this operation is a layer-breaker
-	 */
-	@Internal @Deprecated(since = "7.0", forRemoval = true)
-	FastSessionServices getFastSessionServices();
-
 	/**
 	 * @since 7.0
 	 */

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

@@ -150,7 +150,6 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
 	private transient SessionFactoryImpl factory;
 	private transient SessionFactoryOptions factoryOptions;
 	private transient JdbcServices jdbcServices;
-	protected transient FastSessionServices fastSessionServices;
 
 	private UUID sessionIdentifier;
 	private Object sessionToken;
@@ -196,7 +195,6 @@ public AbstractSharedSessionContract(SessionFactoryImpl factory, SessionCreation
 		this.factoryOptions = factory.getSessionFactoryOptions();
 		this.jdbcServices = factory.getJdbcServices();
 
-		fastSessionServices = factory.getFastSessionServices();
 		cacheTransactionSync = factory.getCache().getRegionFactory().createTransactionContext( this );
 		flushMode = options.getInitialSessionFlushMode();
 		tenantIdentifier = getTenantId( factoryOptions, options );
@@ -234,7 +232,7 @@ public AbstractSharedSessionContract(SessionFactoryImpl factory, SessionCreation
 			// This must happen *after* the JdbcSessionContext was initialized,
 			// because some calls retrieve this context indirectly via Session getters.
 			jdbcCoordinator = createJdbcCoordinator( options );
-			transactionCoordinator = fastSessionServices.getTransactionCoordinatorBuilder()
+			transactionCoordinator = factory.transactionCoordinatorBuilder
 					.buildTransactionCoordinator( jdbcCoordinator, this );
 		}
 	}
@@ -286,7 +284,7 @@ private JdbcSessionContextImpl createJdbcSessionContext(StatementInspector state
 				statementInspector,
 				connectionHandlingMode,
 				getJdbcServices(),
-				fastSessionServices.getBatchBuilder(),
+				factory.batchBuilder,
 				// TODO: this object is deprecated and should be removed
 				new JdbcEventHandler(
 						factory.getStatistics(),
@@ -575,7 +573,7 @@ private boolean isTransactionAccessible() {
 		final SessionFactoryOptions sessionFactoryOptions = getSessionFactoryOptions();
 		return sessionFactoryOptions.isJtaTransactionAccessEnabled() // defaults to false in JPA bootstrap
 			|| !sessionFactoryOptions.getJpaCompliance().isJpaTransactionComplianceEnabled()
-			|| !fastSessionServices.getTransactionCoordinatorBuilder().isJta();
+			|| !factory.transactionCoordinatorBuilder.isJta();
 	}
 
 	@Override
@@ -698,15 +696,15 @@ public JdbcConnectionAccess getJdbcConnectionAccess() {
 			if ( !getSessionFactoryOptions().isMultiTenancyEnabled() ) {
 				jdbcConnectionAccess = new NonContextualJdbcConnectionAccess(
 						getEventListenerManager(),
-						fastSessionServices.getConnectionProvider(),
+						factory.connectionProvider,
 						this
 				);
 			}
 			else {
 				jdbcConnectionAccess = new ContextualJdbcConnectionAccess(
 						getTenantIdentifierValue(),
 						getEventListenerManager(),
-						fastSessionServices.getMultiTenantConnectionProvider(),
+						factory.multiTenantConnectionProvider,
 						this
 				);
 			}
@@ -1449,7 +1447,7 @@ public void setJdbcBatchSize(Integer jdbcBatchSize) {
 
 	@Override
 	public EventMonitor getEventMonitor() {
-		return fastSessionServices.getEventMonitor();
+		return factory.eventMonitor;
 	}
 
 	@Override
@@ -1650,7 +1648,6 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 		factory = SessionFactoryImpl.deserialize( ois );
 		factoryOptions = factory.getSessionFactoryOptions();
 		jdbcServices = factory.getJdbcServices();
-		fastSessionServices = factory.getFastSessionServices();
 
 		//TODO: this isn't quite right, see createSessionEventsManager()
 		final SessionEventListener[] baseline =
@@ -1663,8 +1660,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 
 		cacheTransactionSync = factory.getCache().getRegionFactory().createTransactionContext( this );
 		transactionCoordinator =
-				fastSessionServices.getTransactionCoordinatorBuilder()
-						.buildTransactionCoordinator( jdbcCoordinator, this );
+				factory.transactionCoordinatorBuilder.buildTransactionCoordinator( jdbcCoordinator, this );
 
 		entityNameResolver = new CoordinatingEntityNameResolver( factory, interceptor );
 	}