Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-16669 Batch loading prevents throwing ObjectNotFoundException on initialization of non-existent enhanced entity

This commit is contained in:
Andrea Boriero 2023-05-22 16:58:33 +02:00 committed by Sanne Grinovero
parent f9954aa873
commit 2bebcf5e95
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
View File

@ -6,6 +6,7 @@
*/
package org.hibernate.loader.ast.internal;
import org.hibernate.Hibernate;
import org.hibernate.LockOptions;
import org.hibernate.engine.spi.EntityKey;
import org.hibernate.engine.spi.SessionFactoryImplementor;
@ -51,7 +52,44 @@ public abstract class AbstractEntityBatchLoader<T>
final Object[] ids = resolveIdsToInitialize( id, session );
if ( hasSingleId( ids ) ) {
return load( id, ids, hasSingleId( ids ), entityInstance, lockOptions, readOnly, session );
}
@Override
public T load(
Object id,
Object entityInstance,
LockOptions lockOptions,
SharedSessionContractImplementor session) {
if ( MULTI_KEY_LOAD_DEBUG_ENABLED ) {
MULTI_KEY_LOAD_LOGGER.debugf( "Batch fetching entity `%s#%s`", getLoadable().getEntityName(), id );
}
final Object[] ids = resolveIdsToInitialize( id, session );
final boolean hasSingleId = hasSingleId( ids );
final T entity = load( id, ids, hasSingleId, entityInstance, lockOptions, null, session );;
if ( hasSingleId ) {
return entity;
}
else if ( Hibernate.isInitialized( entity ) ) {
return entity;
}
else {
return null;
}
}
private T load(
Object id,
Object[] ids,
boolean hasSingleId,
Object entityInstance,
LockOptions lockOptions,
Boolean readOnly,
SharedSessionContractImplementor session) {
if ( hasSingleId ) {
return singleIdLoader.load( id, entityInstance, lockOptions, readOnly, session );
}
@ -61,5 +99,4 @@ public abstract class AbstractEntityBatchLoader<T>
//noinspection unchecked
return (T) session.getPersistenceContext().getEntity( entityKey );
}
}

5
hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleIdEntityLoader.java
View File

@ -21,13 +21,14 @@ public interface SingleIdEntityLoader<T> extends SingleEntityLoader<T> {
@Override
T load(Object pkValue, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session);
T load(Object pkValue, Object entityInstance, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session);
/**
* Load by primary key value, populating the passed entity instance. Used to initialize an uninitialized
* bytecode-proxy or {@link org.hibernate.event.spi.LoadEvent} handling.
* The passed instance is the enhanced proxy or the entity to be loaded.
*/
T load(Object pkValue, Object entityInstance, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session);
default T load(Object pkValue, Object entityInstance, LockOptions lockOptions, SharedSessionContractImplementor session) {
return load( pkValue, entityInstance, lockOptions, null, session );
}