From 14f996b5ceed6733556a2f1ae2090486becce2d9 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Thu, 20 Nov 2025 17:02:17 +0100 Subject: [PATCH] [#2803] Upgrade Hibernate ORM to 7.2.0.CR3 --- gradle/libs.versions.toml | 4 ++-- .../mutation/ReactiveInsertCoordinatorStandard.java | 3 +-- .../sql/exec/internal/ReactiveJdbcSelectWithActions.java | 8 ++++---- .../internal/lock/ReactiveFollowOnLockingAction.java | 9 +-------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b0c65b7d..f8d3502d3 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java index 3fa811b99..cbc599f5a 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java +++ b/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 ) ); } } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveJdbcSelectWithActions.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveJdbcSelectWithActions.java index 3f6b8e28f..c8b4c5134 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveJdbcSelectWithActions.java +++ b/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 ); } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/lock/ReactiveFollowOnLockingAction.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/lock/ReactiveFollowOnLockingAction.java index 4fd59a2b0..7cedd33e5 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/lock/ReactiveFollowOnLockingAction.java +++ b/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 reactivePerformReactivePostAction( // collect registrations by entity type final var entitySegments = segmentLoadedValues(); - final Map>> 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 -