[#764] Fix multitenancy without a CurrentTenantIdentifierResolver

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionFactoryImpl.java

@@ -74,7 +74,7 @@ public Mutiny.Session openSession() {
 	@Override
 	public Mutiny.Session openSession(String tenantId) {
 		return new MutinySessionImpl(
-				new ReactiveSessionImpl( delegate, options(), proxyConnection( tenantId ) ),
+				new ReactiveSessionImpl( delegate, options( tenantId ), proxyConnection( tenantId ) ),
 				this
 		);
 	}
@@ -88,7 +88,7 @@ Uni<Mutiny.Session> newSession() throws HibernateException {
 
 	Uni<Mutiny.Session> newSession(String tenantId) throws HibernateException {
 		return uni( () -> connection( tenantId ) )
-				.map( reactiveConnection -> new ReactiveSessionImpl( delegate, options(), reactiveConnection ) )
+				.map( reactiveConnection -> new ReactiveSessionImpl( delegate, options( tenantId ), reactiveConnection ) )
 				.map( s -> new MutinySessionImpl(s, this) );
 	}
 
@@ -112,6 +112,11 @@ private SessionCreationOptions options() {
 		return new SessionFactoryImpl.SessionBuilderImpl<>( delegate );
 	}
 
+	private SessionCreationOptions options(String tenantIdentifier) {
+		return (SessionCreationOptions) new SessionFactoryImpl.SessionBuilderImpl<>( delegate )
+				.tenantIdentifier( tenantIdentifier );
+	}
+
 	private CompletionStage<ReactiveConnection> connection(String tenantId) {
 		assertUseOnEventLoop();
 		return tenantId == null

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionFactoryImpl.java

@@ -70,7 +70,7 @@ public Stage.Session openSession() {
 	@Override
 	public Stage.Session openSession(String tenantId) {
 		return new StageSessionImpl(
-				new ReactiveSessionImpl( delegate, options(), proxyConnection( tenantId ) ),
+				new ReactiveSessionImpl( delegate, options( tenantId ), proxyConnection( tenantId ) ),
 				this
 		);
 	}
@@ -92,7 +92,7 @@ CompletionStage<Stage.Session> newSession() {
 
 	CompletionStage<Stage.Session> newSession(String tenantId) {
 		return stage( v -> connection( tenantId )
-				.thenApply( connection -> new ReactiveSessionImpl( delegate, options(), connection ) )
+				.thenApply( connection -> new ReactiveSessionImpl( delegate, options( tenantId ), connection ) )
 				.thenApply( s -> new StageSessionImpl(s, this) ) );
 	}
 
@@ -107,6 +107,11 @@ private SessionCreationOptions options() {
 		return new SessionFactoryImpl.SessionBuilderImpl<>( delegate );
 	}
 
+	private SessionCreationOptions options(String tenantIdentifier) {
+		return (SessionCreationOptions) new SessionFactoryImpl.SessionBuilderImpl<>( delegate )
+				.tenantIdentifier( tenantIdentifier );
+	}
+
 	private CompletionStage<ReactiveConnection> connection(String tenantId) {
 		return tenantId == null
 				? connectionPool.getConnection()