remove deprecated SharedSessionContractImplementor.setAutoClear()

Author: gavinking

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

@@ -138,11 +138,6 @@ public Interceptor getInterceptor() {
 		return delegate.getInterceptor();
 	}
 
-	@Override
-	public void setAutoClear(boolean enabled) {
-		delegate.setAutoClear( enabled );
-	}
-
 	@Override
 	public boolean isTransactionInProgress() {
 		return delegate.isTransactionInProgress();

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

@@ -270,15 +270,6 @@ default void checkTransactionNeededForUpdateOperation(String exceptionMessage) {
 	 */
 	Interceptor getInterceptor();
 
-	/**
-	 * Enable or disable automatic cache clearing from after transaction
-	 * completion.
-	 *
-	 * @deprecated there's no good reason to expose this here
-	 */
-	@Deprecated(since = "6")
-	void setAutoClear(boolean enabled);
-
 	/**
 	 * Initialize the given collection (if not already initialized).
 	 */

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

@@ -418,11 +418,6 @@ public Interceptor getInterceptor() {
 		return delegate.getInterceptor();
 	}
 
-	@Override
-	public void setAutoClear(boolean enabled) {
-		delegate.setAutoClear( enabled );
-	}
-
 	@Override
 	public void initializeCollection(PersistentCollection<?> collection, boolean writing) throws HibernateException {
 		delegate.initializeCollection( collection, writing );

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

@@ -247,7 +247,7 @@ public class SessionImpl
 
 	private LockOptions lockOptions;
 
-	private boolean autoClear;
+	private final boolean autoClear;
 	private final boolean autoClose;
 
 	private final boolean identifierRollbackEnabled;
@@ -564,12 +564,6 @@ private void managedClose() {
 		closeWithoutOpenChecks();
 	}
 
-	@Override
-	public void setAutoClear(boolean enabled) {
-		checkOpenOrWaitingForAutoClose();
-		autoClear = enabled;
-	}
-
 	@Override
 	public void afterOperation(boolean success) {
 		if ( !isTransactionInProgress() ) {
@@ -2054,21 +2048,19 @@ public void afterTransactionCompletion(boolean successful, boolean delayed) {
 			log.tracef( "SessionImpl#afterTransactionCompletion(successful=%s, delayed=%s)", successful, delayed );
 		}
 
-		if ( !isClosed() || waitingForAutoClose ) {
-			if ( autoClear ||!successful ) {
-				internalClear();
-			}
+		final boolean notClosed = !isClosed() || waitingForAutoClose;
+
+		if ( notClosed && (!successful || autoClear) ) {
+			internalClear();
 		}
 
 		persistenceContext.afterTransactionCompletion();
 		actionQueue.afterTransactionCompletion( successful );
 
 		afterTransactionCompletionEvents( successful );
 
-		if ( !delayed ) {
-			if ( shouldAutoClose() && (!isClosed() || waitingForAutoClose) ) {
-				managedClose();
-			}
+		if ( !delayed && notClosed && shouldAutoClose() ) {
+			managedClose();
 		}
 
 		super.afterTransactionCompletion( successful, delayed );

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

@@ -1195,11 +1195,6 @@ public PersistenceContext getPersistenceContext() {
 		return temporaryPersistenceContext;
 	}
 
-	@Override
-	public void setAutoClear(boolean enabled) {
-		throw new UnsupportedOperationException();
-	}
-
 	public boolean isDefaultReadOnly() {
 		return false;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/events/ClearEventListenerTest.java

@@ -45,8 +45,8 @@ public void testAutoClear(SessionFactoryScope scope) {
 		LISTENER.callCount = 0;
 
 		scope.inSession(
-				session -> {
-					session.setAutoClear( true );
+				s -> {
+					var session = s.sessionWithOptions().autoClear(true).openSession();
 					session.getTransaction().begin();
 					try {
 						assertThat( LISTENER.callCount ).isEqualTo( 0 );