Removed Loader.GetRowFromResultSet

Author: maca88

src/NHibernate/Async/Impl/MultiCriteriaImpl.cs

@@ -184,7 +184,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken
 
 							object o =
 								await (loader.GetRowFromResultSetAsync(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),
-																					 null, hydratedObjects[i], keys, true, cancellationToken)).ConfigureAwait(false);
+																					 null, hydratedObjects[i], keys, true, null, null, cancellationToken)).ConfigureAwait(false);
 							if (createSubselects[i])
 							{
 								subselectResultKeys[i].Add(keys);

src/NHibernate/Async/Impl/MultiQueryImpl.cs

@@ -142,7 +142,7 @@ protected async Task<List<object>> DoListAsync(CancellationToken cancellationTok
 
 							rowCount++;
 							object result = await (translator.Loader.GetRowFromResultSetAsync(
-								reader, session, parameter, lockModeArray, optionalObjectKey, hydratedObjects[i], keys, true, cancellationToken)).ConfigureAwait(false);
+								reader, session, parameter, lockModeArray, optionalObjectKey, hydratedObjects[i], keys, true, null, null, cancellationToken)).ConfigureAwait(false);
 							tempResults.Add(result);
 
 							if (createSubselects[i])

src/NHibernate/Async/Loader/Loader.cs

@@ -118,7 +118,7 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession
 			{
 				result =
 					await (GetRowFromResultSetAsync(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), null,
-										hydratedObjects, new EntityKey[entitySpan], returnProxies, cancellationToken)).ConfigureAwait(false);
+										hydratedObjects, new EntityKey[entitySpan], returnProxies, null, null, cancellationToken)).ConfigureAwait(false);
 			}
 			catch (OperationCanceledException) { throw; }
 			catch (HibernateException)
@@ -137,21 +137,6 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession
 			return result;
 		}
 
-		// Since 5.3
-		[Obsolete("This method has no more usage in NHibernate and will be removed in a future version.")]
-		internal Task<object> GetRowFromResultSetAsync(DbDataReader resultSet, ISessionImplementor session,
-											QueryParameters queryParameters, LockMode[] lockModeArray,
-											EntityKey optionalObjectKey, IList hydratedObjects, EntityKey[] keys,
-											bool returnProxies, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<object>(cancellationToken);
-			}
-			return GetRowFromResultSetAsync(resultSet, session, queryParameters, lockModeArray, optionalObjectKey, hydratedObjects,
-									   keys, returnProxies, null, null, cancellationToken);
-		}
-
 		internal async Task<object> GetRowFromResultSetAsync(DbDataReader resultSet, ISessionImplementor session,
 											QueryParameters queryParameters, LockMode[] lockModeArray,
 											EntityKey optionalObjectKey, IList hydratedObjects, EntityKey[] keys,

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -257,7 +257,7 @@ private void GetResultsFromDatabase(IList results)
 
 							object o =
 								loader.GetRowFromResultSet(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),
-																					 null, hydratedObjects[i], keys, true);
+																					 null, hydratedObjects[i], keys, true, null, null);
 							if (createSubselects[i])
 							{
 								subselectResultKeys[i].Add(keys);

src/NHibernate/Impl/MultiQueryImpl.cs

@@ -586,7 +586,7 @@ protected List<object> DoList()
 
 							rowCount++;
 							object result = translator.Loader.GetRowFromResultSet(
-								reader, session, parameter, lockModeArray, optionalObjectKey, hydratedObjects[i], keys, true);
+								reader, session, parameter, lockModeArray, optionalObjectKey, hydratedObjects[i], keys, true, null, null);
 							tempResults.Add(result);
 
 							if (createSubselects[i])

src/NHibernate/Loader/Loader.cs

@@ -311,7 +311,7 @@ protected object LoadSingleRow(DbDataReader resultSet, ISessionImplementor sessi
 			{
 				result =
 					GetRowFromResultSet(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), null,
-										hydratedObjects, new EntityKey[entitySpan], returnProxies);
+										hydratedObjects, new EntityKey[entitySpan], returnProxies, null, null);
 			}
 			catch (HibernateException)
 			{
@@ -347,17 +347,6 @@ internal static EntityKey GetOptionalObjectKey(QueryParameters queryParameters,
 			}
 		}
 
-		// Since 5.3
-		[Obsolete("This method has no more usage in NHibernate and will be removed in a future version.")]
-		internal object GetRowFromResultSet(DbDataReader resultSet, ISessionImplementor session,
-											QueryParameters queryParameters, LockMode[] lockModeArray,
-											EntityKey optionalObjectKey, IList hydratedObjects, EntityKey[] keys,
-											bool returnProxies)
-		{
-			return GetRowFromResultSet(resultSet, session, queryParameters, lockModeArray, optionalObjectKey, hydratedObjects,
-									   keys, returnProxies, null, null);
-		}
-
 		internal object GetRowFromResultSet(DbDataReader resultSet, ISessionImplementor session,
 											QueryParameters queryParameters, LockMode[] lockModeArray,
 											EntityKey optionalObjectKey, IList hydratedObjects, EntityKey[] keys,