Skip to content

[4.2] Upgrade Hibernate ORM to 7.2.0.CR4 #2898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavideD merged 1 commit into from
Dec 11, 2025
Merged

[4.2] Upgrade Hibernate ORM to 7.2.0.CR4 #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
assertjVersion = "3.27.6"
hibernateOrmVersion = "7.2.0.CR3"
hibernateOrmGradlePluginVersion = "7.2.0.CR3"
hibernateOrmVersion = "7.2.0.CR4"
hibernateOrmGradlePluginVersion = "7.2.0.CR4"
jacksonDatabindVersion = "2.20.1"
jbossLoggingAnnotationVersion = "3.0.4.Final"
jbossLoggingVersion = "3.6.1.Final"
Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected <K> CompletionStage<List<E>> performOrderedMultiLoad(

return loop( 0, ids.length, i -> {
final Object id = coerce
? getLoadable().getIdentifierMapping().getJavaType().coerce( ids[i], session )
? getLoadable().getIdentifierMapping().getJavaType().coerce( ids[i] )
: ids[i];

final EntityKey entityKey = new EntityKey( id, getLoadable().getEntityPersister() );
Expand Down Expand Up @@ -319,7 +319,7 @@ protected final <R, K> K[] processResolvableEntities(
for ( int i = 0; i < ids.length; i++ ) {
final Object id;
if ( coerce ) {
id = getLoadable().getIdentifierMapping().getJavaType().coerce( ids[i], session );
id = getLoadable().getIdentifierMapping().getJavaType().coerce( ids[i] );
}
else {
id = ids[i];
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderStandard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected CompletionStage<List<T>> performOrderedMultiLoad(
final boolean coerce = isIdCoercionEnabled();
return loop( 0, ids.length, i -> {
final Object id = coerce
? getEntityDescriptor().getIdentifierMapping().getJavaType().coerce( ids[i], session )
? getEntityDescriptor().getIdentifierMapping().getJavaType().coerce( ids[i] )
: ids[i];

final EntityKey entityKey = new EntityKey( id, getLoadable().getEntityPersister() );
Expand Down Expand Up @@ -313,7 +313,7 @@ protected CompletionStage<List<T>> performUnorderedMultiLoad(
final boolean coerce = isIdCoercionEnabled();
for ( Object o : ids ) {
final Object id = coerce
? getEntityDescriptor().getIdentifierMapping().getJavaType().coerce( o, session )
? getEntityDescriptor().getIdentifierMapping().getJavaType().coerce( o )
: o;

final EntityKey entityKey = new EntityKey( id, getLoadable().getEntityPersister() );
Expand Down
8 changes: 4 additions & 4 deletions ...g/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public ReactiveEntityInitializerImpl(
protected void resolveEntityKey(EntityInitializerData original, Object id) {
ReactiveEntityInitializerData data = (ReactiveEntityInitializerData) original;
if ( data.getConcreteDescriptor() == null ) {
data.setConcreteDescriptor( determineConcreteEntityDescriptor( data.getRowProcessingState(), discriminatorAssembler(), getEntityDescriptor() ) );
data.setConcreteDescriptor( determineConcreteEntityDescriptor( data.getRowProcessingState(), getDiscriminatorAssembler(), getEntityDescriptor() ) );
assert data.getConcreteDescriptor() != null;
}
data.setEntityKey( new EntityKey( id, data.getConcreteDescriptor() ) );
Expand Down Expand Up @@ -179,9 +179,9 @@ assert getInitializedPart() instanceof ToOneAttributeMapping
else if ( lazyInitializer.isUninitialized() ) {
data.setState( State.RESOLVED );
// Read the discriminator from the result set if necessary
EntityPersister persister = discriminatorAssembler() == null
EntityPersister persister = getDiscriminatorAssembler() == null
? getEntityDescriptor()
: determineConcreteEntityDescriptor( rowProcessingState, discriminatorAssembler(), getEntityDescriptor() );
: determineConcreteEntityDescriptor( rowProcessingState, getDiscriminatorAssembler(), getEntityDescriptor() );
data.setConcreteDescriptor( persister );
assert data.getConcreteDescriptor() != null;
resolveEntityKey( data, lazyInitializer.getIdentifier() );
Expand Down Expand Up @@ -744,7 +744,7 @@ private CompletionStage<Boolean> initializeId(ReactiveEntityInitializerData data
else {
data.setConcreteDescriptor( determineConcreteEntityDescriptor(
rowProcessingState,
discriminatorAssembler(),
getDiscriminatorAssembler(),
getEntityDescriptor()
) );
assert data.getConcreteDescriptor() != null;
Expand Down