Obsolete GetOrphansAsync

Author: bahusoid

src/NHibernate/Async/Collection/AbstractPersistentCollection.cs

@@ -115,9 +115,20 @@ public virtual Task PreInsertAsync(ICollectionPersister persister, CancellationT
 			}
 		}
 
+		//Since 5.3
 		/// <summary>
 		/// Get all "orphaned" elements
 		/// </summary>
+		/// <param name="snapshot">The snapshot of the collection.</param>
+		/// <param name="entityName">The persistent class whose objects
+		/// the collection is expected to contain.</param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <returns>
+		/// An <see cref="ICollection"/> that contains all of the elements
+		/// that have been orphaned.
+		/// </returns>
+		[Obsolete("This method has no more usages and will be removed in a future version")]
 		public abstract Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken);
 
 		public async Task IdentityRemoveAsync(IList list, object obj, string entityName, ISessionImplementor session, CancellationToken cancellationToken)

src/NHibernate/Async/Collection/IPersistentCollection.cs

@@ -98,18 +98,5 @@ public partial interface IPersistentCollection
 		/// <param name="persister"></param>
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		Task PreInsertAsync(ICollectionPersister persister, CancellationToken cancellationToken);
-
-		/// <summary>
-		/// Get all "orphaned" elements
-		/// </summary>
-		/// <param name="snapshot">The snapshot of the collection.</param>
-		/// <param name="entityName">The persistent class whose objects
-		/// the collection is expected to contain.</param>
-		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
-		/// <returns>
-		/// An <see cref="ICollection"/> that contains all of the elements
-		/// that have been orphaned.
-		/// </returns>
-		Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken);
 	}
 }

src/NHibernate/Async/Collection/PersistentArrayHolder.cs

@@ -27,17 +27,20 @@ namespace NHibernate.Collection
 	public partial class PersistentArrayHolder : AbstractPersistentCollection, ICollection
 	{
 
-		public override async Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken)
+		public override Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken)
 		{
-			cancellationToken.ThrowIfCancellationRequested();
-			object[] sn = (object[]) snapshot;
-			object[] arr = (object[]) array;
-			List<object> result = new List<object>(sn);
-			for (int i = 0; i < sn.Length; i++)
+			if (cancellationToken.IsCancellationRequested)
 			{
-				await (IdentityRemoveAsync(result, arr[i], entityName, Session, cancellationToken)).ConfigureAwait(false);
+				return Task.FromCanceled<ICollection>(cancellationToken);
+			}
+			try
+			{
+				return Task.FromResult<ICollection>(GetOrphans(snapshot, entityName));
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<ICollection>(ex);
 			}
-			return result;
 		}
 
 		public override async Task<bool> EqualsSnapshotAsync(ICollectionPersister persister, CancellationToken cancellationToken)
@@ -147,4 +150,4 @@ public override async Task<bool> NeedsUpdatingAsync(object entry, int i, IType e
 				&& await (elemType.IsDirtyAsync(array.GetValue(i), sn.GetValue(i), Session, cancellationToken)).ConfigureAwait(false);
 		}
 	}
-}
+}

src/NHibernate/Async/Engine/Cascade.cs

@@ -285,7 +285,7 @@ private async Task DeleteOrphansAsync(string entityName, IPersistentCollection p
 			if (pc.WasInitialized)
 			{
 				CollectionEntry ce = eventSource.PersistenceContext.GetCollectionEntry(pc);
-				orphans = ce == null ? CollectionHelper.EmptyCollection : await (ce.GetOrphansAsync(entityName, pc, cancellationToken)).ConfigureAwait(false);
+				orphans = ce == null ? CollectionHelper.EmptyCollection : ce.GetOrphans(entityName, pc);
 			}
 			else
 			{

src/NHibernate/Async/Engine/CollectionEntry.cs

@@ -70,18 +70,5 @@ public async Task PreFlushAsync(IPersistentCollection collection, CancellationTo
 			reached = false;
 			processed = false;
 		}
-
-		public Task<ICollection> GetOrphansAsync(string entityName, IPersistentCollection collection, CancellationToken cancellationToken)
-		{
-			if (snapshot == null)
-			{
-				throw new AssertionFailure("no collection snapshot for orphan delete");
-			}
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<ICollection>(cancellationToken);
-			}
-			return collection.GetOrphansAsync(snapshot, entityName, cancellationToken);
-		}
 	}
 }

src/NHibernate/Collection/IPersistentCollection.cs

@@ -344,6 +344,21 @@ public partial interface IPersistentCollection
 		/// that have been orphaned.
 		/// </returns>
 		ICollection GetOrphans(object snapshot, string entityName);
+
+		//Since 5.3
+		/// <summary>
+		/// Get all "orphaned" elements
+		/// </summary>
+		/// <param name="snapshot">The snapshot of the collection.</param>
+		/// <param name="entityName">The persistent class whose objects
+		/// the collection is expected to contain.</param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <returns>
+		/// An <see cref="ICollection"/> that contains all of the elements
+		/// that have been orphaned.
+		/// </returns>
+		[Obsolete("This method has no more usages and will be removed in a future version")]
+		Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken);
 	}
 
 	// 6.0 TODO: merge into IPersistentCollection

src/NHibernate/Collection/PersistentArrayHolder.cs

@@ -94,14 +94,7 @@ public override bool IsSnapshotEmpty(object snapshot)
 
 		public override ICollection GetOrphans(object snapshot, string entityName)
 		{
-			object[] sn = (object[]) snapshot;
-			object[] arr = (object[]) array;
-			List<object> result = new List<object>(sn);
-			for (int i = 0; i < sn.Length; i++)
-			{
-				IdentityRemove(result, arr[i], entityName, Session);
-			}
-			return result;
+			return GetOrphans((object[]) snapshot, (object[]) array, entityName, Session);
 		}
 
 		public override bool IsWrapper(object collection)
@@ -318,4 +311,4 @@ IEnumerator IEnumerable.GetEnumerator()
 
 		#endregion
 	}
-}
+}