fixup! Implement universal query batch

Converted event to delegate property

Author: bahusoid

src/NHibernate/Async/Multi/QueryBatchItemBase.cs

@@ -73,14 +73,14 @@ public async Task ProcessResultsAsync(CancellationToken cancellationToken)
 					await (queryInfo.Loader.PutResultInQueryCacheAsync(Session, queryInfo.Parameters, queryInfo.Cache, queryInfo.CacheKey, _loaderResults[i], cancellationToken)).ConfigureAwait(false);
 				}
 			}
-			OnAfterLoad?.Invoke(GetResults());
+			AfterLoadCallback?.Invoke(GetResults());
 		}
 
 		public async Task ExecuteNonBatchedAsync(CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			_finalResults = await (GetResultsNonBatchedAsync(cancellationToken)).ConfigureAwait(false);
-			OnAfterLoad?.Invoke(_finalResults);
+			AfterLoadCallback?.Invoke(_finalResults);
 		}
 
 		protected abstract Task<IList<TResult>> GetResultsNonBatchedAsync(CancellationToken cancellationToken);

src/NHibernate/Multi/IQueryBatchItem.cs

@@ -21,7 +21,7 @@ public interface IQueryBatchItem<TResult> : IQueryBatchItem
 		/// Callback is executed after results are loaded by batch.
 		/// Loaded results are provided in action parameter.
 		/// </summary>
-		event Action<IList<TResult>> OnAfterLoad;
+		Action<IList<TResult>> AfterLoadCallback { get; set; }
 	}
 
 	/// <summary>

src/NHibernate/Multi/QueryBatchExtensions.cs

@@ -359,7 +359,7 @@ private static IQueryBatch Add<TResult>(this IQueryBatch batch, IQueryBatchItem<
 		{
 			if (afterLoad != null)
 			{
-				query.OnAfterLoad += afterLoad;
+				query.AfterLoadCallback += afterLoad;
 			}
 			batch.Add(query);
 			return batch;

src/NHibernate/Multi/QueryBatchItemBase.cs

@@ -174,13 +174,13 @@ public void ProcessResults()
 					queryInfo.Loader.PutResultInQueryCache(Session, queryInfo.Parameters, queryInfo.Cache, queryInfo.CacheKey, _loaderResults[i]);
 				}
 			}
-			OnAfterLoad?.Invoke(GetResults());
+			AfterLoadCallback?.Invoke(GetResults());
 		}
 
 		public void ExecuteNonBatched()
 		{
 			_finalResults = GetResultsNonBatched();
-			OnAfterLoad?.Invoke(_finalResults);
+			AfterLoadCallback?.Invoke(_finalResults);
 		}
 
 		public IEnumerable<string> GetQuerySpaces()
@@ -213,7 +213,7 @@ public IList<TResult> GetResults()
 			return _finalResults ?? (_finalResults = DoGetResults());
 		}
 
-		public event Action<IList<TResult>> OnAfterLoad;
+		public Action<IList<TResult>> AfterLoadCallback { get; set; }
 
 		protected abstract List<TResult> DoGetResults();