tidy up org.hibernate.internal

- make some things package-private
- move some stuff out to where it's used

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java

@@ -9,15 +9,12 @@
 
 import org.hibernate.FlushMode;
 import org.hibernate.LazyInitializationException;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.SessionFactoryRegistry;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.ManyToOne;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.ToOne;
-import org.hibernate.mapping.Value;
 
 import static org.hibernate.bytecode.enhance.spi.interceptor.BytecodeInterceptorLogging.BYTECODE_INTERCEPTOR_LOGGER;
 
@@ -39,7 +36,7 @@ public static boolean includeInBaseFetchGroup(
 			boolean isEnhanced,
 			InheritanceChecker inheritanceChecker,
 			boolean collectionsInDefaultFetchGroupEnabled) {
-		final Value value = bootMapping.getValue();
+		final var value = bootMapping.getValue();
 
 		if ( ! isEnhanced ) {
 			if ( value instanceof ToOne toOne ) {
@@ -62,7 +59,7 @@ public static boolean includeInBaseFetchGroup(
 		if ( value instanceof ToOne toOne ) {
 
 			if ( ! toOne.isLazy() ) {
-				// its not lazy... select it
+				// it's not lazy... select it
 				return true;
 			}
 
@@ -273,8 +270,8 @@ private static SharedSessionContractImplementor openTemporarySessionForLoading(
 			throw createLazyInitializationException( Cause.NO_SF_UUID, entityName, attributeName );
 		}
 
-		final SessionFactoryImplementor sf = SessionFactoryRegistry.INSTANCE.getSessionFactory( interceptor.getSessionFactoryUuid() );
-		final SessionImplementor session = sf.openSession();
+		final var factory = SessionFactoryRegistry.INSTANCE.getSessionFactory( interceptor.getSessionFactoryUuid() );
+		final var session = factory.openSession();
 		session.getPersistenceContextInternal().setDefaultReadOnly( true );
 		session.setHibernateFlushMode( FlushMode.MANUAL );
 		return session;

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java

@@ -11,8 +11,8 @@
 import org.hibernate.Transaction;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
-import org.hibernate.internal.AbstractSharedSessionContract;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
@@ -24,7 +24,7 @@
 /**
  * Wraps a {@link CommonSharedSessionCreationOptions} as a
  * {@link SharedSessionCreationOptions} to pass to
- * {@link org.hibernate.internal.AbstractSharedSessionContract}
+ * {@code org.hibernate.internal.AbstractSharedSessionContract}
  * during construction.
  *
  * @param factory The {@code SessionFactoryImplementor}
@@ -33,7 +33,7 @@
 public record SessionCreationOptionsAdaptor(
 		SessionFactoryImplementor factory,
 		CommonSharedSessionCreationOptions options,
-		AbstractSharedSessionContract originalSession)
+		SharedSessionContractImplementor originalSession)
 			implements SharedSessionCreationOptions {
 
 	@Override

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

@@ -5,8 +5,8 @@
 package org.hibernate.engine.internal;
 
 import org.hibernate.engine.spi.PersistenceContext;
+import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.SessionImpl;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,7 +23,7 @@ public static PersistenceContext createPersistenceContext(SharedSessionContractI
 		return new StatefulPersistenceContext( session );
 	}
 
-	public static PersistenceContext deserialize(ObjectInputStream ois, SessionImpl session)
+	public static PersistenceContext deserialize(ObjectInputStream ois, SessionImplementor session)
 			throws IOException, ClassNotFoundException {
 		return StatefulPersistenceContext.deserialize( ois, session );
 	}

hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContexts.java

@@ -1881,9 +1881,8 @@ private <E> void writeCollectionToStream(
 	 * @throws IOException deserialization errors.
 	 * @throws ClassNotFoundException deserialization errors.
 	 */
-	public static StatefulPersistenceContext deserialize(
-			ObjectInputStream ois,
-			SessionImplementor session) throws IOException, ClassNotFoundException {
+	public static StatefulPersistenceContext deserialize(ObjectInputStream ois, SessionImplementor session)
+				throws IOException, ClassNotFoundException {
 		PERSISTENCE_CONTEXT_LOGGER.deserializingPersistenceContext();
 		final var context = new StatefulPersistenceContext( session );
 		final var factory = session.getFactory();

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -97,7 +97,7 @@ public Set<String> getParameterNames() {
 	}
 
 	public @Nullable Supplier<?> getParameterResolver(String parameterName) {
-		final ManagedBean<? extends Supplier<?>> resolver = parameterResolverMap.get( parameterName );
+		final var resolver = parameterResolverMap.get( parameterName );
 		return resolver == null ? null : resolver.getBeanInstance();
 	}
 

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

@@ -8,8 +8,8 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import org.hibernate.TransactionException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.transaction.spi.TransactionImplementor;
-import org.hibernate.internal.AbstractSharedSessionContract;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 
@@ -24,13 +24,13 @@ public class TransactionImpl implements TransactionImplementor {
 
 	private final TransactionCoordinator transactionCoordinator;
 	private final boolean jpaCompliance;
-	private final AbstractSharedSessionContract session;
+	private final SharedSessionContractImplementor session;
 
 	private TransactionDriver transactionDriverControl;
 
 	public TransactionImpl(
 			TransactionCoordinator transactionCoordinator,
-			AbstractSharedSessionContract session) {
+			SharedSessionContractImplementor session) {
 		this.transactionCoordinator = transactionCoordinator;
 		this.session = session;
 

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java

@@ -139,7 +139,7 @@
  *
  * @author Steve Ebersole
  */
-public abstract class AbstractSharedSessionContract implements SharedSessionContractImplementor {
+abstract class AbstractSharedSessionContract implements SharedSessionContractImplementor {
 
 	private transient SessionFactoryImpl factory;
 	private transient SessionFactoryOptions factoryOptions;
@@ -186,7 +186,7 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
 	private transient ExceptionConverter exceptionConverter;
 	private transient SessionAssociationMarkers sessionAssociationMarkers;
 
-	public AbstractSharedSessionContract(SessionFactoryImpl factory, SessionCreationOptions options) {
+	AbstractSharedSessionContract(SessionFactoryImpl factory, SessionCreationOptions options) {
 		this.factory = factory;
 
 		factoryOptions = factory.getSessionFactoryOptions();

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

@@ -17,15 +17,15 @@
 /**
  * @author Steve Ebersole
  */
-public class ContextualJdbcConnectionAccess implements JdbcConnectionAccess, Serializable {
+class ContextualJdbcConnectionAccess implements JdbcConnectionAccess, Serializable {
 	private final Object tenantIdentifier;
 	private final boolean readOnly;
 	private final SessionEventListener listener;
 	private final MultiTenantConnectionProvider<Object> connectionProvider;
 	private final SharedSessionContractImplementor session;
 
 
-	public ContextualJdbcConnectionAccess(
+	ContextualJdbcConnectionAccess(
 			Object tenantIdentifier,
 			boolean readOnly,
 			SessionEventListener listener,

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

@@ -153,7 +153,7 @@
  * @author Steve Ebersole
  * @author Chris Cranford
  */
-public class SessionFactoryImpl implements SessionFactoryImplementor {
+class SessionFactoryImpl implements SessionFactoryImplementor {
 
 	private final String name;
 	private final String jndiName;
@@ -205,7 +205,7 @@ public class SessionFactoryImpl implements SessionFactoryImplementor {
 	final transient ParameterMarkerStrategy parameterMarkerStrategy;
 	final transient JdbcValuesMappingProducerProvider jdbcValuesMappingProducerProvider;
 
-	public SessionFactoryImpl(
+	SessionFactoryImpl(
 			final MetadataImplementor bootMetamodel,
 			final SessionFactoryOptions options,
 			final BootstrapContext bootstrapContext) {