From 1cb442f45da385d55c14d30345f074f7425de925 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Dec 2025 10:00:24 +0000 Subject: [PATCH] [#2880] Upgrade Hibernate ORM to 7.1.11.Final Bumps the hibernate group with 4 updates: [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm), [org.hibernate.orm:hibernate-jcache](https://github.com/hibernate/hibernate-orm), [org.hibernate.orm:hibernate-jpamodelgen](https://github.com/hibernate/hibernate-orm) and org.hibernate.orm. and fix some comiplations error Updates `org.hibernate.orm:hibernate-core` from 7.1.10.Final to 7.1.11.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.11/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.1.10...7.1.11) Updates `org.hibernate.orm:hibernate-jcache` from 7.1.10.Final to 7.1.11.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.11/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.1.10...7.1.11) Updates `org.hibernate.orm:hibernate-jpamodelgen` from 7.1.10.Final to 7.1.11.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.11/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.1.10...7.1.11) Updates `org.hibernate.orm:hibernate-jcache` from 7.1.10.Final to 7.1.11.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.11/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.1.10...7.1.11) Updates `org.hibernate.orm:hibernate-jpamodelgen` from 7.1.10.Final to 7.1.11.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.1.11/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.1.10...7.1.11) Updates `org.hibernate.orm` from 7.1.10.Final to 7.1.11.Final --- updated-dependencies: - dependency-name: org.hibernate.orm:hibernate-core dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate - dependency-name: org.hibernate.orm:hibernate-jcache dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate - dependency-name: org.hibernate.orm:hibernate-jpamodelgen dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate - dependency-name: org.hibernate.orm:hibernate-jcache dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate - dependency-name: org.hibernate.orm:hibernate-jpamodelgen dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate - dependency-name: org.hibernate.orm dependency-version: 7.1.11.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: hibernate ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 4 +- .../ReactiveEntityInitializerImpl.java | 44 ------------------- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bb3113e9..c4f32ac88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] assertjVersion = "3.27.6" -hibernateOrmVersion = "7.1.10.Final" -hibernateOrmGradlePluginVersion = "7.1.10.Final" +hibernateOrmVersion = "7.1.11.Final" +hibernateOrmGradlePluginVersion = "7.1.11.Final" 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/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 f67d7e35f..aeed4f26a 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 @@ -22,7 +22,6 @@ import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.LazyInitializer; -import org.hibernate.proxy.map.MapProxy; import org.hibernate.reactive.session.ReactiveQueryProducer; import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState; import org.hibernate.reactive.sql.results.graph.ReactiveDomainResultsAssembler; @@ -36,7 +35,6 @@ import org.hibernate.sql.results.graph.InitializerParent; import org.hibernate.sql.results.graph.entity.EntityResultGraphNode; import org.hibernate.sql.results.graph.entity.internal.EntityInitializerImpl; -import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions; import org.hibernate.sql.results.jdbc.spi.RowProcessingState; import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.type.Type; @@ -44,7 +42,6 @@ import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCHED_PROPERTY; import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable; import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable; -import static org.hibernate.loader.internal.CacheLoadHelper.loadFromSecondLevelCache; import static org.hibernate.metamodel.mapping.ForeignKeyDescriptor.Nature.TARGET; import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer; import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture; @@ -578,47 +575,6 @@ else if ( getEntityDescriptor().canUseReferenceCacheEntries() ) { } } - // FIXME: I could change the scope of this method in ORM - private Object resolveToOptionalInstance(ReactiveEntityInitializerData data) { - if ( isResultInitializer() ) { - // this isEntityReturn bit is just for entity loaders, not hql/criteria - final JdbcValuesSourceProcessingOptions processingOptions = - data.getRowProcessingState().getJdbcValuesSourceProcessingState().getProcessingOptions(); - return matchesOptionalInstance( data, processingOptions ) ? processingOptions.getEffectiveOptionalObject() : null; - } - else { - return null; - } - } - - // FIXME: I could change the scope of this method in ORM - private boolean isProxyInstance(Object proxy) { - return proxy != null - && ( proxy instanceof MapProxy || getEntityDescriptor().getJavaType().getJavaTypeClass().isInstance( proxy ) ); - } - - // FIXME: I could change the scope of this method in ORM - private Object resolveInstanceFromCache(ReactiveEntityInitializerData data) { - return loadFromSecondLevelCache( - data.getRowProcessingState().getSession().asEventSource(), - null, - data.getLockMode(), - getEntityDescriptor(), - data.getEntityKey() - ); - } - - // FIXME: I could change the scope of this method in ORM - private boolean matchesOptionalInstance( - ReactiveEntityInitializerData data, - JdbcValuesSourceProcessingOptions processingOptions) { - final Object optionalEntityInstance = processingOptions.getEffectiveOptionalObject(); - final Object requestedEntityId = processingOptions.getEffectiveOptionalId(); - return requestedEntityId != null - && optionalEntityInstance != null - && requestedEntityId.equals( data.getEntityKey().getIdentifier() ); - } - private boolean isExistingEntityInitialized(Object existingEntity) { return Hibernate.isInitialized( existingEntity ); }