Small progress on the multi-tenancy tests

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcMultiTenantConnectionProviderInitiator.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
@@ -23,14 +24,15 @@ public class NoJdbcMultiTenantConnectionProviderInitiator implements StandardSer
 
     @Override
     public MultiTenantConnectionProvider initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
-//        final MultiTenancyStrategy strategy = MultiTenancyStrategy.determineMultiTenancyStrategy(  configurationValues );
-//        if ( !strategy.requiresMultiTenantConnectionProvider() ) {
-//            // nothing to do, but given the separate hierarchies have to handle this here.
-//            return null;
-//        }
-
-//        return new NoJdbcMultiTenantConnectionProvider();
-        return null;
+        //TODO surely we should interpret some meaning!?
+        //Couldn't find any other way to force the SessionFactory into multi-tenancy mode. See https://hibernate.atlassian.net/browse/HHH-16246
+        if ( !configurationValues.containsKey( AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER ) ) {
+            //If this configuration key is not set, then multi-tenancy won't happen:
+            return null;
+        }
+        //Otherwise, return a non-null implementation to ensure the SessionFactory enforces the use of a tenantId consistently
+        //across all operations.
+        return new NoJdbcMultiTenantConnectionProvider();
     }
 
     @Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/ReactiveMultitenantNoResolverTest.java

@@ -5,27 +5,25 @@
  */
 package org.hibernate.reactive;
 
-import java.util.Objects;
-import java.util.concurrent.CompletionStage;
-
-import org.assertj.core.api.Assertions;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.unit.TestContext;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.provider.Settings;
 import org.hibernate.reactive.stage.Stage;
 import org.hibernate.reactive.testing.DatabaseSelectionRule;
-
 import org.junit.Rule;
 import org.junit.Test;
 
-import io.smallrye.mutiny.Uni;
-import io.vertx.ext.unit.TestContext;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.persistence.Version;
+import java.util.Objects;
+import java.util.concurrent.CompletionStage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.reactive.MyCurrentTenantIdentifierResolver.Tenant.DEFAULT;
@@ -49,18 +47,19 @@ public class ReactiveMultitenantNoResolverTest extends BaseReactiveTest {
 	@Rule
 	public DatabaseSelectionRule selectionRule = DatabaseSelectionRule.runOnlyFor( POSTGRESQL );
 
-	@Override
-	protected Configuration constructConfiguration() {
-		Configuration configuration = super.constructConfiguration();
-		configuration.addAnnotatedClass( GuineaPig.class );
-		Assertions.fail( "ORM-6: TODO: Check how multi-tenancy works in ORM 6" );
-		// FIXME: Find new syntax for ORM 6
-		// configuration.setProperty( Settings.MULTI_TENANT, MultiTenancyStrategy.DATABASE.name() );
-		// Contains the SQL scripts for the creation of the additional databases
-		configuration.setProperty( Settings.HBM2DDL_IMPORT_FILES, "/multitenancy-test.sql" );
-		configuration.setProperty( Settings.SQL_CLIENT_POOL, TenantDependentPool.class.getName() );
-		return configuration;
-	}
+    @Override
+    protected Configuration constructConfiguration() {
+        Configuration configuration = super.constructConfiguration();
+        configuration.addAnnotatedClass(GuineaPig.class);
+        configuration.setProperty(
+                AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
+                "anything"
+        );//FIXME this is terrible?
+        // Contains the SQL scripts for the creation of the additional databases
+        configuration.setProperty(Settings.HBM2DDL_IMPORT_FILES, "/multitenancy-test.sql");
+        configuration.setProperty(Settings.SQL_CLIENT_POOL, TenantDependentPool.class.getName());
+        return configuration;
+    }
 
 	@Test
 	public void reactivePersistFindDelete(TestContext context) {

hibernate-reactive-core/src/test/java/org/hibernate/reactive/ReactiveMultitenantTest.java

@@ -7,8 +7,8 @@
 
 import java.util.Objects;
 
-import org.assertj.core.api.Assertions;
 import org.hibernate.LockMode;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.reactive.provider.Settings;
 import org.hibernate.reactive.testing.DatabaseSelectionRule;
@@ -43,9 +43,10 @@ public class ReactiveMultitenantTest extends BaseReactiveTest {
 	protected Configuration constructConfiguration() {
 		Configuration configuration = super.constructConfiguration();
 		configuration.addAnnotatedClass( GuineaPig.class );
-		Assertions.fail( "ORM-6: TODO: Check how multi-tenancy works in ORM 6" );
-		// FIXME: Find new syntax for ORM 6
-		// configuration.setProperty( Settings.MULTI_TENANT, MultiTenancyStrategy.DATABASE.name() );
+		configuration.setProperty(
+				AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
+				"anything"
+		);//FIXME this is terrible?
 		configuration.getProperties().put( Settings.MULTI_TENANT_IDENTIFIER_RESOLVER, TENANT_RESOLVER );
 		// Contains the SQL scripts for the creation of the additional databases
 		configuration.setProperty( Settings.HBM2DDL_IMPORT_FILES, "/multitenancy-test.sql" );