Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finally remove all remaining traces of Session.connection()

This commit is contained in:
Gavin King 2021-12-09 16:00:14 +01:00 committed by Steve Ebersole
parent 75fc936b95
commit 042bd47825
6 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hibernate-core/src/main/java/org/hibernate/StatelessSession.java
View File

@ -7,7 +7,6 @@
package org.hibernate;
import java.io.Closeable;
import java.sql.Connection;
import org.hibernate.annotations.Remove;
import org.hibernate.query.NativeQuery;
@ -157,22 +156,6 @@ public interface StatelessSession extends SharedSessionContract, AutoCloseable,
*/
void refresh(String entityName, Object entity, LockMode lockMode);
/**
* Returns the current JDBC connection associated with this
* instance.
* <p>
* If the session is using aggressive connection release (as in a
* CMT environment), it is the application's responsibility to
* close the connection returned by this call. Otherwise, the
* application should not close the connection.
*
* @deprecated just missed when deprecating same method from {@link Session}
*
* @return The connection associated with this stateless session
*/
@Deprecated
Connection connection();
@Remove
default <T> NativeQuery<T> createSQLQuery(String queryString) {
return createNativeQuery( queryString );

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

@ -268,11 +268,6 @@ public class SessionDelegatorBaseImpl implements SessionImplementor {
delegate.lock( entity, lockMode, properties );
}
@Override
public Connection connection() {
return delegate.connection();
}
@Override
public void flush() {
delegate.flush();

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

@ -387,8 +387,6 @@ public interface SharedSessionContractImplementor
*/
FlushMode getHibernateFlushMode();
Connection connection();
void flush();
boolean isEventSource();

6
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -487,12 +487,6 @@ public class SessionImpl
closeWithoutOpenChecks();
}
@Override
public Connection connection() throws HibernateException {
checkOpenOrWaitingForAutoClose();
return getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
}
@Override
public Connection disconnect() throws HibernateException {
checkOpen();

6
hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -394,12 +394,6 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
return guessEntityName( object );
}
@Override
public Connection connection() {
checkOpen();
return getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
}
// @Override
// public int executeUpdate(String query, QueryParameters queryParameters) throws HibernateException {
// checkOpen();

21
hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java
View File

@ -14,7 +14,6 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.query.Query;
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
@ -505,17 +504,16 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest {
inTransaction( s1 -> {
// Transaction used by s1 is already started.
// Assert that the Connection is already physically connected.
SharedSessionContractImplementor s1Implementor = (SharedSessionContractImplementor) s1;
assertTrue( s1Implementor.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected() );
assertTrue( s1.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected() );
// Assert that the same Connection will be used for s1's entire transaction
assertEquals(
PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION,
s1Implementor.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
s1.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
);
// Get the Connection s1 will use.
final Connection connection1 = s1Implementor.connection();
final Connection connection1 = s1.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
// Avoid a pessimistic lock exception by not doing anything with s1 until
// after a second Session (with a different connection) is used
@ -523,15 +521,14 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest {
inTransaction( s2 -> {
// Check same assertions for s2 as was done for s1.
SharedSessionContractImplementor s2Implementor = (SharedSessionContractImplementor) s2;
assertTrue( s2Implementor.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected() );
assertTrue( s2.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected() );
assertEquals(
PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION,
s2Implementor.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
s2.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
);
// Get the Connection s2 will use.
Connection connection2 = s2Implementor.connection();
Connection connection2 = s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
// Assert that connection2 is not the same as connection1
assertNotSame( connection1, connection2 );
@ -543,12 +540,12 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest {
);
// Assert the Connection has not changed
assertSame( connection2, s2Implementor.connection() );
assertSame( connection2, s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection() );
}
);
// Assert that the Connection used by s1 has hot changed.
assertSame( connection1, s1Implementor.connection() );
assertSame( connection1, s1.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection() );
// Execute a bulk operation on s1 (using connection1)
assertEquals(
@ -558,7 +555,7 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest {
);
// Assert that the Connection used by s1 has hot changed.
assertSame( connection1, s1Implementor.connection() );
assertSame( connection1, s1.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection() );
} );