Skip to content

[3.1] Upgrade Hibernate ORM to 7.1.11.Final #2887

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 5, 2025
Merged

[3.1] Upgrade Hibernate ORM to 7.1.11.Final #2887

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.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"
Expand Down
44 changes: 0 additions & 44 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 @@ -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;
Expand All @@ -36,15 +35,13 @@
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;

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;
Expand Down Expand Up @@ -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 );
}
Expand Down