remove two additional deprecated methods in SharedSessionContractImplementor

gavinking · gavinking · commit 2ef83521f1cc · 2025-04-15T01:16:58.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
@@ -374,16 +374,6 @@ public boolean isOpenOrWaitingForAutoClose() {
 		return delegate.isOpenOrWaitingForAutoClose();
 	}
 
-	@Override
-	public boolean shouldAutoClose() {
-		return delegate.shouldAutoClose();
-	}
-
-	@Override
-	public boolean isAutoCloseSessionEnabled() {
-		return delegate.isAutoCloseSessionEnabled();
-	}
-
 	@Override
 	public boolean shouldAutoJoinTransaction() {
 		return delegate.shouldAutoJoinTransaction();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
@@ -17,7 +17,6 @@
 import org.hibernate.LockOptions;
 import org.hibernate.StatelessSession;
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
-import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.query.Query;
@@ -416,26 +415,6 @@ default EventSource asEventSource() {
 	 */
 	void afterScrollOperation();
 
-	/**
-	 * Should this session be automatically closed after the current
-	 * transaction completes?
-	 *
-	 * @deprecated there's no reason to expose this here
-	 */
-	@Deprecated(since = "6")
-	boolean shouldAutoClose();
-
-	/**
-	 * Is auto-close at transaction completion enabled?
-	 *
-	 * @see org.hibernate.cfg.AvailableSettings#AUTO_CLOSE_SESSION
-	 * @see SessionFactoryOptions#isAutoCloseSessionEnabled()
-	 *
-	 * @deprecated there's no reason to expose this here
-	 */
-	@Deprecated(since = "6")
-	boolean isAutoCloseSessionEnabled();
-
 	/**
 	 * Get the {@link LoadQueryInfluencers} associated with this session.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
@@ -528,16 +528,6 @@ public void afterScrollOperation() {
 		delegate.afterScrollOperation();
 	}
 
-	@Override
-	public boolean shouldAutoClose() {
-		return delegate.shouldAutoClose();
-	}
-
-	@Override
-	public boolean isAutoCloseSessionEnabled() {
-		return delegate.isAutoCloseSessionEnabled();
-	}
-
 	@Override
 	public LoadQueryInfluencers getLoadQueryInfluencers() {
 		return delegate.getLoadQueryInfluencers();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -27,7 +27,38 @@
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
 import jakarta.persistence.metamodel.EntityType;
-import org.hibernate.*;
+import org.hibernate.BatchSize;
+import org.hibernate.CacheMode;
+import org.hibernate.ConnectionAcquisitionMode;
+import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.EnabledFetchProfile;
+import org.hibernate.EntityFilterException;
+import org.hibernate.FetchNotFoundException;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.JDBCException;
+import org.hibernate.LobHelper;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.MappingException;
+import org.hibernate.MultiIdentifierLoadAccess;
+import org.hibernate.NaturalIdLoadAccess;
+import org.hibernate.NaturalIdMultiLoadAccess;
+import org.hibernate.ObjectDeletedException;
+import org.hibernate.ObjectNotFoundException;
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.ReplicationMode;
+import org.hibernate.Session;
+import org.hibernate.SessionBuilder;
+import org.hibernate.SessionEventListener;
+import org.hibernate.SessionException;
+import org.hibernate.SharedSessionBuilder;
+import org.hibernate.SimpleNaturalIdLoadAccess;
+import org.hibernate.Transaction;
+import org.hibernate.TypeMismatchException;
+import org.hibernate.UnknownProfileException;
+import org.hibernate.UnresolvableObjectException;
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
@@ -482,7 +513,10 @@ protected boolean shouldCloseJdbcCoordinatorOnClose(boolean isTransactionCoordin
 		return !isTransactionCoordinatorShared;
 	}
 
-	@Override
+	/**
+	 * Should this session be automatically closed after the current
+	 * transaction completes?
+	 */
 	public boolean isAutoCloseSessionEnabled() {
 		return autoClose;
 	}
@@ -521,7 +555,6 @@ private void managedFlush() {
 		}
 	}
 
-	@Override
 	public boolean shouldAutoClose() {
 		if ( waitingForAutoClose ) {
 			return true;
@@ -2198,7 +2231,7 @@ public SharedSessionBuilderImpl connectionHandlingMode() {
 
 		@Override
 		public SharedSessionBuilderImpl autoJoinTransactions() {
-			super.autoJoinTransactions( session.isAutoCloseSessionEnabled() );
+			super.autoJoinTransactions( session.shouldAutoJoinTransaction() );
 			return this;
 		}
 
@@ -2222,7 +2255,7 @@ public SharedSessionBuilderImpl flushMode() {
 
 		@Override
 		public SharedSessionBuilderImpl autoClose() {
-			autoClose( session.autoClose );
+			autoClose( session.isAutoCloseSessionEnabled() );
 			return this;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -1116,12 +1116,10 @@ public Object getIdentifier(Object entity) {
 		return getFactory().getPersistenceUnitUtil().getIdentifier(entity);
 	}
 
-	@Override
 	public boolean isAutoCloseSessionEnabled() {
 		return getSessionFactoryOptions().isAutoCloseSessionEnabled();
 	}
 
-	@Override
 	public boolean shouldAutoClose() {
 		return isAutoCloseSessionEnabled() && !isClosed();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java
@@ -12,6 +12,7 @@
 import org.hibernate.event.spi.EventType;
 import org.hibernate.event.spi.PostInsertEvent;
 import org.hibernate.event.spi.PostInsertEventListener;
+import org.hibernate.internal.SessionImpl;
 import org.hibernate.persister.entity.EntityPersister;
 
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
@@ -95,8 +96,8 @@ public void testSharedTransactionContextAutoClosing(SessionFactoryScope scope) {
 				.openSession();
 
 		// directly assert state of the second session
-		assertTrue( ((SessionImplementor) secondSession).isAutoCloseSessionEnabled() );
-		assertTrue( ((SessionImplementor) secondSession).shouldAutoClose() );
+		assertTrue( ((SessionImpl) secondSession).isAutoCloseSessionEnabled() );
+		assertTrue( ((SessionImpl) secondSession).shouldAutoClose() );
 
 		// now commit the transaction and make sure that does not close the sessions
 		session.getTransaction().commit();
@@ -119,8 +120,8 @@ public void testSharedTransactionContextAutoClosing(SessionFactoryScope scope) {
 				.openSession();
 
 		// directly assert state of the second session
-		assertTrue( ((SessionImplementor) secondSession).isAutoCloseSessionEnabled() );
-		assertTrue( ((SessionImplementor) secondSession).shouldAutoClose() );
+		assertTrue( ((SessionImpl) secondSession).isAutoCloseSessionEnabled() );
+		assertTrue( ((SessionImpl) secondSession).shouldAutoClose() );
 
 		// now rollback the transaction and make sure that does not close the sessions
 		session.getTransaction().rollback();

Original file line number	Diff line number	Diff line change
`@@ -1116,12 +1116,10 @@ public Object getIdentifier(Object entity) {`
`1116`	`1116`	`return getFactory().getPersistenceUnitUtil().getIdentifier(entity);`
`1117`	`1117`	`}`
`1118`	`1118`
`1119`		`- @Override`
`1120`	`1119`	`public boolean isAutoCloseSessionEnabled() {`
`1121`	`1120`	`return getSessionFactoryOptions().isAutoCloseSessionEnabled();`
`1122`	`1121`	`}`
`1123`	`1122`
`1124`		`- @Override`
`1125`	`1123`	`public boolean shouldAutoClose() {`
`1126`	`1124`	`return isAutoCloseSessionEnabled() && !isClosed();`
`1127`	`1125`	`}`