Refactor IBefore/AfterTransactionCompletionProcess to avoid delegates

Author: hazzik

src/AsyncGenerator.yml

@@ -95,8 +95,6 @@
     - conversion: Ignore
       name: Exists
       containingTypeName: AbstractCollectionPersister
-    - conversion: ToAsync
-      rule: TransactionCompletion
     - conversion: Ignore
       name: QuoteTableAndColumns
       containingTypeName: SchemaMetadataUpdater
@@ -116,6 +114,8 @@
       rule: EventListener
     - conversion: ToAsync
       rule: Cache
+    - conversion: ToAsync
+      rule: TransactionCompletion      
     typeConversion:
     - conversion: Ignore
       name: EnumerableImpl
@@ -281,11 +281,9 @@ methodRules:
   name: Cache
 - filters:
   - containingType: NHibernate.Action.IAfterTransactionCompletionProcess
-    name: Execute
   - containingType: NHibernate.Action.IBeforeTransactionCompletionProcess
-    name: Execute
   - containingType: NHibernate.Action.EntityAction
-    name: BeforeTransactionCompletionProcessImpl
+    name: BeforeTransactionCompletionProcessImpl  
   name: TransactionCompletion
 - filters:
   - containingNamespace: NHibernate

src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

@@ -9,10 +9,10 @@
 
 
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NSubstitute;

src/NHibernate.Test/BulkManipulation/BulkOperationCleanupActionFixture.cs

@@ -45,7 +45,7 @@ public void AfterTransactionCompletionProcess_EvictsFromCache(string querySpaces
 
 			var target = new BulkOperationCleanupAction(_session, new HashSet<string>(querySpaces.Split(new []{','},StringSplitOptions.RemoveEmptyEntries)));
 
-			target.AfterTransactionCompletionProcess(true);
+			target.AfterTransactionCompletionProcess.ExecuteAfterTransactionCompletion(true);
 
 			Assert.AreEqual(expectedPropertySpaceLength, target.PropertySpaces.Length);
 

src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

@@ -1,8 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NSubstitute;
@@ -71,6 +71,7 @@ public ICache BuildCache(string regionName, IDictionary<string, string> properti
 				 var cache = Substitute.For<ICache>();
 				 cache.RegionName.Returns(regionName);
 				 cache.When(c => c.Clear()).Do(c => _onClear?.Invoke(regionName));
+				 cache.When(c => c.ClearAsync(Arg.Any<CancellationToken>())).Do(c => _onClear?.Invoke(regionName));
 				 return cache;
 			 })).Value;
 		}

src/NHibernate/Action/AfterTransactionCompletionProcess.cs

@@ -14,7 +14,7 @@ namespace NHibernate.Action
 	/// Implementation of BulkOperationCleanupAction.
 	/// </summary>
 	[Serializable]
-	public partial class BulkOperationCleanupAction : IExecutable
+	public partial class BulkOperationCleanupAction : IExecutable, IAfterTransactionCompletionProcess
 	{
 		private readonly ISessionImplementor session;
 		private readonly HashSet<string> affectedEntityNames = new HashSet<string>();
@@ -109,31 +109,14 @@ public void Execute()
 			// nothing to do
 		}
 
-		public IBeforeTransactionCompletionProcess BeforeTransactionCompletionProcess
-		{
-			get
-			{
-				return null;
-			}
-		}
+		public IBeforeTransactionCompletionProcess BeforeTransactionCompletionProcess => null;
+
+		public IAfterTransactionCompletionProcess AfterTransactionCompletionProcess => this;
 
-		public IAfterTransactionCompletionProcess AfterTransactionCompletionProcess
+		public void ExecuteAfterTransactionCompletion(bool success)
 		{
-			get
-			{
-				return new AfterTransactionCompletionProcess(
-					(success) =>
-					{
-						EvictEntityRegions();
-						EvictCollectionRegions();
-					},
-					async (success, cancellationToken) =>
-					{
-						await EvictEntityRegionsAsync(cancellationToken);
-						await EvictCollectionRegionsAsync(cancellationToken);
-					}
-				);
-			}
+			EvictEntityRegions();
+			EvictCollectionRegions();
 		}
 
 		private void EvictCollectionRegions()

src/NHibernate/Action/BeforeTransactionCompletionProcess.cs

@@ -14,7 +14,7 @@ namespace NHibernate.Action
 	/// Any action relating to insert/update/delete of a collection
 	/// </summary>
 	[Serializable]
-	public abstract partial class CollectionAction : IExecutable, IComparable<CollectionAction>, IDeserializationCallback
+	public abstract partial class CollectionAction : IExecutable, IComparable<CollectionAction>, IDeserializationCallback, IAfterTransactionCompletionProcess
 	{
 		private readonly object key;
 		private object finalKey;
@@ -104,39 +104,17 @@ public virtual void BeforeExecutions()
 		/// <summary>Execute this action</summary>
 		public abstract void Execute();
 
-		public virtual IBeforeTransactionCompletionProcess BeforeTransactionCompletionProcess
-		{
-			get 
-			{ 
-				return null; 
-			}
-		}
+		public virtual IBeforeTransactionCompletionProcess BeforeTransactionCompletionProcess => null;
 
-		public virtual IAfterTransactionCompletionProcess AfterTransactionCompletionProcess
-		{
+		// Only make sense to add the delegate if there is a cache.
+		public virtual IAfterTransactionCompletionProcess AfterTransactionCompletionProcess => persister.HasCache ? this : null;
 
-			get
-			{
-				// Only make sense to add the delegate if there is a cache.
-				if (persister.HasCache)
-				{
-					return new AfterTransactionCompletionProcess(
-						(success) =>
-						{
-							var ck = new CacheKey(key, persister.KeyType, persister.Role, Session.Factory);
-							persister.Cache.Release(ck, softLock);
-						},
-						async (success, cancellationToken) =>
-						{
-							var ck = new CacheKey(key, persister.KeyType, persister.Role, Session.Factory);
-							await persister.Cache.ReleaseAsync(ck, softLock, cancellationToken).ConfigureAwait(false);
-						}
-					);
-				}
-				return null; 
-			}
+		public virtual void ExecuteAfterTransactionCompletion(bool success)
+		{
+			var ck = new CacheKey(key, persister.KeyType, persister.Role, Session.Factory);
+			persister.Cache.Release(ck, softLock);
 		}
-		
+
 		#endregion
 
 		public ISoftLock Lock

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -12,7 +12,7 @@
 namespace NHibernate.Action
 {
 	[Serializable]
-	public sealed partial class CollectionUpdateAction : CollectionAction
+	public sealed partial class CollectionUpdateAction : CollectionAction, IAfterTransactionCompletionProcess
 	{
 		private readonly bool emptySnapshot;
 
@@ -114,65 +114,28 @@ private void PostUpdate()
 			}
 		}
 
-		public override IBeforeTransactionCompletionProcess BeforeTransactionCompletionProcess
+		public override void ExecuteAfterTransactionCompletion(bool success)
 		{
-			get 
-			{ 
-				return null; 
-			}
-		}
+			CacheKey ck = Session.GenerateCacheKey(Key, Persister.KeyType, Persister.Role);
 
-		public override IAfterTransactionCompletionProcess AfterTransactionCompletionProcess
-		{
-			get
+			if (success)
 			{
-				// Only make sense to add the delegate if there is a cache.
-				if (Persister.HasCache)
+				// we can't disassemble a collection if it was uninitialized 
+				// or detached from the session
+				if (Collection.WasInitialized && Session.PersistenceContext.ContainsCollection(Collection))
 				{
-					return new CollectionCacheUpdate(this);
-				}
-				return null;
-			}
-		}
+					CollectionCacheEntry entry = CollectionCacheEntry.Create(Collection, Persister);
+					bool put = Persister.Cache.AfterUpdate(ck, entry, null, Lock);
 
-		private partial class CollectionCacheUpdate : IAfterTransactionCompletionProcess
-		{
-
-			private CollectionUpdateAction _action;
-
-			internal CollectionCacheUpdate(CollectionUpdateAction action)
-			{
-				_action = action;
-			}
-
-			public void Execute(bool success)
-			{
-				var session = _action.Session;
-				var persister = _action.Persister;
-				var cacheLock = _action.Lock;
-				CacheKey ck = session.GenerateCacheKey(_action.Key, persister.KeyType, persister.Role);
-
-				if (success)
-				{
-					var collection = _action.Collection;
-					
-					// we can't disassemble a collection if it was uninitialized 
-					// or detached from the session
-					if (collection.WasInitialized && session.PersistenceContext.ContainsCollection(collection))
+					if (put && Session.Factory.Statistics.IsStatisticsEnabled)
 					{
-						CollectionCacheEntry entry = CollectionCacheEntry.Create(collection, persister);
-						bool put = persister.Cache.AfterUpdate(ck, entry, null, cacheLock);
-
-						if (put && session.Factory.Statistics.IsStatisticsEnabled)
-						{
-							session.Factory.StatisticsImplementor.SecondLevelCachePut(persister.Cache.RegionName);
-						}
+						Session.Factory.StatisticsImplementor.SecondLevelCachePut(Persister.Cache.RegionName);
 					}
 				}
-				else
-				{
-					persister.Cache.Release(ck, cacheLock);
-				}
+			}
+			else
+			{
+				Persister.Cache.Release(ck, Lock);
 			}
 		}
 	}