[wip/4.2] Upgrade Hibernate ORM to 7.2.0.CR3

gradle.properties

@@ -40,22 +40,22 @@ org.gradle.java.installations.auto-download=false
 #db = MSSQL
 
 # Enable the maven Central Snapshot repository, when set to any value (the value is ignored)
-#enableCentralSonatypeSnapshotsRep = true
+enableCentralSonatypeSnapshotsRep = true
 
 # Enable the maven local repository (for local development when needed) when present (value ignored)
 #enableMavenLocalRepo = true
 
 ### Settings the following properties will override the version defined in gradle/libs.versions.toml
 
 # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
-#hibernateOrmVersion = 7.1.1.Final
+hibernateOrmVersion = 7.2.+
 
 # Override default Hibernate ORM Gradle plugin version
-#hibernateOrmGradlePluginVersion = 7.1.1.Final
+hibernateOrmGradlePluginVersion = 7.2.+
 
 # 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
-#skipOrmVersionParsing = true
+skipOrmVersionParsing = true
 
 # Override default Vert.x Sql client version
 #vertxSqlClientVersion = 5.0.2-SNAPSHOT

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 assertjVersion = "3.27.6"
-hibernateOrmVersion = "7.2.0.CR2"
-hibernateOrmGradlePluginVersion = "7.2.0.CR2"
+hibernateOrmVersion = "7.2.0.CR3"
+hibernateOrmGradlePluginVersion = "7.2.0.CR3"
 jacksonDatabindVersion = "2.20.1"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java

@@ -415,9 +415,8 @@ else if ( isValueGenerationInSql( generator, factory().getJdbcServices().getDial
 					final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityPersister().getIdentifierMapping();
 					final String[] columnValues = generator.getReferencedColumnValues( dialect );
 					tableMapping.getKeyMapping().forEachKeyColumn( (i, column) -> tableInsertBuilder.addKeyColumn(
-							column.getColumnName(),
 							columnValues[i],
-							identifierMapping.getJdbcMapping()
+							identifierMapping
 					) );
 				}
 			}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveJdbcSelectWithActions.java

@@ -132,7 +132,7 @@ public static class Builder implements JdbcSelectWithActionsBuilder {
 		protected LockOptions lockOptions;
 		protected QuerySpec lockingTarget;
 		protected LockingClauseStrategy lockingClauseStrategy;
-		boolean isFollonOnLockStrategy;
+		boolean isFollowOnLockStrategy;
 
 		@Override
 		public Builder setPrimaryAction(JdbcSelect primaryAction) {
@@ -179,8 +179,8 @@ public Builder setLockingClauseStrategy(LockingClauseStrategy lockingClauseStrat
 		}
 
 		@Override
-		public Builder setIsFollowOnLockStrategy(boolean isFollonOnLockStrategy) {
-			this.isFollonOnLockStrategy = isFollonOnLockStrategy;
+		public Builder setIsFollowOnLockStrategy(boolean isFollowOnLockStrategy) {
+			this.isFollowOnLockStrategy = isFollowOnLockStrategy;
 			return this;
 		}
 
@@ -194,7 +194,7 @@ public JdbcSelect build() {
 						)
 				);
 			}
-			if ( isFollonOnLockStrategy ) {
+			if ( isFollowOnLockStrategy ) {
 				ReactiveFollowOnLockingAction.apply( lockOptions, lockingTarget, lockingClauseStrategy, this );
 			}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/lock/ReactiveFollowOnLockingAction.java

@@ -8,11 +8,9 @@
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.Locking;
-import org.hibernate.engine.spi.CollectionKey;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
@@ -32,10 +30,8 @@
 import java.lang.invoke.MethodHandles;
 import java.sql.Connection;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletionStage;
 
-import static java.util.Collections.emptyMap;
 import static org.hibernate.reactive.util.impl.CompletionStages.loop;
 
 /**
@@ -98,10 +94,7 @@ public CompletionStage<Void> reactivePerformReactivePostAction(
 
 		// collect registrations by entity type
 		final var entitySegments = segmentLoadedValues();
-		final Map<EntityMappingType, Map<PluralAttributeMapping, List<CollectionKey>>> collectionSegments =
-				lockScope == Locking.Scope.INCLUDE_FETCHES
-						? segmentLoadedCollections()
-						: emptyMap();
+		final var collectionSegments = segmentLoadedCollections();
 
 		// for each entity-type, prepare a locking select statement per table.
 		// this is based on the attributes for "state array" ordering purposes -