Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-07 19:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-13640 : Remove SharedSessionContractImplementor#internalLoad(String, Serializable, boolean, boolean, Boolean unwrapProxy)

Browse Source 
(cherry picked from commit e10e84159afcd5dd4977f6a709413c8f4e1b1530)
This commit is contained in:
Gail Badner 2019-10-11 16:39:30 -07:00 committed by gbadner
parent 7249e4f736
commit d3d7705fa6
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
View File

@ -246,15 +246,6 @@ void initializeCollection(PersistentCollection collection, boolean writing)
Object internalLoad(String entityName, Serializable id, boolean eager, boolean nullable) Object internalLoad(String entityName, Serializable id, boolean eager, boolean nullable)
throws HibernateException; throws HibernateException;
default Object internalLoad(
String entityName,
Serializable id,
boolean eager,
boolean nullable,
Boolean unwrapProxy) throws HibernateException {
return internalLoad( entityName, id, eager, nullable );
}
/** /**
* Load an instance immediately. This method is only called when lazily initializing a proxy. * Load an instance immediately. This method is only called when lazily initializing a proxy.
* Do not return the proxy. * Do not return the proxy.

12
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -1132,17 +1132,7 @@ public final Object internalLoad(
String entityName, String entityName,
Serializable id, Serializable id,
boolean eager, boolean eager,
boolean nullable) throws HibernateException { boolean nullable) {
return internalLoad( entityName, id, eager, nullable, null );
}
@Override
public final Object internalLoad(
String entityName,
Serializable id,
boolean eager,
boolean nullable,
Boolean unwrapProxy) {
final LoadEventListener.LoadType type; final LoadEventListener.LoadType type;
if ( nullable ) { if ( nullable ) {
type = LoadEventListener.INTERNAL_LOAD_NULLABLE; type = LoadEventListener.INTERNAL_LOAD_NULLABLE;

3
hibernate-core/src/main/java/org/hibernate/type/EntityType.java
View File

@ -683,8 +683,7 @@ protected final Object resolveIdentifier(Serializable id, SharedSessionContractI
getAssociatedEntityName(), getAssociatedEntityName(),
id, id,
eager, eager,
isNullable(), isNullable()
unwrapProxy
); );
if ( proxyOrEntity instanceof HibernateProxy ) { if ( proxyOrEntity instanceof HibernateProxy ) {