[#2640] Fix compilation errors related to changes in ORM SessionBuilderImpl and RuntimeModelCreationContext

Author: dreab8

hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveRuntimeModelCreationContext.java

@@ -23,6 +23,7 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Value;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -209,6 +210,11 @@ public Property getProperty() {
 			return property;
 		}
 
+		@Override
+		public Value getValue() {
+			return identifier;
+		}
+
 		@Override
 		public Type getType() {
 			return identifier.getType();

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

@@ -15,7 +15,9 @@
 import org.hibernate.Cache;
 import org.hibernate.engine.creation.internal.SessionBuilderImpl;
 import org.hibernate.engine.creation.internal.SessionCreationOptions;
+import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.SessionFactoryImpl;
+import org.hibernate.internal.SessionImpl;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
 import org.hibernate.reactive.context.Context;
@@ -89,7 +91,7 @@ public Context getContext() {
 	@Override
 	public Uni<Mutiny.Session> openSession() {
 		SessionCreationOptions options = options();
-		return uni( () -> connection( options.getTenantIdentifier() ) )
+		return uni( () -> connection( getTenantIdentifier( options ) ) )
 				.chain( reactiveConnection -> create( reactiveConnection,
 						() -> new ReactiveSessionImpl( delegate, options, reactiveConnection ) ) )
 				.map( s -> new MutinySessionImpl(s, this) );
@@ -119,7 +121,7 @@ private static Uni<Void> close(ReactiveConnection connection) {
 	@Override
 	public Uni<Mutiny.StatelessSession> openStatelessSession() {
 		SessionCreationOptions options = options();
-		return uni( () -> connection( options.getTenantIdentifier() ) )
+		return uni( () -> connection( getTenantIdentifier( options ) ) )
 				.chain( reactiveConnection -> create( reactiveConnection,
 						() -> new ReactiveStatelessSessionImpl( delegate, options, reactiveConnection ) ) )
 				.map( s -> new MutinyStatelessSessionImpl(s, this) );
@@ -134,12 +136,22 @@ public Uni<Mutiny.StatelessSession> openStatelessSession(String tenantId) {
 	}
 
 	private SessionCreationOptions options() {
-		return new SessionBuilderImpl( delegate );
+		return new SessionBuilderImpl( delegate ) {
+			@Override
+			protected SessionImplementor createSession() {
+				return new SessionImpl( delegate, this );
+			}
+		};
 	}
 
 	private SessionCreationOptions options(String tenantIdentifier) {
-		return (SessionCreationOptions) new SessionBuilderImpl( delegate )
-				.tenantIdentifier( tenantIdentifier );
+		SessionBuilderImpl sessionBuilder = new SessionBuilderImpl( delegate ) {
+			@Override
+			protected SessionImplementor createSession() {
+				return new SessionImpl( delegate, this );
+			}
+		};
+		return (SessionCreationOptions) sessionBuilder.tenantIdentifier( tenantIdentifier );
 	}
 
 	private CompletionStage<ReactiveConnection> connection(String tenantId) {
@@ -284,4 +296,9 @@ public void close() {
 	public boolean isOpen() {
 		return delegate.isOpen();
 	}
+
+	private String getTenantIdentifier(SessionCreationOptions options) {
+		return options.getTenantIdentifierValue() == null ? null : delegate.getTenantIdentifierJavaType().toString(
+				options.getTenantIdentifierValue() );
+	}
 }

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

@@ -9,7 +9,9 @@
 import org.hibernate.Cache;
 import org.hibernate.engine.creation.internal.SessionBuilderImpl;
 import org.hibernate.engine.creation.internal.SessionCreationOptions;
+import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.SessionFactoryImpl;
+import org.hibernate.internal.SessionImpl;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.reactive.common.spi.Implementor;
 import org.hibernate.reactive.context.Context;
@@ -77,7 +79,7 @@ public Context getContext() {
 	@Override
 	public CompletionStage<Stage.Session> openSession() {
 		SessionCreationOptions options = options();
-		return connection( options.getTenantIdentifier() )
+		return connection( getTenantIdentifier( options ) )
 				.thenCompose( connection -> create( connection,
 						() -> new ReactiveSessionImpl( delegate, options, connection ) ) )
 				.thenApply( StageSessionImpl::new );
@@ -94,7 +96,7 @@ public CompletionStage<Stage.Session> openSession(String tenantId) {
 	@Override
 	public CompletionStage<Stage.StatelessSession> openStatelessSession() {
 		SessionCreationOptions options = options();
-		return connection( options.getTenantIdentifier() )
+		return connection( getTenantIdentifier( options ) )
 				.thenCompose( connection -> create( connection,
 						() -> new ReactiveStatelessSessionImpl( delegate, options, connection ) ) )
 				.thenApply( StageStatelessSessionImpl::new );
@@ -125,12 +127,26 @@ private <S> CompletionStage<S> create(ReactiveConnection connection, Supplier<S>
 	}
 
 	private SessionCreationOptions options() {
-		return new SessionBuilderImpl( delegate );
+		return new SessionBuilderImpl( delegate ) {
+			@Override
+			protected SessionImplementor createSession() {
+				return new SessionImpl( delegate, this );
+			}
+		};
 	}
 
-	private SessionCreationOptions options(String tenantIdentifier) {
-		return (SessionCreationOptions) new SessionBuilderImpl( delegate )
-				.tenantIdentifier( tenantIdentifier );
+	private SessionCreationOptions options(String tenantId) {
+		return new SessionBuilderImpl( delegate ) {
+			@Override
+			protected SessionImplementor createSession() {
+				return new SessionImpl( delegate, this );
+			}
+
+			@Override
+			public Object getTenantIdentifierValue() {
+				return tenantId;
+			}
+		};
 	}
 
 	private CompletionStage<ReactiveConnection> connection(String tenantId) {
@@ -289,4 +305,8 @@ public HibernateCriteriaBuilder getCriteriaBuilder() {
 		return delegate.getCriteriaBuilder();
 	}
 
+	private String getTenantIdentifier(SessionCreationOptions options) {
+		return options.getTenantIdentifierValue() == null ? null : delegate.getTenantIdentifierJavaType().toString(
+				options.getTenantIdentifierValue() );
+	}
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/tuple/entity/ReactiveEntityMetamodel.java

@@ -27,6 +27,7 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Value;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.reactive.bythecode.spi.ReactiveBytecodeEnhancementMetadataPojoImplAdapter;
 import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
@@ -194,6 +195,11 @@ public Property getProperty() {
 			return property;
 		}
 
+		@Override
+		public Value getValue() {
+			return identifier;
+		}
+
 		@Override
 		public Type getType() {
 			return identifier.getType();