Skip to content

Commit

Permalink
Fix missing currentTenantIdentifierResolver
Browse files Browse the repository at this point in the history
1. Add missing sessionFactoryBuilder.applyCurrentTenantIdentifierResolver() .
2. Use getter instead of field for consistency .
  • Loading branch information
quaff authored and vladmihalcea committed Jul 21, 2016
1 parent b90047f commit 5ea8997
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -697,11 +697,14 @@ public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throw
if ( getSessionFactoryObserver() != null ) {
sessionFactoryBuilder.addSessionFactoryObservers( getSessionFactoryObserver() );
}
if ( entityNotFoundDelegate != null ) {
sessionFactoryBuilder.applyEntityNotFoundDelegate( entityNotFoundDelegate );
if ( getEntityNotFoundDelegate() != null ) {
sessionFactoryBuilder.applyEntityNotFoundDelegate( getEntityNotFoundDelegate() );
}
if ( entityTuplizerFactory != null ) {
sessionFactoryBuilder.applyEntityTuplizerFactory( entityTuplizerFactory );
if ( getEntityTuplizerFactory() != null ) {
sessionFactoryBuilder.applyEntityTuplizerFactory( getEntityTuplizerFactory() );
}
if ( getCurrentTenantIdentifierResolver() != null ) {
sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( getCurrentTenantIdentifierResolver() );
}

return sessionFactoryBuilder.build();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.multitenancy.schema;

import org.hibernate.cfg.Configuration;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;

import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;

import static org.junit.Assert.assertSame;

/**
* @author Vlad Mihalcea
*/
@TestForIssue(jiraKey = "HHH-10964")
public class TenantResolverConfigurationTest extends BaseCoreFunctionalTestCase {

private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver();

@Override
protected Configuration constructAndConfigureConfiguration() {
Configuration configuration = super.constructAndConfigureConfiguration();
configuration.setCurrentTenantIdentifierResolver( currentTenantResolver );
return configuration;
}

@Test
public void testConfiguration() throws Exception {
assertSame(currentTenantResolver, sessionFactory().getCurrentTenantIdentifierResolver());
}

private static class TestCurrentTenantIdentifierResolver implements CurrentTenantIdentifierResolver {
private String currentTenantIdentifier;

@Override
public boolean validateExistingCurrentSessions() {
return false;
}

@Override
public String resolveCurrentTenantIdentifier() {
return currentTenantIdentifier;
}
}
}

0 comments on commit 5ea8997

Please sign in to comment.