From d3d7705fa69e3a513a4043b26a988da9d81da8d9 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Fri, 11 Oct 2019 16:39:30 -0700
Subject: [PATCH] HHH-13640 : Remove
 SharedSessionContractImplementor#internalLoad(String, Serializable, boolean,
 boolean, Boolean unwrapProxy)

(cherry picked from commit e10e84159afcd5dd4977f6a709413c8f4e1b1530)
---
 .../engine/spi/SharedSessionContractImplementor.java |  9 ---------
 .../java/org/hibernate/internal/SessionImpl.java     | 12 +-----------
 .../src/main/java/org/hibernate/type/EntityType.java |  3 +--
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
index 4b205bc524..809c5888fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
@@ -246,15 +246,6 @@ void initializeCollection(PersistentCollection collection, boolean writing)
 	Object internalLoad(String entityName, Serializable id, boolean eager, boolean nullable)
 			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.
 	 * Do not return the proxy.
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
index cfcb1605b9..8816b4b7fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -1132,17 +1132,7 @@ public final Object internalLoad(
 			String entityName,
 			Serializable id,
 			boolean eager,
-			boolean nullable) throws HibernateException {
-		return internalLoad( entityName, id, eager, nullable, null );
-	}
-
-	@Override
-	public final Object internalLoad(
-			String entityName,
-			Serializable id,
-			boolean eager,
-			boolean nullable,
-			Boolean unwrapProxy) {
+			boolean nullable) {
 		final LoadEventListener.LoadType type;
 		if ( nullable ) {
 			type = LoadEventListener.INTERNAL_LOAD_NULLABLE;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
index 59e1debf33..bb078f511f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
@@ -683,8 +683,7 @@ protected final Object resolveIdentifier(Serializable id, SharedSessionContractI
 				getAssociatedEntityName(),
 				id,
 				eager,
-				isNullable(),
-				unwrapProxy
+				isNullable()
 		);
 
 		if ( proxyOrEntity instanceof HibernateProxy ) {