Pass IPersistenceContext into PostInitialize

hazzik · hazzik · commit 8e337eaa0507 · 2018-01-28T23:57:11.000+13:00
diff --git a/src/NHibernate/Async/Engine/Loading/CollectionLoadContext.cs b/src/NHibernate/Async/Engine/Loading/CollectionLoadContext.cs
@@ -128,7 +128,9 @@ private async Task EndLoadingCollectionAsync(LoadingCollectionEntry lce, ICollec
 			{
 				log.Debug("ending loading collection [{0}]", lce);
 			}
-			ISessionImplementor session = LoadContext.PersistenceContext.Session;
+
+			var persistenceContext = LoadContext.PersistenceContext;
+			var session = persistenceContext.Session;
 
 			bool statsEnabled = session.Factory.Statistics.IsStatisticsEnabled;
 			var stopWath = new Stopwatch();
@@ -141,17 +143,17 @@ private async Task EndLoadingCollectionAsync(LoadingCollectionEntry lce, ICollec
 
 			if (persister.CollectionType.HasHolder())
 			{
-				LoadContext.PersistenceContext.AddCollectionHolder(lce.Collection);
+				persistenceContext.AddCollectionHolder(lce.Collection);
 			}
 
-			CollectionEntry ce = LoadContext.PersistenceContext.GetCollectionEntry(lce.Collection);
+			CollectionEntry ce = persistenceContext.GetCollectionEntry(lce.Collection);
 			if (ce == null)
 			{
-				ce = LoadContext.PersistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);
+				ce = persistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);
 			}
 			else
 			{
-				ce.PostInitialize(lce.Collection);
+				ce.PostInitialize(lce.Collection, persistenceContext);
 			}
 
 			bool addToCache = hasNoQueuedAdds && persister.HasCache && 
diff --git a/src/NHibernate/Async/Event/Default/DefaultInitializeCollectionEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultInitializeCollectionEventListener.cs
@@ -127,7 +127,7 @@ private async Task<bool> InitializeCollectionFromCacheAsync(object id, ICollecti
 					CollectionCacheEntry cacheEntry = (CollectionCacheEntry)persister.CacheEntryStructure.Destructure(ce, factory);
 					await (cacheEntry.AssembleAsync(collection, persister, persistenceContext.GetCollectionOwner(id, persister), cancellationToken)).ConfigureAwait(false);
 
-					persistenceContext.GetCollectionEntry(collection).PostInitialize(collection);
+					persistenceContext.GetCollectionEntry(collection).PostInitialize(collection, persistenceContext);
 					return true;
 				}
 			}
diff --git a/src/NHibernate/Collection/AbstractPersistentCollection.cs b/src/NHibernate/Collection/AbstractPersistentCollection.cs
@@ -868,13 +868,5 @@ public abstract object ReadFrom(DbDataReader reader, ICollectionPersister role,
 		 */
 
 		#endregion
-
-		/// <summary>
-		/// Get the session associated with the collection.
-		/// </summary>
-		public ISessionImplementor GetCurrentSession()
-		{
-			return session;
-		}
 	}
 }
diff --git a/src/NHibernate/Collection/IPersistentCollection.cs b/src/NHibernate/Collection/IPersistentCollection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Data.Common;
 using NHibernate.Collection.Generic;
@@ -338,21 +337,4 @@ public partial interface IPersistentCollection
 		/// </returns>
 		ICollection GetOrphans(object snapshot, string entityName);
 	}
-
-	public static class PersistentCollectionExtensions
-	{
-		/// <summary>
-		/// Get the session associated with the collection.
-		/// </summary>
-		//6.0 TODO: Merge into IPersistentCollection interface. Consider converting to a property.
-		public static ISessionImplementor GetCurrentSession(this IPersistentCollection collection)
-		{
-			if (collection is AbstractPersistentCollection apc)
-			{
-				return apc.GetCurrentSession();
-			}
-
-			throw new InvalidOperationException("Only collections of AbstractPersistentCollection are supported.");
-		}
-	}
 }
diff --git a/src/NHibernate/Engine/CollectionEntry.cs b/src/NHibernate/Engine/CollectionEntry.cs
@@ -302,9 +302,20 @@ public void PostInitialize(IPersistentCollection collection)
 		{
 			snapshot = LoadedPersister.IsMutable ? collection.GetSnapshot(LoadedPersister) : null;
 			collection.SetSnapshot(loadedKey, role, snapshot);
+		}
+
+		/// <summary>
+		/// Updates the CollectionEntry to reflect that the <see cref="IPersistentCollection"/>
+		/// has been initialized.
+		/// </summary>
+		/// <param name="collection">The initialized <see cref="AbstractPersistentCollection"/> that this Entry is for.</param>
+		/// <param name="persistenceContext"></param>
+		public void PostInitialize(IPersistentCollection collection, IPersistenceContext persistenceContext)
+		{
+			PostInitialize(collection);
 			if (LoadedPersister.GetBatchSize() > 1)
 			{
-				collection.GetCurrentSession().PersistenceContext.BatchFetchQueue.RemoveBatchLoadableCollection(this);
+				persistenceContext.BatchFetchQueue.RemoveBatchLoadableCollection(this);
 			}
 		}
 
diff --git a/src/NHibernate/Engine/Loading/CollectionLoadContext.cs b/src/NHibernate/Engine/Loading/CollectionLoadContext.cs
@@ -234,7 +234,9 @@ private void EndLoadingCollection(LoadingCollectionEntry lce, ICollectionPersist
 			{
 				log.Debug("ending loading collection [{0}]", lce);
 			}
-			ISessionImplementor session = LoadContext.PersistenceContext.Session;
+
+			var persistenceContext = LoadContext.PersistenceContext;
+			var session = persistenceContext.Session;
 
 			bool statsEnabled = session.Factory.Statistics.IsStatisticsEnabled;
 			var stopWath = new Stopwatch();
@@ -247,17 +249,17 @@ private void EndLoadingCollection(LoadingCollectionEntry lce, ICollectionPersist
 
 			if (persister.CollectionType.HasHolder())
 			{
-				LoadContext.PersistenceContext.AddCollectionHolder(lce.Collection);
+				persistenceContext.AddCollectionHolder(lce.Collection);
 			}
 
-			CollectionEntry ce = LoadContext.PersistenceContext.GetCollectionEntry(lce.Collection);
+			CollectionEntry ce = persistenceContext.GetCollectionEntry(lce.Collection);
 			if (ce == null)
 			{
-				ce = LoadContext.PersistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);
+				ce = persistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);
 			}
 			else
 			{
-				ce.PostInitialize(lce.Collection);
+				ce.PostInitialize(lce.Collection, persistenceContext);
 			}
 
 			bool addToCache = hasNoQueuedAdds && persister.HasCache && 
diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs
@@ -917,7 +917,7 @@ public CollectionEntry AddInitializedCollection(ICollectionPersister persister,
 																										object id)
 		{
 			CollectionEntry ce = new CollectionEntry(collection, persister, id, flushing);
-			ce.PostInitialize(collection);
+			ce.PostInitialize(collection, this);
 			AddCollection(collection, ce, id);
 			return ce;
 		}
diff --git a/src/NHibernate/Event/Default/DefaultInitializeCollectionEventListener.cs b/src/NHibernate/Event/Default/DefaultInitializeCollectionEventListener.cs
@@ -115,7 +115,7 @@ private bool InitializeCollectionFromCache(object id, ICollectionPersister persi
 					CollectionCacheEntry cacheEntry = (CollectionCacheEntry)persister.CacheEntryStructure.Destructure(ce, factory);
 					cacheEntry.Assemble(collection, persister, persistenceContext.GetCollectionOwner(id, persister));
 
-					persistenceContext.GetCollectionEntry(collection).PostInitialize(collection);
+					persistenceContext.GetCollectionEntry(collection).PostInitialize(collection, persistenceContext);
 					return true;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ private async Task EndLoadingCollectionAsync(LoadingCollectionEntry lce, ICollec`
`128`	`128`	`{`
`129`	`129`	`log.Debug("ending loading collection [{0}]", lce);`
`130`	`130`	`}`
`131`		`- ISessionImplementor session = LoadContext.PersistenceContext.Session;`
	`131`	`+`
	`132`	`+ var persistenceContext = LoadContext.PersistenceContext;`
	`133`	`+ var session = persistenceContext.Session;`
`132`	`134`
`133`	`135`	`bool statsEnabled = session.Factory.Statistics.IsStatisticsEnabled;`
`134`	`136`	`var stopWath = new Stopwatch();`
`@@ -141,17 +143,17 @@ private async Task EndLoadingCollectionAsync(LoadingCollectionEntry lce, ICollec`
`141`	`143`
`142`	`144`	`if (persister.CollectionType.HasHolder())`
`143`	`145`	`{`
`144`		`- LoadContext.PersistenceContext.AddCollectionHolder(lce.Collection);`
	`146`	`+ persistenceContext.AddCollectionHolder(lce.Collection);`
`145`	`147`	`}`
`146`	`148`
`147`		`- CollectionEntry ce = LoadContext.PersistenceContext.GetCollectionEntry(lce.Collection);`
	`149`	`+ CollectionEntry ce = persistenceContext.GetCollectionEntry(lce.Collection);`
`148`	`150`	`if (ce == null)`
`149`	`151`	`{`
`150`		`- ce = LoadContext.PersistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);`
	`152`	`+ ce = persistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);`
`151`	`153`	`}`
`152`	`154`	`else`
`153`	`155`	`{`
`154`		`- ce.PostInitialize(lce.Collection);`
	`156`	`+ ce.PostInitialize(lce.Collection, persistenceContext);`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`bool addToCache = hasNoQueuedAdds && persister.HasCache &&`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private async Task<bool> InitializeCollectionFromCacheAsync(object id, ICollecti`
`127`	`127`	`CollectionCacheEntry cacheEntry = (CollectionCacheEntry)persister.CacheEntryStructure.Destructure(ce, factory);`
`128`	`128`	`await (cacheEntry.AssembleAsync(collection, persister, persistenceContext.GetCollectionOwner(id, persister), cancellationToken)).ConfigureAwait(false);`
`129`	`129`
`130`		`- persistenceContext.GetCollectionEntry(collection).PostInitialize(collection);`
	`130`	`+ persistenceContext.GetCollectionEntry(collection).PostInitialize(collection, persistenceContext);`
`131`	`131`	`return true;`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -868,13 +868,5 @@ public abstract object ReadFrom(DbDataReader reader, ICollectionPersister role,`
`868`	`868`	`*/`
`869`	`869`
`870`	`870`	`#endregion`
`871`		`-`
`872`		`- /// <summary>`
`873`		`- /// Get the session associated with the collection.`
`874`		`- /// </summary>`
`875`		`- public ISessionImplementor GetCurrentSession()`
`876`		`- {`
`877`		`- return session;`
`878`		`- }`
`879`	`871`	`}`
`880`	`872`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,9 +302,20 @@ public void PostInitialize(IPersistentCollection collection)`
`302`	`302`	`{`
`303`	`303`	`snapshot = LoadedPersister.IsMutable ? collection.GetSnapshot(LoadedPersister) : null;`
`304`	`304`	`collection.SetSnapshot(loadedKey, role, snapshot);`
	`305`	`+ }`
	`306`	`+`
	`307`	`+ /// <summary>`
	`308`	`+ /// Updates the CollectionEntry to reflect that the <see cref="IPersistentCollection"/>`
	`309`	`+ /// has been initialized.`
	`310`	`+ /// </summary>`
	`311`	`+ /// <param name="collection">The initialized <see cref="AbstractPersistentCollection"/> that this Entry is for.</param>`
	`312`	`+ /// <param name="persistenceContext"></param>`
	`313`	`+ public void PostInitialize(IPersistentCollection collection, IPersistenceContext persistenceContext)`
	`314`	`+ {`
	`315`	`+ PostInitialize(collection);`
`305`	`316`	`if (LoadedPersister.GetBatchSize() > 1)`
`306`	`317`	`{`
`307`		`- collection.GetCurrentSession().PersistenceContext.BatchFetchQueue.RemoveBatchLoadableCollection(this);`
	`318`	`+ persistenceContext.BatchFetchQueue.RemoveBatchLoadableCollection(this);`
`308`	`319`	`}`
`309`	`320`	`}`
`310`	`321`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,9 @@ private void EndLoadingCollection(LoadingCollectionEntry lce, ICollectionPersist`
`234`	`234`	`{`
`235`	`235`	`log.Debug("ending loading collection [{0}]", lce);`
`236`	`236`	`}`
`237`		`- ISessionImplementor session = LoadContext.PersistenceContext.Session;`
	`237`	`+`
	`238`	`+ var persistenceContext = LoadContext.PersistenceContext;`
	`239`	`+ var session = persistenceContext.Session;`
`238`	`240`
`239`	`241`	`bool statsEnabled = session.Factory.Statistics.IsStatisticsEnabled;`
`240`	`242`	`var stopWath = new Stopwatch();`
`@@ -247,17 +249,17 @@ private void EndLoadingCollection(LoadingCollectionEntry lce, ICollectionPersist`
`247`	`249`
`248`	`250`	`if (persister.CollectionType.HasHolder())`
`249`	`251`	`{`
`250`		`- LoadContext.PersistenceContext.AddCollectionHolder(lce.Collection);`
	`252`	`+ persistenceContext.AddCollectionHolder(lce.Collection);`
`251`	`253`	`}`
`252`	`254`
`253`		`- CollectionEntry ce = LoadContext.PersistenceContext.GetCollectionEntry(lce.Collection);`
	`255`	`+ CollectionEntry ce = persistenceContext.GetCollectionEntry(lce.Collection);`
`254`	`256`	`if (ce == null)`
`255`	`257`	`{`
`256`		`- ce = LoadContext.PersistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);`
	`258`	`+ ce = persistenceContext.AddInitializedCollection(persister, lce.Collection, lce.Key);`
`257`	`259`	`}`
`258`	`260`	`else`
`259`	`261`	`{`
`260`		`- ce.PostInitialize(lce.Collection);`
	`262`	`+ ce.PostInitialize(lce.Collection, persistenceContext);`
`261`	`263`	`}`
`262`	`264`
`263`	`265`	`bool addToCache = hasNoQueuedAdds && persister.HasCache &&`
Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ public CollectionEntry AddInitializedCollection(ICollectionPersister persister,`
`917`	`917`	`object id)`
`918`	`918`	`{`
`919`	`919`	`CollectionEntry ce = new CollectionEntry(collection, persister, id, flushing);`
`920`		`- ce.PostInitialize(collection);`
	`920`	`+ ce.PostInitialize(collection, this);`
`921`	`921`	`AddCollection(collection, ce, id);`
`922`	`922`	`return ce;`
`923`	`923`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private bool InitializeCollectionFromCache(object id, ICollectionPersister persi`
`115`	`115`	`CollectionCacheEntry cacheEntry = (CollectionCacheEntry)persister.CacheEntryStructure.Destructure(ce, factory);`
`116`	`116`	`cacheEntry.Assemble(collection, persister, persistenceContext.GetCollectionOwner(id, persister));`
`117`	`117`
`118`		`- persistenceContext.GetCollectionEntry(collection).PostInitialize(collection);`
	`118`	`+ persistenceContext.GetCollectionEntry(collection).PostInitialize(collection, persistenceContext);`
`119`	`119`	`return true;`
`120`	`120`	`}`
`121`	`121`	`}`