Mark methods of UpdateTimestapsCache obsolete

Author: hazzik

src/AsyncGenerator.yml

@@ -4,8 +4,6 @@
   applyChanges: true
   analyzation:
     methodConversion:
-    - conversion: Ignore
-      hasAttributeName: ObsoleteAttribute
     - conversion: Ignore
       name: PostProcessInsert
       containingTypeName: HqlSqlWalker
@@ -96,6 +94,9 @@
     - conversion: Ignore
       name: Exists
       containingTypeName: AbstractCollectionPersister
+    - conversion: Ignore
+      name: QuoteTableAndColumns
+      containingTypeName: SchemaMetadataUpdater
     - conversion: ToAsync
       name: ExecuteReader
       containingTypeName: IBatcher
@@ -119,8 +120,8 @@
     - name: GetFieldValue
     - name: IsDBNull
     - name: WriteLine
-    - name: AddAction
-      containingTypeName: ActionQueue
+    ignoreAsyncCounterparts:
+    - rule: Obsolete
     callForwarding: true
     cancellationTokens:
       guards: true
@@ -261,6 +262,9 @@ methodRules:
   - containingType: NHibernate.Tool.hbm2ddl.SchemaValidator
   - containingType: NHibernate.Tool.hbm2ddl.SchemaExport
   name: PubliclyExposedType
+- filters:
+  - hasAttributeName: ObsoleteAttribute
+  name: Obsolete
 typeRules:
 - filters:
   - containingAssemblyName: NHibernate

src/NHibernate/Async/Cache/UpdateTimestampsCache.cs

@@ -34,7 +34,8 @@ public Task ClearAsync(CancellationToken cancellationToken)
 			return updateTimestamps.ClearAsync(cancellationToken);
 		}
 
-		//TODO: Make obsolete
+		//Since v5.1
+		[Obsolete("Please use PreInvalidate(IReadOnlyCollection<string>) instead.")]
 		public Task PreInvalidateAsync(object[] spaces, CancellationToken cancellationToken)
 		{
 			if (cancellationToken.IsCancellationRequested)
@@ -71,7 +72,8 @@ public virtual async Task PreInvalidateAsync(IReadOnlyCollection<string> spaces,
 			//TODO: return new Lock(ts);
 		}
 
-		//TODO: Make obsolete
+		//Since v5.1
+		[Obsolete("Please use PreInvalidate(IReadOnlyCollection<string>) instead.")]
 		public Task InvalidateAsync(object[] spaces, CancellationToken cancellationToken)
 		{
 			if (cancellationToken.IsCancellationRequested)

src/NHibernate/Cache/UpdateTimestampsCache.cs

@@ -34,7 +34,8 @@ public UpdateTimestampsCache(Settings settings, IDictionary<string, string> prop
 			updateTimestamps = settings.CacheProvider.BuildCache(regionName, props);
 		}
 
-		//TODO: Make obsolete
+		//Since v5.1
+		[Obsolete("Please use PreInvalidate(IReadOnlyCollection<string>) instead.")]
 		public void PreInvalidate(object[] spaces)
 		{
 			//Only for backwards compatibility.
@@ -54,7 +55,8 @@ public virtual void PreInvalidate(IReadOnlyCollection<string> spaces)
 			//TODO: return new Lock(ts);
 		}
 
-		//TODO: Make obsolete
+		//Since v5.1
+		[Obsolete("Please use PreInvalidate(IReadOnlyCollection<string>) instead.")]
 		public void Invalidate(object[] spaces)
 		{
 			//Only for backwards compatibility.

src/NHibernate/Engine/ActionQueue.cs

@@ -113,11 +113,23 @@ public void AddAction(BulkOperationCleanupAction cleanupAction)
 			RegisterCleanupActions(cleanupAction);
 		}
 
-		[Obsolete("This method is no longer executed asynchronously")]
+		//Since v5.1
+		[Obsolete("This method is no longer executed asynchronously and will be removed in a next major version.")]
 		public Task AddActionAsync(BulkOperationCleanupAction cleanupAction, CancellationToken cancellationToken=default(CancellationToken))
 		{
-			AddAction(cleanupAction);
-			return Task.CompletedTask;
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return Task.FromCanceled(cancellationToken);
+			}
+			try
+			{
+				AddAction(cleanupAction);
+				return Task.CompletedTask;
+			}
+			catch (Exception e)
+			{
+				return Task.FromException(e);
+			}
 		}
 
 		public void RegisterProcess(AfterTransactionCompletionProcessDelegate process)