expose two additional useful settings via SessionBuilder

the machinery was already there

Author: gavinking

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

@@ -217,4 +217,28 @@ public interface SessionBuilder extends CommonBuilder {
 	 * @since 7.0
 	 */
 	SessionBuilder identifierRollback(boolean identifierRollback);
+
+	/**
+	 * Specify the default batch fetch size for the session.
+	 *
+	 * @return {@code this}, for method chaining
+	 *
+	 * @see org.hibernate.cfg.FetchSettings#DEFAULT_BATCH_FETCH_SIZE
+	 * @see Session#setFetchBatchSize(int)
+	 *
+	 * @since 7.2
+	 */
+	SessionBuilder defaultBatchFetchSize(int defaultBatchFetchSize);
+
+	/**
+	 * Specify whether subselect fetching is enabled for the session.
+	 *
+	 * @return {@code this}, for method chaining
+	 *
+	 * @see org.hibernate.cfg.FetchSettings#USE_SUBSELECT_FETCH
+	 * @see Session#setSubselectFetchingEnabled(boolean)
+	 *
+	 * @since 7.2
+	 */
+	SessionBuilder subselectFetchEnabled(boolean subselectFetchEnabled);
 }

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

@@ -158,4 +158,10 @@ public interface SharedSessionBuilder extends SessionBuilder, CommonSharedBuilde
 
 	@Override
 	SharedSessionBuilder identifierRollback(boolean identifierRollback);
+
+	@Override
+	SharedSessionBuilder defaultBatchFetchSize(int defaultBatchFetchSize);
+
+	@Override
+	SharedSessionBuilder subselectFetchEnabled(boolean subselectFetchEnabled);
 }

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

@@ -39,9 +39,8 @@ public abstract class SessionBuilderImpl
 	private boolean autoClear;
 	private boolean identifierRollback;
 	private FlushMode flushMode;
-
-	private final int defaultBatchFetchSize;
-	private final boolean subselectFetchEnabled;
+	private int defaultBatchFetchSize;
+	private boolean subselectFetchEnabled;
 
 	// Lazy: defaults can be built by invoking the builder in fastSessionServices.defaultSessionEventListeners
 	// (Need a fresh build for each Session as the listener instances can't be reused across sessions)
@@ -232,4 +231,16 @@ public SessionBuilderImplementor clearEventListeners() {
 		}
 		return this;
 	}
+
+	@Override
+	public SessionBuilderImplementor defaultBatchFetchSize(int defaultBatchFetchSize) {
+		this.defaultBatchFetchSize = defaultBatchFetchSize;
+		return this;
+	}
+
+	@Override
+	public SessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled) {
+		this.subselectFetchEnabled = subselectFetchEnabled;
+		return this;
+	}
 }

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

@@ -46,12 +46,12 @@ public abstract class SharedSessionBuilderImpl
 	private boolean autoClear;
 	private boolean identifierRollback;
 	private FlushMode flushMode;
+	private int defaultBatchFetchSize;
+	private boolean subselectFetchEnabled;
 
 	private boolean tenantIdChanged;
 	private boolean readOnlyChanged;
 
-	private final int defaultBatchFetchSize;
-	private final boolean subselectFetchEnabled;
 
 	// Lazy: defaults can be built by invoking the builder in fastSessionServices.defaultSessionEventListeners
 	// (Need a fresh build for each Session as the listener instances can't be reused across sessions)
@@ -247,6 +247,17 @@ public SharedSessionBuilderImplementor eventListeners(SessionEventListener... li
 		return this;
 	}
 
+	@Override
+	public SharedSessionBuilderImplementor defaultBatchFetchSize(int defaultBatchFetchSize) {
+		this.defaultBatchFetchSize = defaultBatchFetchSize;
+		return this;
+	}
+
+	@Override
+	public SharedSessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled) {
+		this.subselectFetchEnabled = subselectFetchEnabled;
+		return this;
+	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// SharedSessionCreationOptions

hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SessionBuilderImplementor.java

@@ -93,4 +93,10 @@ public interface SessionBuilderImplementor extends SessionBuilder {
 
 	@Override
 	SessionBuilderImplementor noStatementInspector();
+
+	@Override
+	SessionBuilderImplementor defaultBatchFetchSize(int defaultBatchFetchSize);
+
+	@Override
+	SessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled);
 }

hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SharedSessionBuilderImplementor.java

@@ -111,4 +111,10 @@ public interface SharedSessionBuilderImplementor extends SharedSessionBuilder, S
 
 	@Override
 	SharedSessionBuilderImplementor noStatementInspector();
+
+	@Override
+	SharedSessionBuilderImplementor defaultBatchFetchSize(int defaultBatchFetchSize);
+
+	@Override
+	SharedSessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled);
 }

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

@@ -172,4 +172,16 @@ public SessionBuilderImplementor identifierRollback(boolean identifierRollback)
 		delegate.identifierRollback( identifierRollback );
 		return this;
 	}
+
+	@Override
+	public SessionBuilderImplementor defaultBatchFetchSize(int defaultBatchFetchSize) {
+		delegate.defaultBatchFetchSize( defaultBatchFetchSize );
+		return this;
+	}
+
+	@Override
+	public SessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled) {
+		delegate.subselectFetchEnabled( subselectFetchEnabled );
+		return this;
+	}
 }

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

@@ -219,4 +219,16 @@ public SharedSessionBuilder identifierRollback(boolean identifierRollback) {
 		delegate.identifierRollback( identifierRollback );
 		return this;
 	}
+
+	@Override
+	public SharedSessionBuilder defaultBatchFetchSize(int defaultBatchFetchSize) {
+		delegate.defaultBatchFetchSize( defaultBatchFetchSize );
+		return this;
+	}
+
+	@Override
+	public SharedSessionBuilder subselectFetchEnabled(boolean subselectFetchEnabled) {
+		delegate.subselectFetchEnabled( subselectFetchEnabled );
+		return this;
+	}
 }

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

@@ -56,7 +56,7 @@ public class LoadQueryInfluencers implements Serializable {
 
 	private boolean subselectFetchEnabled;
 
-	private int batchSize = -1;
+	private int batchSize;
 
 	private final EffectiveEntityGraph effectiveEntityGraph;
 

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

@@ -163,7 +163,7 @@ public class SessionFactoryImpl implements SessionFactoryImplementor {
 
 	private transient volatile Status status = Status.OPEN;
 
-	private final transient SessionFactoryObserverChain observer = new SessionFactoryObserverChain();
+	private final transient SessionFactoryObserverChain observerChain = new SessionFactoryObserverChain();
 
 	private final transient SessionFactoryOptions sessionFactoryOptions;
 	private final transient Map<String,Object> settings;
@@ -237,7 +237,7 @@ public SessionFactoryImpl(
 		jpaPersistenceUnitUtil = new PersistenceUnitUtilImpl( this );
 
 		for ( var sessionFactoryObserver : options.getSessionFactoryObservers() ) {
-			observer.addObserver( sessionFactoryObserver );
+			observerChain.addObserver( sessionFactoryObserver );
 		}
 
 		filters = new HashMap<>( bootMetamodel.getFilterDefinitions() );
@@ -258,7 +258,7 @@ public SessionFactoryImpl(
 		jdbcValuesMappingProducerProvider = serviceRegistry.requireService( JdbcValuesMappingProducerProvider.class );
 
 		final var integratorObserver = new IntegratorObserver();
-		observer.addObserver( integratorObserver );
+		observerChain.addObserver( integratorObserver );
 		try {
 			integrate( bootMetamodel, bootstrapContext, integratorObserver );
 
@@ -321,7 +321,7 @@ public SessionFactoryImpl(
 			// we're in an incompletely-initialized state
 			typeConfiguration.scope( this );
 
-			observer.sessionFactoryCreated( this );
+			observerChain.sessionFactoryCreated( this );
 		}
 		catch ( Exception e ) {
 			disintegrate( e, integratorObserver );
@@ -573,7 +573,7 @@ public StatelessSession openStatelessSession(Connection connection) {
 
 	@Override
 	public void addObserver(SessionFactoryObserver observer) {
-		this.observer.addObserver( observer );
+		observerChain.addObserver( observer );
 	}
 
 	@Override
@@ -798,7 +798,7 @@ public void close() {
 
 		try {
 			SESSION_FACTORY_LOGGER.closingFactory( uuid );
-			observer.sessionFactoryClosing( this );
+			observerChain.sessionFactoryClosing( this );
 
 			// NOTE: the null checks below handle cases where close is called
 			//		 from a failed attempt to create the SessionFactory
@@ -835,7 +835,7 @@ public void close() {
 			status = Status.CLOSED;
 		}
 
-		observer.sessionFactoryClosed( this );
+		observerChain.sessionFactoryClosed( this );
 		serviceRegistry.destroy();
 	}