From d1b9061c4a90836f8f2f5feac75196043e4bf7ca Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Thu, 11 Dec 2025 11:57:27 +0100 Subject: [PATCH] [#2897] Upgrade Hibernate ORM to 7.2.0.CR4 --- gradle/libs.versions.toml | 4 ++-- .../internal/ReactiveMultiIdEntityLoaderArrayParam.java | 4 ++-- .../ast/internal/ReactiveMultiIdEntityLoaderStandard.java | 4 ++-- .../entity/internal/ReactiveEntityInitializerImpl.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8181535ba..8a8c11e44 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java index fb495b3e8..ba5480359 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java @@ -100,7 +100,7 @@ protected CompletionStage> 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() ); @@ -319,7 +319,7 @@ protected final 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]; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderStandard.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderStandard.java index beea34e91..a99f18768 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderStandard.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderStandard.java @@ -105,7 +105,7 @@ protected CompletionStage> 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() ); @@ -313,7 +313,7 @@ protected CompletionStage> 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() ); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java index 56366b9cd..5edbb421f 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java @@ -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() ) ); @@ -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() ); @@ -744,7 +744,7 @@ private CompletionStage initializeId(ReactiveEntityInitializerData data else { data.setConcreteDescriptor( determineConcreteEntityDescriptor( rowProcessingState, - discriminatorAssembler(), + getDiscriminatorAssembler(), getEntityDescriptor() ) ); assert data.getConcreteDescriptor() != null;