Async regen

Author: bahusoid

src/NHibernate.DomainModel/Async/CustomPersister.cs

@@ -34,44 +34,6 @@ public partial class CustomPersister : IEntityPersister
 
 		#region IOptimisticCacheSource Members
 
-		public Task<int[]> FindDirtyAsync(object[] currentState, object[] previousState, object entity, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				if (!Equals(currentState[0], previousState[0]))
-				{
-					return Task.FromResult<int[]>(new int[] { 0 });
-				}
-				else
-				{
-					return Task.FromResult<int[]>(null);
-				}
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<int[]>(ex);
-			}
-		}
-
-		public Task<int[]> FindModifiedAsync(object[] old, object[] current, object entity, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				if (!Equals(old[0], current[0]))
-				{
-					return Task.FromResult<int[]>(new int[] { 0 });
-				}
-				else
-				{
-					return Task.FromResult<int[]>(null);
-				}
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<int[]>(ex);
-			}
-		}
-
 		public Task<object[]> GetNaturalIdentifierSnapshotAsync(object id, ISessionImplementor session, CancellationToken cancellationToken)
 		{
 			return Task.FromResult<object[]>(null);
@@ -165,18 +127,6 @@ public Task<object> ForceVersionIncrementAsync(object id, object currentVersion,
 			return Task.FromResult<object>(null);
 		}
 
-		public Task<bool?> IsTransientAsync(object obj, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				return Task.FromResult<bool?>(((Custom) obj).Id == null);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool?>(ex);
-			}
-		}
-
 		public Task ProcessInsertGeneratedPropertiesAsync(object id, object entity, object[] state, ISessionImplementor session, CancellationToken cancellationToken)
 		{
 			return Task.CompletedTask;

src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs

@@ -22,7 +22,6 @@
 namespace NHibernate.Test.NHSpecificTest.Dates
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	[TestFixture]
 	public class DateTimeOffsetFixtureAsync : FixtureBaseAsync
 	{
@@ -76,22 +75,5 @@ public async Task SavingAndRetrievingTestAsync()
 				await (tx.CommitAsync());
 			}
 		}
-
-		[Test]
-		public async Task NextAsync()
-		{
-			var type = NHibernateUtil.DateTimeOffset;
-			var current = DateTimeOffset.Now.AddTicks(-1);
-			object next = await (type.NextAsync(current, null, CancellationToken.None));
-
-			Assert.That(next, Is.TypeOf<DateTimeOffset>().And.Property("Ticks").GreaterThan(current.Ticks));
-		}
-
-		[Test]
-		public async Task SeedAsync()
-		{
-			var type = NHibernateUtil.DateTimeOffset;
-			Assert.That(await (type.SeedAsync(null, CancellationToken.None)), Is.TypeOf<DateTimeOffset>());
-		}
 	}
 }

src/NHibernate.Test/Async/NHSpecificTest/GH1486/Fixture.cs

@@ -16,7 +16,6 @@
 namespace NHibernate.Test.NHSpecificTest.GH1486
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
@@ -142,12 +141,12 @@ public async Task TestDirectCallToIsModifiedAsync()
 
 					var checkable = new [] { true, true, true };
 					Assert.That(
-						() => componentType.IsModifiedAsync(new object[] { "", "", "" }, person.Address, checkable, sessionImplementor, CancellationToken.None),
+						() => componentType.IsModified(new object[] { "", "", "" }, person.Address, checkable, sessionImplementor),
 						Throws.Nothing,
 						"Checking component against an array snapshot failed");
-					var isModified = await (componentType.IsModifiedAsync(person.Address, person.Address, checkable, sessionImplementor, CancellationToken.None));
+					var isModified = componentType.IsModified(person.Address, person.Address, checkable, sessionImplementor);
 					Assert.That(isModified, Is.False, "Checking same component failed");
-					isModified = await (componentType.IsModifiedAsync(new Address("1", "A", "B"), person.Address, checkable, sessionImplementor, CancellationToken.None));
+					isModified = componentType.IsModified(new Address("1", "A", "B"), person.Address, checkable, sessionImplementor);
 					Assert.That(isModified, Is.False, "Checking equal component failed");
 				}
 				await (transaction.RollbackAsync());

src/NHibernate.Test/Async/NHSpecificTest/GH1496/AuditEventListener.cs

@@ -18,20 +18,28 @@ namespace NHibernate.Test.NHSpecificTest.GH1496
 	public partial class AuditEventListener : IPostUpdateEventListener
 	{
 
-		public async Task OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)
+		public Task OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)
 		{
-			if (isActive == false)
-			{ return; }
-
-			var modifiedItems = await (@event.Persister.FindModifiedAsync(@event.OldState, @event.State, @event.Entity, @event.Session, cancellationToken));
-			foreach (int index in modifiedItems)
+			try
 			{
-				ModifiedItems.Add(new Item
+				if (isActive == false)
+				{ return Task.CompletedTask; }
+
+				var modifiedItems = @event.Persister.FindModified(@event.OldState, @event.State, @event.Entity, @event.Session);
+				foreach (int index in modifiedItems)
+				{
+					ModifiedItems.Add(new Item
 				{
 					Index = index,
 					OldState = @event.OldState[index],
 					State = @event.State[index]
 				});
+				}
+				return Task.CompletedTask;
+			}
+			catch (System.Exception ex)
+			{
+				return Task.FromException<object>(ex);
 			}
 		}
 	}

src/NHibernate.Test/Async/TypesTest/AbstractDateTimeTypeFixture.cs

@@ -28,7 +28,6 @@
 namespace NHibernate.Test.TypesTest
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	[TestFixture]
 	public abstract class AbstractDateTimeTypeFixtureAsync : TypeFixtureBase
 	{
@@ -85,33 +84,6 @@ protected override void DropSchema()
 			base.DropSchema();
 		}
 
-		[Test]
-		public async Task NextAsync()
-		{
-			// Take some margin, as DbTimestampType takes its next value from the database, which
-			// may have its clock a bit shifted even if running on the same server. (Seen with PostgreSQL,
-			// off by a few seconds, and with SAP HANA running in a vm, off by twenty seconds.)
-			var current = Now.Subtract(TimeSpan.FromMinutes(2));
-			var next = await (Type.NextAsync(current, null, CancellationToken.None));
-
-			Assert.That(next, Is.TypeOf<DateTime>(), "next should be DateTime");
-			Assert.That(next, Is.GreaterThan(current), "next should be greater than current");
-		}
-
-		[Test]
-		public async Task SeedAsync()
-		{
-			Assert.That(await (Type.SeedAsync(null, CancellationToken.None)), Is.TypeOf<DateTime>(), "seed should be DateTime");
-		}
-
-		[Test]
-		public async Task ComparerAsync()
-		{
-			var v1 = await (Type.SeedAsync(null, CancellationToken.None));
-			var v2 = Now.Subtract(TimeSpan.FromTicks(DateAccuracyInTicks));
-			Assert.That(() => Type.Comparator.Compare(v1, v2), Throws.Nothing);
-		}
-
 		[Test]
 		[TestCase(DateTimeKind.Unspecified)]
 		[TestCase(DateTimeKind.Local)]

src/NHibernate.Test/Async/TypesTest/DateTimeOffsetTypeFixture.cs

@@ -22,7 +22,6 @@
 namespace NHibernate.Test.TypesTest
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	[TestFixture]
 	public class DateTimeOffsetTypeFixtureAsync : TypeFixtureBase
 	{
@@ -87,22 +86,6 @@ protected override void DropSchema()
 			base.DropSchema();
 		}
 
-		[Test]
-		public async Task NextAsync()
-		{
-			var current = DateTimeOffset.Parse("2004-01-01");
-			var next = await (Type.NextAsync(current, null, CancellationToken.None));
-
-			Assert.That(next, Is.TypeOf<DateTimeOffset>(), "next should be DateTimeOffset");
-			Assert.That(next, Is.GreaterThan(current), "next should be greater than current");
-		}
-
-		[Test]
-		public async Task SeedAsync()
-		{
-			Assert.That(await (Type.SeedAsync(null, CancellationToken.None)), Is.TypeOf<DateTimeOffset>(), "seed should be DateTime");
-		}
-
 		[Test]
 		public async Task ReadWriteAsync()
 		{