Skip to content

Commit 880e1e6

Browse files
dependabot[bot]DavideD
authored andcommitted
[#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](hibernate/hibernate-orm@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](hibernate/hibernate-orm@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](hibernate/hibernate-orm@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](hibernate/hibernate-orm@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](hibernate/hibernate-orm@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] <support@github.com>
1 parent 94a325f commit 880e1e6

File tree

2 files changed

+2
-46
lines changed

2 files changed

+2
-46
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
assertjVersion = "3.27.6"
3-
hibernateOrmVersion = "7.1.10.Final"
4-
hibernateOrmGradlePluginVersion = "7.1.10.Final"
3+
hibernateOrmVersion = "7.1.11.Final"
4+
hibernateOrmGradlePluginVersion = "7.1.11.Final"
55
jacksonDatabindVersion = "2.20.1"
66
jbossLoggingAnnotationVersion = "3.0.4.Final"
77
jbossLoggingVersion = "3.6.1.Final"

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
2323
import org.hibernate.persister.entity.EntityPersister;
2424
import org.hibernate.proxy.LazyInitializer;
25-
import org.hibernate.proxy.map.MapProxy;
2625
import org.hibernate.reactive.session.ReactiveQueryProducer;
2726
import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
2827
import org.hibernate.reactive.sql.results.graph.ReactiveDomainResultsAssembler;
@@ -36,15 +35,13 @@
3635
import org.hibernate.sql.results.graph.InitializerParent;
3736
import org.hibernate.sql.results.graph.entity.EntityResultGraphNode;
3837
import org.hibernate.sql.results.graph.entity.internal.EntityInitializerImpl;
39-
import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
4038
import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
4139
import org.hibernate.stat.spi.StatisticsImplementor;
4240
import org.hibernate.type.Type;
4341

4442
import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCHED_PROPERTY;
4543
import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
4644
import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
47-
import static org.hibernate.loader.internal.CacheLoadHelper.loadFromSecondLevelCache;
4845
import static org.hibernate.metamodel.mapping.ForeignKeyDescriptor.Nature.TARGET;
4946
import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
5047
import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
@@ -578,47 +575,6 @@ else if ( getEntityDescriptor().canUseReferenceCacheEntries() ) {
578575
}
579576
}
580577

581-
// FIXME: I could change the scope of this method in ORM
582-
private Object resolveToOptionalInstance(ReactiveEntityInitializerData data) {
583-
if ( isResultInitializer() ) {
584-
// this isEntityReturn bit is just for entity loaders, not hql/criteria
585-
final JdbcValuesSourceProcessingOptions processingOptions =
586-
data.getRowProcessingState().getJdbcValuesSourceProcessingState().getProcessingOptions();
587-
return matchesOptionalInstance( data, processingOptions ) ? processingOptions.getEffectiveOptionalObject() : null;
588-
}
589-
else {
590-
return null;
591-
}
592-
}
593-
594-
// FIXME: I could change the scope of this method in ORM
595-
private boolean isProxyInstance(Object proxy) {
596-
return proxy != null
597-
&& ( proxy instanceof MapProxy || getEntityDescriptor().getJavaType().getJavaTypeClass().isInstance( proxy ) );
598-
}
599-
600-
// FIXME: I could change the scope of this method in ORM
601-
private Object resolveInstanceFromCache(ReactiveEntityInitializerData data) {
602-
return loadFromSecondLevelCache(
603-
data.getRowProcessingState().getSession().asEventSource(),
604-
null,
605-
data.getLockMode(),
606-
getEntityDescriptor(),
607-
data.getEntityKey()
608-
);
609-
}
610-
611-
// FIXME: I could change the scope of this method in ORM
612-
private boolean matchesOptionalInstance(
613-
ReactiveEntityInitializerData data,
614-
JdbcValuesSourceProcessingOptions processingOptions) {
615-
final Object optionalEntityInstance = processingOptions.getEffectiveOptionalObject();
616-
final Object requestedEntityId = processingOptions.getEffectiveOptionalId();
617-
return requestedEntityId != null
618-
&& optionalEntityInstance != null
619-
&& requestedEntityId.equals( data.getEntityKey().getIdentifier() );
620-
}
621-
622578
private boolean isExistingEntityInitialized(Object existingEntity) {
623579
return Hibernate.isInitialized( existingEntity );
624580
}

0 commit comments

Comments
 (0)