From 4e58006f10cd3adb662eb4c770968b98021c7c28 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 24 Feb 2020 14:23:46 +0000 Subject: [PATCH] HHH-13878 Make some private methods in Loader protected This way we can reduce the amount of copy and paste in Hibernate Rx. --- .../src/main/java/org/hibernate/loader/Loader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java index 90db371a9d..6afa106f52 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java @@ -676,7 +676,7 @@ public abstract class Loader { } } - private static EntityKey getOptionalObjectKey(QueryParameters queryParameters, SharedSessionContractImplementor session) { + protected static EntityKey getOptionalObjectKey(QueryParameters queryParameters, SharedSessionContractImplementor session) { final Object optionalObject = queryParameters.getOptionalObject(); final Serializable optionalId = queryParameters.getOptionalId(); final String optionalEntityName = queryParameters.getOptionalEntityName(); @@ -1237,7 +1237,7 @@ public abstract class Loader { } } - private void endCollectionLoad( + protected void endCollectionLoad( final Object resultSetId, final SharedSessionContractImplementor session, final CollectionPersister collectionPersister) { @@ -1450,7 +1450,7 @@ public abstract class Loader { * is being initialized, to account for the possibility of the collection having * no elements (hence no rows in the result set). */ - private void handleEmptyCollections( + protected void handleEmptyCollections( final Serializable[] keys, final Object resultSetId, final SharedSessionContractImplementor session) { @@ -1637,7 +1637,7 @@ public abstract class Loader { /** * The entity instance is already in the session cache */ - private void instanceAlreadyLoaded( + protected void instanceAlreadyLoaded( final ResultSet rs, final int i, final Loadable persister, @@ -1707,7 +1707,7 @@ public abstract class Loader { /** * The entity instance is not in the session cache */ - private Object instanceNotYetLoaded( + protected Object instanceNotYetLoaded( final ResultSet rs, final int i, final Loadable persister,