HHH-19772 add noSessionInterceptorCreation()

Author: gavinking

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

@@ -33,6 +33,12 @@ public interface SessionBuilder extends CommonBuilder {
 	@Override
 	SessionBuilder noInterceptor();
 
+	@Override
+	SessionBuilder noSessionInterceptorCreation();
+
+	@Override
+	SessionBuilder noStatementInspector();
+
 	@Override
 	SessionBuilder statementInspector(UnaryOperator<String> operator);
 

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

@@ -116,6 +116,9 @@ public interface SharedSessionBuilder extends SessionBuilder, CommonSharedBuilde
 	@Override
 	SharedSessionBuilder noInterceptor();
 
+	@Override
+	SharedSessionBuilder noSessionInterceptorCreation();
+
 	@Override
 	SharedSessionBuilder connection(Connection connection);
 

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

@@ -41,6 +41,9 @@ public interface SharedStatelessSessionBuilder extends StatelessSessionBuilder,
 	@Override
 	SharedStatelessSessionBuilder noInterceptor();
 
+	@Override
+	SharedStatelessSessionBuilder noSessionInterceptorCreation();
+
 	SharedStatelessSessionBuilder statementInspector(UnaryOperator<String> operator);
 
 	@Override

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

@@ -60,11 +60,15 @@ public interface CommonBuilder {
 	CommonBuilder interceptor(Interceptor interceptor);
 
 	/**
-	 * Signifies that no {@link Interceptor} should be used.
+	 * Specifies that no {@link Interceptor} should be used.
 	 * <p>
-	 * By default, if no {@code Interceptor} is explicitly specified, the
+	 * By default, if no {@code Interceptor} is explicitly
+	 * {@linkplain #interceptor(Interceptor) specified}, the
 	 * {@code Interceptor} associated with the {@link SessionFactory} is
-	 * inherited by the new session.
+	 * inherited by the new session. Or, if there is no interceptor
+	 * associated with the {@link SessionFactory}, but a session-scoped
+	 * interceptor has been configured, a new session-scoped
+	 * {@code Interceptor} will be created for the new session.
 	 * <p>
 	 * Calling {@link #interceptor(Interceptor) interceptor(null)} has the
 	 * same effect.
@@ -73,6 +77,28 @@ public interface CommonBuilder {
 	 */
 	CommonBuilder noInterceptor();
 
+	/**
+	 * Specifies that no
+	 * {@linkplain org.hibernate.cfg.SessionEventSettings#SESSION_SCOPED_INTERCEPTOR
+	 * session-scoped interceptor} should be instantiated for the new session.
+	 * <p>
+	 * By default, if no {@link Interceptor} is explicitly
+	 * {@linkplain #interceptor(Interceptor) specified}, and if there
+	 * is no interceptor associated with the {@link SessionFactory}, but
+	 * a session-scoped interceptor has been configured, a new session-scoped
+	 * {@code Interceptor} will be created for the new session.
+	 * <p>
+	 * Note that this operation does not disable use of an interceptor
+	 * associated with the {@link SessionFactory}.
+	 *
+	 * @return {@code this}, for method chaining
+	 *
+	 * @see org.hibernate.cfg.SessionEventSettings#SESSION_SCOPED_INTERCEPTOR
+	 *
+	 * @since 7.2
+	 */
+	CommonBuilder noSessionInterceptorCreation();
+
 	/**
 	 * Applies the given statement inspection function to the session.
 	 *

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

@@ -61,6 +61,9 @@ public interface CommonSharedBuilder extends CommonBuilder {
 	@Override
 	CommonSharedBuilder noInterceptor();
 
+	@Override
+	CommonSharedBuilder noSessionInterceptorCreation();
+
 	@Override
 	CommonSharedBuilder statementInspector(UnaryOperator<String> operator);
 

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

@@ -28,7 +28,8 @@ public abstract class AbstractCommonBuilder<T extends CommonBuilder> implements
 
 	protected StatementInspector statementInspector;
 	protected Interceptor interceptor;
-	protected boolean explicitNoInterceptor;
+	protected boolean allowInterceptor = true;
+	protected boolean allowSessionInterceptorCreation = true;
 	protected Connection connection;
 	protected PhysicalConnectionHandlingMode connectionHandlingMode;
 	protected Object tenantIdentifier;
@@ -48,7 +49,7 @@ public AbstractCommonBuilder(SessionFactoryImplementor factory) {
 
 	Interceptor configuredInterceptor() {
 		// If we were explicitly asked for no interceptor, always return null.
-		if ( explicitNoInterceptor ) {
+		if ( !allowInterceptor ) {
 			return null;
 		}
 
@@ -69,11 +70,13 @@ Interceptor configuredInterceptor() {
 			return optionsInterceptor;
 		}
 
-		// then check the Session-scoped interceptor prototype
-		final var statelessInterceptorImplementorSupplier =
-				options.getStatelessInterceptorImplementorSupplier();
-		if ( statelessInterceptorImplementorSupplier != null ) {
-			return statelessInterceptorImplementorSupplier.get();
+		if ( allowSessionInterceptorCreation ) {
+			// then check the Session-scoped interceptor prototype
+			final var statelessInterceptorImplementorSupplier =
+					options.getStatelessInterceptorImplementorSupplier();
+			if ( statelessInterceptorImplementorSupplier != null ) {
+				return statelessInterceptorImplementorSupplier.get();
+			}
 		}
 
 		return null;
@@ -100,15 +103,21 @@ public T interceptor(Interceptor interceptor) {
 		}
 		else {
 			this.interceptor = interceptor;
-			this.explicitNoInterceptor = false;
+			this.allowInterceptor = true;
 		}
 		return getThis();
 	}
 
 	@Override
 	public T noInterceptor() {
 		this.interceptor = null;
-		this.explicitNoInterceptor = true;
+		this.allowInterceptor = false;
+		return getThis();
+	}
+
+	@Override
+	public T noSessionInterceptorCreation() {
+		this.allowSessionInterceptorCreation = false;
 		return getThis();
 	}
 

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

@@ -37,6 +37,9 @@ public interface SessionBuilderImplementor extends SessionBuilder {
 	@Override
 	SessionBuilderImplementor noInterceptor();
 
+	@Override
+	SessionBuilderImplementor noSessionInterceptorCreation();
+
 	@Override
 	SessionBuilderImplementor statementInspector(UnaryOperator<String> operator);
 

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

@@ -30,6 +30,9 @@ public interface SharedSessionBuilderImplementor extends SharedSessionBuilder, S
 	@Override
 	SharedSessionBuilderImplementor noInterceptor();
 
+	@Override
+	SharedSessionBuilderImplementor noSessionInterceptorCreation();
+
 	@Override
 	SharedSessionBuilderImplementor statementInspector(UnaryOperator<String> operator);
 

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

@@ -59,6 +59,12 @@ public SessionBuilderImplementor noInterceptor() {
 		return this;
 	}
 
+	@Override
+	public SessionBuilderImplementor noSessionInterceptorCreation() {
+		delegate.noSessionInterceptorCreation();
+		return this;
+	}
+
 	@Override @Deprecated
 	public SessionBuilderImplementor statementInspector(StatementInspector statementInspector) {
 		delegate.statementInspector( statementInspector );

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

@@ -94,6 +94,12 @@ public SharedSessionBuilder noInterceptor() {
 		return this;
 	}
 
+	@Override
+	public SharedSessionBuilder noSessionInterceptorCreation() {
+		delegate.noSessionInterceptorCreation();
+		return this;
+	}
+
 	@Override @Deprecated
 	public SharedSessionBuilder statementInspector(StatementInspector statementInspector) {
 		delegate.statementInspector( statementInspector );