[#1930] Update Hibernate ORM to 6.6.0.Alpha1

Author: DavideD

README.md

@@ -37,7 +37,7 @@ Hibernate Reactive has been tested with:
 - CockroachDB v23.1
 - MS SQL Server 2022
 - Oracle 23
-- [Hibernate ORM][] 6.5.2.Final
+- [Hibernate ORM][] 6.6.0.Alpha1
 - [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.7
 - [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.7
 - [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.7

build.gradle

@@ -53,7 +53,7 @@ version = projectVersion
 // ./gradlew clean build -PhibernateOrmVersion=5.6.15-SNAPSHOT
 ext {
     if ( !project.hasProperty('hibernateOrmVersion') ) {
-        hibernateOrmVersion = '6.5.2.Final'
+        hibernateOrmVersion = '6.6.0.Alpha1'
     }
     if ( !project.hasProperty( 'hibernateOrmGradlePluginVersion' ) ) {
         // Same as ORM as default

gradle.properties

@@ -35,12 +35,12 @@ org.gradle.java.installations.auto-download=false
 #enableMavenLocalRepo = true
 
 # Override default Hibernate ORM version
-#hibernateOrmVersion = 6.5.2.Final
+#hibernateOrmVersion = 6.6.0.Alpha1
 
 # Override default Hibernate ORM Gradle plugin version
 # Using the stable version because I don't know how to configure the build to download the snapshot version from
 # a remote repository
-#hibernateOrmGradlePluginVersion = 6.5.2.Final
+#hibernateOrmGradlePluginVersion = 6.6.0.Alpha1
 
 # If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
 # this is required when using intervals or weird versions or the build will fail

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

@@ -81,13 +81,15 @@ protected EntityFetch buildEntityDelayedFetch(
 			ToOneAttributeMapping fetchedAttribute,
 			NavigablePath navigablePath,
 			DomainResult<?> keyResult,
-			boolean selectByUniqueKey) {
+			boolean selectByUniqueKey,
+			DomainResultCreationState creationState) {
 		return new ReactiveEntityDelayedFetchImpl(
 				fetchParent,
 				fetchedAttribute,
 				navigablePath,
 				keyResult,
-				selectByUniqueKey
+				selectByUniqueKey,
+				creationState
 		);
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityDelayedFetchInitializer.java

@@ -24,6 +24,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.FetchParentAccess;
+import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchInitializer;
 import org.hibernate.type.Type;
 
@@ -38,8 +39,9 @@ public ReactiveEntityDelayedFetchInitializer(
 			NavigablePath fetchedNavigable,
 			ToOneAttributeMapping referencedModelPart,
 			boolean selectByUniqueKey,
-			DomainResultAssembler<?> identifierAssembler) {
-		super( parentAccess, fetchedNavigable, referencedModelPart, selectByUniqueKey, identifierAssembler );
+			DomainResultAssembler<?> identifierAssembler,
+			BasicResultAssembler<?> discriminatorAssembler) {
+		super( parentAccess, fetchedNavigable, referencedModelPart, selectByUniqueKey, identifierAssembler, discriminatorAssembler );
 		this.referencedModelPart = referencedModelPart;
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveEntityDelayedFetchImpl.java

@@ -10,8 +10,10 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResult;
+import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.FetchParentAccess;
+import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchImpl;
 
@@ -21,20 +23,22 @@ public ReactiveEntityDelayedFetchImpl(
 			ToOneAttributeMapping fetchedAttribute,
 			NavigablePath navigablePath,
 			DomainResult<?> keyResult,
-			boolean selectByUniqueKey) {
-		super( fetchParent, fetchedAttribute, navigablePath, keyResult, selectByUniqueKey );
+			boolean selectByUniqueKey,
+			DomainResultCreationState creationState) {
+		super( fetchParent, fetchedAttribute, navigablePath, keyResult, selectByUniqueKey, creationState );
 	}
 
 	@Override
 	public EntityInitializer createInitializer(FetchParentAccess parentAccess, AssemblerCreationState creationState) {
-		return new ReactiveEntityDelayedFetchInitializer( parentAccess,
-														  getNavigablePath(),
-														  getEntityValuedModelPart(),
-														  isSelectByUniqueKey(),
-														  getKeyResult().createResultAssembler(
-																  parentAccess,
-																  creationState
-														  )
+		return new ReactiveEntityDelayedFetchInitializer(
+				parentAccess,
+				getNavigablePath(),
+				getEntityValuedModelPart(),
+				isSelectByUniqueKey(),
+				getKeyResult().createResultAssembler( parentAccess, creationState ),
+				getDiscriminatorFetch() != null
+						? (BasicResultAssembler<?>) getDiscriminatorFetch().createResultAssembler( parentAccess, creationState )
+						: null
 		);
 	}
 }