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

HHH-17972 - Allow changing tenant identifier with restrictions when a MultiTenantConnectionProvider is in use 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2024-05-16 22:17:03 +02:00 committed by Christian Beikov
parent 02f085e153
commit 4866201bf0
2 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2050,6 +2050,7 @@ public class SessionImpl
implements SharedSessionBuilder, SharedSessionCreationOptions {
private final SessionImpl session;
private boolean shareTransactionContext;
private boolean tenantIdChanged;
private SharedSessionBuilderImpl(SessionImpl session) {
super( (SessionFactoryImpl) session.getFactory() );
@ -2057,25 +2058,31 @@ public class SessionImpl
super.tenantIdentifier( session.getTenantIdentifierValue() );
}
@Override
public SessionImpl openSession() {
if ( session.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
if ( tenantIdChanged && shareTransactionContext ) {
throw new SessionException( "Cannot redefine the tenant identifier on a child session if the connection is reused" );
}
}
return super.openSession();
}
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// SharedSessionBuilder
@Override @Deprecated
public SharedSessionBuilderImpl tenantIdentifier(String tenantIdentifier) {
if ( !session.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
throw new SessionException( "Cannot redefine tenant identifier on child session" );
}
super.tenantIdentifier( tenantIdentifier );
tenantIdChanged = true;
return this;
}
@Override
public SharedSessionBuilderImpl tenantIdentifier(Object tenantIdentifier) {
if ( session.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
throw new SessionException( "Cannot redefine tenant identifier on child session" );
}
super.tenantIdentifier( tenantIdentifier );
tenantIdChanged = true;
return this;
}

72
hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/AbstractMultiTenancyTest.java
View File

@ -17,17 +17,18 @@ import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import org.hibernate.Session;
import org.hibernate.SessionException;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.SessionFactoryBuilder;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.internal.util.PropertiesHelper;
import org.hibernate.query.Query;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.Stoppable;
import org.hibernate.tool.schema.internal.HibernateSchemaManagementTool;
@ -37,11 +38,17 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase;
import org.hibernate.testing.AfterClassOnce;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.util.ServiceRegistryUtil;
import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* @author Vlad Mihalcea
*/
@ -82,6 +89,12 @@ public abstract class AbstractMultiTenancyTest extends BaseUnitTestCase {
}
}
@After
public void cleanup() {
doInSession(FRONT_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
doInSession(BACK_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
}
//tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
protected void registerConnectionProvider(String tenantIdentifier) {
@ -116,6 +129,63 @@ public abstract class AbstractMultiTenancyTest extends BaseUnitTestCase {
//end::multitenacy-multitenacy-hibernate-same-entity-example[]
}
@Test
@JiraKey( value = "HHH-17972")
public void testChangeTenantWithoutConnectionReuse() {
Person person = new Person();
person.setId( 1L );
person.setName( "John Doe" );
Person person2 = new Person();
person2.setId( 2L );
person2.setName( "Jane Doe" );
Transaction t;
Session session = null;
Session newSession = null;
try {
session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession();
t = session.beginTransaction();
session.persist( person );
t.commit();
Query<Person> sessionQuery = session.createQuery( "from Person", Person.class );
assertEquals( 1, sessionQuery.getResultList().size() );
assertEquals( "John Doe", sessionQuery.getResultList().get( 0 ).getName() );
newSession = session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).openSession();
t = newSession.beginTransaction();
newSession.persist( person2 );
t.commit();
Query<Person> newSessionQuery = newSession.createQuery( "from Person", Person.class );
assertEquals( 1, newSessionQuery.getResultList().size() );
assertEquals( "Jane Doe", newSessionQuery.getResultList().get( 0 ).getName() );
}
finally {
if (session != null) {
session.close();
}
if (newSession != null) {
newSession.close();
}
}
}
@Test
@JiraKey( value = "HHH-17972")
public void testChangeTenantWithConnectionReuse() {
try (Session session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession()) {
Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
SessionException.class,
() -> session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).connection().openSession()
);
Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
SessionException.class,
() -> session.sessionWithOptions().connection().tenantIdentifier( BACK_END_TENANT ).openSession()
);
}
}
protected Properties properties() {
Properties properties = new Properties();
URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate.properties");