From ca798c8206139ccaa6595149377e43bb0543ce94 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 23 May 2024 02:20:06 +0000 Subject: [PATCH] Generate async files --- .../Async/Linq/ByMethod/MappedAsTests.cs | 52 ----- src/NHibernate.Test/Async/Linq/WhereTests.cs | 18 -- .../Dates/DateTimeOffsetFixture.cs | 18 -- .../NH3961/DateParametersComparedTo.cs | 195 ------------------ .../TypesTest/AbstractDateTimeTypeFixture.cs | 28 --- .../TypesTest/DateTimeOffsetTypeFixture.cs | 17 -- .../Async/TypesTest/Int16TypeFixture.cs | 43 ---- .../Async/TypesTest/Int32TypeFixture.cs | 43 ---- .../Async/TypesTest/Int64TypeFixture.cs | 61 ------ .../TypesTest/TimeAsTimeSpanTypeFixture.cs | 26 --- .../Async/TypesTest/TimeSpanTypeFixture.cs | 26 --- src/NHibernate/Async/Engine/Versioning.cs | 90 -------- .../Default/AbstractSaveEventListener.cs | 31 +-- .../DefaultFlushEntityEventListener.cs | 37 +--- .../Default/DefaultReplicateEventListener.cs | 16 -- .../Async/Impl/StatelessSessionImpl.cs | 6 +- .../VersionTypeSeedParameterSpecification.cs | 18 +- .../Entity/AbstractEntityPersister.cs | 2 +- .../Async/Type/AbstractBinaryType.cs | 67 ------ .../Async/Type/AbstractDateTimeType.cs | 51 ----- src/NHibernate/Async/Type/ByteType.cs | 58 ------ src/NHibernate/Async/Type/CustomType.cs | 40 ---- src/NHibernate/Async/Type/DateTimeNoMsType.cs | 42 ---- .../Async/Type/DateTimeOffSetType.cs | 52 ----- src/NHibernate/Async/Type/DbTimestampType.cs | 4 +- src/NHibernate/Async/Type/EnumCharType.cs | 55 ----- src/NHibernate/Async/Type/EnumStringType.cs | 64 ------ src/NHibernate/Async/Type/IVersionType.cs | 37 ---- src/NHibernate/Async/Type/Int16Type.cs | 63 ------ src/NHibernate/Async/Type/Int32Type.cs | 63 ------ src/NHibernate/Async/Type/Int64Type.cs | 63 ------ .../Async/Type/PersistentEnumType.cs | 56 ----- src/NHibernate/Async/Type/TicksType.cs | 44 ---- .../Async/Type/TimeAsTimeSpanType.cs | 55 ----- src/NHibernate/Async/Type/TimeSpanType.cs | 56 ----- src/NHibernate/Async/Type/UInt16Type.cs | 63 ------ src/NHibernate/Async/Type/UInt32Type.cs | 63 ------ src/NHibernate/Async/Type/UInt64Type.cs | 63 ------ 38 files changed, 22 insertions(+), 1764 deletions(-) delete mode 100644 src/NHibernate.Test/Async/Linq/ByMethod/MappedAsTests.cs delete mode 100644 src/NHibernate.Test/Async/TypesTest/Int16TypeFixture.cs delete mode 100644 src/NHibernate.Test/Async/TypesTest/Int32TypeFixture.cs delete mode 100644 src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs delete mode 100644 src/NHibernate/Async/Engine/Versioning.cs delete mode 100644 src/NHibernate/Async/Type/AbstractBinaryType.cs delete mode 100644 src/NHibernate/Async/Type/AbstractDateTimeType.cs delete mode 100644 src/NHibernate/Async/Type/ByteType.cs delete mode 100644 src/NHibernate/Async/Type/DateTimeNoMsType.cs delete mode 100644 src/NHibernate/Async/Type/DateTimeOffSetType.cs delete mode 100644 src/NHibernate/Async/Type/EnumCharType.cs delete mode 100644 src/NHibernate/Async/Type/EnumStringType.cs delete mode 100644 src/NHibernate/Async/Type/IVersionType.cs delete mode 100644 src/NHibernate/Async/Type/Int16Type.cs delete mode 100644 src/NHibernate/Async/Type/Int32Type.cs delete mode 100644 src/NHibernate/Async/Type/Int64Type.cs delete mode 100644 src/NHibernate/Async/Type/PersistentEnumType.cs delete mode 100644 src/NHibernate/Async/Type/TicksType.cs delete mode 100644 src/NHibernate/Async/Type/TimeAsTimeSpanType.cs delete mode 100644 src/NHibernate/Async/Type/TimeSpanType.cs delete mode 100644 src/NHibernate/Async/Type/UInt16Type.cs delete mode 100644 src/NHibernate/Async/Type/UInt32Type.cs delete mode 100644 src/NHibernate/Async/Type/UInt64Type.cs diff --git a/src/NHibernate.Test/Async/Linq/ByMethod/MappedAsTests.cs b/src/NHibernate.Test/Async/Linq/ByMethod/MappedAsTests.cs deleted file mode 100644 index af79cd5f272..00000000000 --- a/src/NHibernate.Test/Async/Linq/ByMethod/MappedAsTests.cs +++ /dev/null @@ -1,52 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NHibernate.Linq; -using NUnit.Framework; - -namespace NHibernate.Test.Linq.ByMethod -{ - using System.Threading.Tasks; - [TestFixture] - public class MappedAsTestsAsync : LinqTestCase - { - [Test] - public async Task WithUnaryExpressionAsync() - { - var num = 1; - await (db.Orders.Where(o => o.Freight == (-num).MappedAs(NHibernateUtil.Decimal)).ToListAsync()); - await (db.Orders.Where(o => o.Freight == ((decimal) num).MappedAs(NHibernateUtil.Decimal)).ToListAsync()); - await (db.Orders.Where(o => o.Freight == ((decimal?) (decimal) num).MappedAs(NHibernateUtil.Decimal)).ToListAsync()); - } - - [Test] - public async Task WithNewExpressionAsync() - { - var num = 1; - await (db.Orders.Where(o => o.Freight == new decimal(num).MappedAs(NHibernateUtil.Decimal)).ToListAsync()); - } - - [Test] - public async Task WithMethodCallExpressionAsync() - { - var num = 1; - await (db.Orders.Where(o => o.Freight == GetDecimal(num).MappedAs(NHibernateUtil.Decimal)).ToListAsync()); - } - - private decimal GetDecimal(int number) - { - return number; - } - } -} diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index 47809de4738..64d4ee9597f 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -698,24 +698,6 @@ where sheet.Users.Select(x => new { Id = x.Id, Name = x.Name }).Any(x => x.Id == Assert.That(query.Count, Is.EqualTo(2)); } - [Test] - public async Task ContainsSubqueryWithCoalesceStringEnumSelectAsync() - { - if (Dialect is MsSqlCeDialect || Dialect is SQLiteDialect) - Assert.Ignore("Dialect is not supported"); - - var results = - await (db.Timesheets.Where( - o => - o.Users - .Where(u => u.Id != 0.MappedAs(NHibernateUtil.Int32)) - .Select(u => u.Name == u.Name ? u.Enum1 : u.NullableEnum1.Value) - .Contains(EnumStoredAsString.Small)) - .ToListAsync()); - - Assert.That(results.Count, Is.EqualTo(1)); - } - [Test] public async Task SearchOnObjectTypeWithExtensionMethodAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs index d9e4bfce8e4..fa11a5bd0a1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs +++ b/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().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()); - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3961/DateParametersComparedTo.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3961/DateParametersComparedTo.cs index d2340d2098d..47ea9752af6 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3961/DateParametersComparedTo.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3961/DateParametersComparedTo.cs @@ -65,103 +65,6 @@ protected override void OnTearDown() CultureInfo.CurrentUICulture = _backupUICulture; } - // Non-reg test case - [Test] - public async Task NonNullableMappedAsDateShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NonNullableDateTime == _testDate.MappedAs(NHibernateUtil.Date)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Non-reg test case - [Test] - public async Task NonNullableMappedAsDateShouldIgnoreTimeAsync() - { - using (ISession session = OpenSession()) - { - var result = await (session.Query() - .Where(e => e.NonNullableDateTime == _testDate.AddMinutes(10).MappedAs(NHibernateUtil.Date)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Non-reg test case - [Test] - public async Task NonNullableMappedAsDateTimeShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NonNullableDateTime == _testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Non-reg test case - [Test] - [Obsolete] - public async Task NonNullableMappedAsTimestampShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NonNullableDateTime == _testDate.MappedAs(NHibernateUtil.Timestamp)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Non-reg test case - [Test] - public async Task NonNullableParameterValueShouldNotBeCachedWithMappedAsAndAsync() - { - // Dodges the query parameter formatting bug for showcasing the parameter value bug - CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("en-US"); - CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture; - try - { - using (ISession session = OpenSession()) - { - var result = await (session.Query() - .Where(e => e.NonNullableDateTime == _testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - - var testDate = _testDate.AddMinutes(10); - result = await (session.Query() - .Where(e => e.NonNullableDateTime == testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - CollectionAssert.IsEmpty(result); - } - } - finally - { - CultureInfo.CurrentCulture = _testCulture; - CultureInfo.CurrentUICulture = _testCulture; - } - } - // Non-reg test case [Test] public async Task NonNullableShouldBeCultureAgnosticAsync() @@ -178,104 +81,6 @@ public async Task NonNullableShouldBeCultureAgnosticAsync() } } - // Failing test case till NH-3961 is fixed - [Test] - public async Task NullableMappedAsDateShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NullableDateTime == _testDate.MappedAs(NHibernateUtil.Date)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Failing test case till NH-3961 is fixed - [Test] - public async Task NullableMappedAsDateShouldIgnoreTimeAsync() - { - var testDate = _testDate.AddMinutes(10); - using (ISession session = OpenSession()) - { - var result = await (session.Query() - .Where(e => e.NullableDateTime == testDate.MappedAs(NHibernateUtil.Date)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Failing test case till NH-3961 is fixed - [Test] - public async Task NullableMappedAsDateTimeShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NullableDateTime == _testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Failing test case till NH-3961 is fixed - [Test] - [Obsolete] - public async Task NullableMappedAsTimestampShouldBeCultureAgnosticAsync() - { - using (ISession session = OpenSession()) - using (session.BeginTransaction()) - { - var result = await (session.Query() - .Where(e => e.NullableDateTime == _testDate.MappedAs(NHibernateUtil.Timestamp)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - } - } - - // Failing test case till NH-3961 is fixed - [Test] - public async Task NullableParameterValueShouldNotBeCachedWithMappedAsAsync() - { - // Dodges the query parameter formatting bug for showcasing the parameter value bug - CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("en-US"); - CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture; - try - { - using (ISession session = OpenSession()) - { - var result = await (session.Query() - .Where(e => e.NullableDateTime == _testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - Assert.AreEqual(1, result.Count); - Assert.AreEqual("Bob", result[0].Name); - - var testDate = _testDate.AddMinutes(10); - result = await (session.Query() - .Where(e => e.NullableDateTime == testDate.MappedAs(NHibernateUtil.DateTime)) - .ToListAsync()); - - CollectionAssert.IsEmpty(result); - } - } - finally - { - CultureInfo.CurrentCulture = _testCulture; - CultureInfo.CurrentUICulture = _testCulture; - } - } - // Non-reg test case [Test] public async Task NullableShouldBeCultureAgnosticAsync() diff --git a/src/NHibernate.Test/Async/TypesTest/AbstractDateTimeTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/AbstractDateTimeTypeFixture.cs index 4307080f4cf..e57990472ec 100644 --- a/src/NHibernate.Test/Async/TypesTest/AbstractDateTimeTypeFixture.cs +++ b/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 { @@ -81,33 +80,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(), "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(), "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)] diff --git a/src/NHibernate.Test/Async/TypesTest/DateTimeOffsetTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/DateTimeOffsetTypeFixture.cs index 1c604513d85..80b66c4671e 100644 --- a/src/NHibernate.Test/Async/TypesTest/DateTimeOffsetTypeFixture.cs +++ b/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 { @@ -75,22 +74,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(), "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(), "seed should be DateTime"); - } - [Test] public async Task ReadWriteAsync() { diff --git a/src/NHibernate.Test/Async/TypesTest/Int16TypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/Int16TypeFixture.cs deleted file mode 100644 index 8983ffef5c3..00000000000 --- a/src/NHibernate.Test/Async/TypesTest/Int16TypeFixture.cs +++ /dev/null @@ -1,43 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using NHibernate.Type; -using NUnit.Framework; - -namespace NHibernate.Test.TypesTest -{ - using System.Threading.Tasks; - using System.Threading; - /// - /// Summary description for Int16TypeFixture. - /// - [TestFixture] - public class Int16TypeFixtureAsync - { - [Test] - public async Task NextAsync() - { - Int16Type type = (Int16Type) NHibernateUtil.Int16; - object current = (short) 1; - object next = await (type.NextAsync(current, null, CancellationToken.None)); - - Assert.IsTrue(next is Int16, "Next should be Int16"); - Assert.AreEqual((short) 2, (short) next, "current should have been incremented to 2"); - } - - [Test] - public async Task SeedAsync() - { - Int16Type type = (Int16Type) NHibernateUtil.Int16; - Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is Int16, "seed should be int16"); - } - } -} \ No newline at end of file diff --git a/src/NHibernate.Test/Async/TypesTest/Int32TypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/Int32TypeFixture.cs deleted file mode 100644 index ec6a264e176..00000000000 --- a/src/NHibernate.Test/Async/TypesTest/Int32TypeFixture.cs +++ /dev/null @@ -1,43 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using NHibernate.Type; -using NUnit.Framework; - -namespace NHibernate.Test.TypesTest -{ - using System.Threading.Tasks; - using System.Threading; - /// - /// Summary description for Int32TypeFixture. - /// - [TestFixture] - public class Int32TypeFixtureAsync - { - [Test] - public async Task NextAsync() - { - Int32Type type = (Int32Type) NHibernateUtil.Int32; - object current = (int) 1; - object next = await (type.NextAsync(current, null, CancellationToken.None)); - - Assert.IsTrue(next is Int32, "Next should be Int32"); - Assert.AreEqual((int) 2, (int) next, "current should have been incremented to 2"); - } - - [Test] - public async Task SeedAsync() - { - Int32Type type = (Int32Type) NHibernateUtil.Int32; - Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is Int32, "seed should be Int32"); - } - } -} \ No newline at end of file diff --git a/src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs deleted file mode 100644 index c0bf51f59cb..00000000000 --- a/src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs +++ /dev/null @@ -1,61 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using NHibernate.Type; -using NUnit.Framework; -using NHibernate.Engine; - -namespace NHibernate.Test.TypesTest -{ - using System.Threading.Tasks; - using System.Threading; - /// - /// Summary description for Int64TypeFixture. - /// - [TestFixture] - public class Int64TypeFixtureAsync: TestCase - { - [Test] - public async Task NextAsync() - { - Int64Type type = NHibernateUtil.Int64; - object current = (long)1; - object next = await (type.NextAsync(current, null, CancellationToken.None)); - - Assert.IsTrue(next is Int64, "Next should be Int64"); - Assert.AreEqual((long)2, (long)next, "current should have been incremented to 2"); - } - - [Test] - public async Task SeedAsync() - { - Int64Type type = NHibernateUtil.Int64; - Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is Int64, "seed should be int64"); - } - - [Test] - public async Task NullableWrapperDirtyAsync() - { - Int64Type type = NHibernateUtil.Int64; - - long? nullLong = null; - long? valueLong = 5; - long? fiveAgain = 5; - using (ISession s = OpenSession()) - { - Assert.IsTrue(await (type.IsDirtyAsync(nullLong, valueLong, (ISessionImplementor)s, CancellationToken.None)), "should be dirty - null to '5'"); - Assert.IsFalse(await (type.IsDirtyAsync(valueLong, fiveAgain, (ISessionImplementor)s, CancellationToken.None)), "should not be dirty - 5 to 5"); - } - } - - protected override string[] Mappings => Array.Empty(); - } -} diff --git a/src/NHibernate.Test/Async/TypesTest/TimeAsTimeSpanTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/TimeAsTimeSpanTypeFixture.cs index f9c585d7956..c65ba8150c2 100644 --- a/src/NHibernate.Test/Async/TypesTest/TimeAsTimeSpanTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/TimeAsTimeSpanTypeFixture.cs @@ -15,32 +15,6 @@ namespace NHibernate.Test.TypesTest { using System.Threading.Tasks; - using System.Threading; - /// - /// Summary description for TimeAsTimeSpanTypeFixture. - /// - [TestFixture] - public class TimeAsTimeSpanTypeFixtureAsync - { - [Test] - public async Task NextAsync() - { - var type = (TimeAsTimeSpanType) NHibernateUtil.TimeAsTimeSpan; - object current = new TimeSpan(DateTime.Now.Ticks - 5); - object next = await (type.NextAsync(current, null, CancellationToken.None)); - - Assert.IsTrue(next is TimeSpan, "Next should be TimeSpan"); - Assert.IsTrue((TimeSpan) next > (TimeSpan) current, - "next should be greater than current (could be equal depending on how quickly this occurs)"); - } - - [Test] - public async Task SeedAsync() - { - var type = (TimeAsTimeSpanType) NHibernateUtil.TimeAsTimeSpan; - Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is TimeSpan, "seed should be TimeSpan"); - } - } [TestFixture] public class TimeSpanFixture2Async : TypeFixtureBase diff --git a/src/NHibernate.Test/Async/TypesTest/TimeSpanTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/TimeSpanTypeFixture.cs index da729786501..4b32c30ada2 100644 --- a/src/NHibernate.Test/Async/TypesTest/TimeSpanTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/TimeSpanTypeFixture.cs @@ -15,32 +15,6 @@ namespace NHibernate.Test.TypesTest { using System.Threading.Tasks; - using System.Threading; - /// - /// Summary description for TimeSpanTypeFixture. - /// - [TestFixture] - public class TimeSpanTypeFixtureAsync - { - [Test] - public async Task NextAsync() - { - var type = (TimeSpanType) NHibernateUtil.TimeSpan; - object current = new TimeSpan(DateTime.Now.Ticks - 5); - object next = await (type.NextAsync(current, null, CancellationToken.None)); - - Assert.IsTrue(next is TimeSpan, "Next should be TimeSpan"); - Assert.IsTrue((TimeSpan) next > (TimeSpan) current, - "next should be greater than current (could be equal depending on how quickly this occurs)"); - } - - [Test] - public async Task SeedAsync() - { - var type = (TimeSpanType) NHibernateUtil.TimeSpan; - Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is TimeSpan, "seed should be TimeSpan"); - } - } [TestFixture] public class TimeSpanTypeFixture2Async : TypeFixtureBase diff --git a/src/NHibernate/Async/Engine/Versioning.cs b/src/NHibernate/Async/Engine/Versioning.cs deleted file mode 100644 index 061f598a9b8..00000000000 --- a/src/NHibernate/Async/Engine/Versioning.cs +++ /dev/null @@ -1,90 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using NHibernate.Persister.Entity; -using NHibernate.Type; - -namespace NHibernate.Engine -{ - using System.Threading.Tasks; - using System.Threading; - public partial class Versioning - { - - /// - /// Increment the given version number - /// - /// The value of the current version. - /// The of the versioned property. - /// The current . - /// A cancellation token that can be used to cancel the work - /// Returns the next value for the version. - public static async Task IncrementAsync(object version, IVersionType versionType, ISessionImplementor session, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - object next = await (versionType.NextAsync(version, session, cancellationToken)).ConfigureAwait(false); - if (log.IsDebugEnabled()) - { - log.Debug("Incrementing: {0} to {1}", - versionType.ToLoggableString(version, session.Factory), - versionType.ToLoggableString(next, session.Factory)); - } - return next; - } - - /// - /// Create an initial version number - /// - /// The of the versioned property. - /// The current . - /// A cancellation token that can be used to cancel the work - /// A seed value to initialize the versioned property with. - public static async Task SeedAsync(IVersionType versionType, ISessionImplementor session, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - object seed = await (versionType.SeedAsync(session, cancellationToken)).ConfigureAwait(false); - if (log.IsDebugEnabled()) - { - log.Debug("Seeding: {0}", seed); - } - return seed; - } - - /// - /// Seed the given instance state snapshot with an initial version number - /// - /// An array of objects that contains a snapshot of a persistent object. - /// The index of the version property in the fields parameter. - /// The of the versioned property. - /// Force the version to initialize - /// The current session, if any. - /// A cancellation token that can be used to cancel the work - /// if the version property needs to be seeded with an initial value. - public static async Task SeedVersionAsync(object[] fields, int versionProperty, IVersionType versionType, bool? force, - ISessionImplementor session, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - object initialVersion = fields[versionProperty]; - if (initialVersion == null || !force.HasValue || force.Value) - { - fields[versionProperty] = await (SeedAsync(versionType, session, cancellationToken)).ConfigureAwait(false); - return true; - } - else - { - if (log.IsDebugEnabled()) - { - log.Debug("using initial version: {0}", initialVersion); - } - return false; - } - } - } -} diff --git a/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs b/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs index 0d7213cc0ad..501004fe18c 100644 --- a/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs +++ b/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs @@ -206,7 +206,7 @@ protected virtual async Task PerformSaveOrReplicateAsync(object entity, object[] values = persister.GetPropertyValuesToInsert(entity, GetMergeMap(anything), source); IType[] types = persister.PropertyTypes; - bool substitute = await (SubstituteValuesIfNecessaryAsync(entity, id, values, persister, source, cancellationToken)).ConfigureAwait(false); + bool substitute = SubstituteValuesIfNecessary(entity, id, values, persister, source); if (persister.HasCollections) { @@ -278,35 +278,6 @@ protected virtual async Task VisitCollectionsBeforeSaveAsync(object entity return visitor.SubstitutionRequired; } - /// - /// Perform any property value substitution that is necessary - /// (interceptor callback, version initialization...) - /// - /// The entity - /// The entity identifier - /// The snapshot entity state - /// The entity persister - /// The originating session - /// A cancellation token that can be used to cancel the work - /// - /// True if the snapshot state changed such that - /// reinjection of the values into the entity is required. - /// - protected virtual async Task SubstituteValuesIfNecessaryAsync(object entity, object id, object[] values, IEntityPersister persister, ISessionImplementor source, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - bool substitute = source.Interceptor.OnSave(entity, id, values, persister.PropertyNames, persister.PropertyTypes); - - //keep the existing version number in the case of replicate! - if (persister.IsVersioned) - { - // NH Specific feature (H3.2 use null value for versionProperty; NH ask to persister to know if a valueType mean unversioned) - object versionValue = values[persister.VersionProperty]; - substitute |= await (Versioning.SeedVersionAsync(values, persister.VersionProperty, persister.VersionType, persister.IsUnsavedVersion(versionValue), source, cancellationToken)).ConfigureAwait(false); - } - return substitute; - } - /// Handles the calls needed to perform pre-save cascades for the given entity. /// The session from which the save event originated. /// The entity's persister instance. diff --git a/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs index d70bbb4b562..a4d0874e627 100644 --- a/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs @@ -231,7 +231,7 @@ private async Task ScheduleUpdateAsync(FlushEntityEvent @event, Cancellati Validate(entity, persister, status); // increment the version number (if necessary) - object nextVersion = await (GetNextVersionAsync(@event, cancellationToken)).ConfigureAwait(false); + object nextVersion = GetNextVersion(@event); // if it was dirtied by a collection only int[] dirtyProperties = @event.DirtyProperties; @@ -296,41 +296,6 @@ protected virtual async Task HandleInterceptionAsync(FlushEntityEvent @eve return intercepted; } - private async Task GetNextVersionAsync(FlushEntityEvent @event, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - // Convience method to retrieve an entities next version value - EntityEntry entry = @event.EntityEntry; - IEntityPersister persister = entry.Persister; - if (persister.IsVersioned) - { - object[] values = @event.PropertyValues; - - if (entry.IsBeingReplicated) - { - return Versioning.GetVersion(values, persister); - } - else - { - int[] dirtyProperties = @event.DirtyProperties; - - bool isVersionIncrementRequired = IsVersionIncrementRequired(@event, entry, persister, dirtyProperties); - - object nextVersion = isVersionIncrementRequired ? - await (Versioning.IncrementAsync(entry.Version, persister.VersionType, @event.Session, cancellationToken)).ConfigureAwait(false) : - entry.Version; //use the current version - - Versioning.SetVersion(values, nextVersion, persister); - - return nextVersion; - } - } - else - { - return null; - } - } - /// /// Performs all necessary checking to determine if an entity needs an SQL update /// to synchronize its state to the database. Modifies the event by side-effect! diff --git a/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs index 124f45d1755..00865e3f2b0 100644 --- a/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs @@ -146,22 +146,6 @@ private async Task CascadeAfterReplicateAsync(object entity, IEntityPersister pe } } - protected override Task SubstituteValuesIfNecessaryAsync(object entity, object id, object[] values, IEntityPersister persister, ISessionImplementor source, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(SubstituteValuesIfNecessary(entity, id, values, persister, source)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - protected override async Task VisitCollectionsBeforeSaveAsync(object entity, object id, object[] values, Type.IType[] types, IEventSource source, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/NHibernate/Async/Impl/StatelessSessionImpl.cs b/src/NHibernate/Async/Impl/StatelessSessionImpl.cs index e2e53333e39..5327b490ce3 100644 --- a/src/NHibernate/Async/Impl/StatelessSessionImpl.cs +++ b/src/NHibernate/Async/Impl/StatelessSessionImpl.cs @@ -381,8 +381,8 @@ public async Task InsertAsync(string entityName, object entity, Cancella if (persister.IsVersioned) { object versionValue = state[persister.VersionProperty]; - bool substitute = await (Versioning.SeedVersionAsync(state, persister.VersionProperty, persister.VersionType, - persister.IsUnsavedVersion(versionValue), this, cancellationToken)).ConfigureAwait(false); + bool substitute = Versioning.SeedVersion(state, persister.VersionProperty, persister.VersionType, + persister.IsUnsavedVersion(versionValue), this); if (substitute) { persister.SetPropertyValues(entity, state); @@ -429,7 +429,7 @@ public async Task UpdateAsync(string entityName, object entity, CancellationToke if (persister.IsVersioned) { oldVersion = persister.GetVersion(entity); - object newVersion = await (Versioning.IncrementAsync(oldVersion, persister.VersionType, this, cancellationToken)).ConfigureAwait(false); + object newVersion = Versioning.Increment(oldVersion, persister.VersionType, this); Versioning.SetVersion(state, newVersion, persister); persister.SetPropertyValues(entity, state); } diff --git a/src/NHibernate/Async/Param/VersionTypeSeedParameterSpecification.cs b/src/NHibernate/Async/Param/VersionTypeSeedParameterSpecification.cs index 56bdd82c0c4..422beb8174d 100644 --- a/src/NHibernate/Async/Param/VersionTypeSeedParameterSpecification.cs +++ b/src/NHibernate/Async/Param/VersionTypeSeedParameterSpecification.cs @@ -25,11 +25,21 @@ public partial class VersionTypeSeedParameterSpecification : IParameterSpecifica #region IParameterSpecification Members - public async Task BindAsync(DbCommand command, IList sqlQueryParametersList, QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken) + public Task BindAsync(DbCommand command, IList sqlQueryParametersList, QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken) { - cancellationToken.ThrowIfCancellationRequested(); - int position = sqlQueryParametersList.GetEffectiveParameterLocations(IdBackTrack).Single(); // version parameter can't appear more than once - await (type.NullSafeSetAsync(command, await (type.SeedAsync(session, cancellationToken)).ConfigureAwait(false), position, session, cancellationToken)).ConfigureAwait(false); + if (cancellationToken.IsCancellationRequested) + { + return Task.FromCanceled(cancellationToken); + } + try + { + int position = sqlQueryParametersList.GetEffectiveParameterLocations(IdBackTrack).Single(); // version parameter can't appear more than once + return type.NullSafeSetAsync(command, type.Seed(session), position, session, cancellationToken); + } + catch (Exception ex) + { + return Task.FromException(ex); + } } public Task BindAsync(DbCommand command, IList multiSqlQueryParametersList, int singleSqlParametersOffset, IList sqlQueryParametersList, QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken) diff --git a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs index 1e9ec77f2ba..ad3b8590044 100644 --- a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs +++ b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs @@ -203,7 +203,7 @@ public Task ForceVersionIncrementAsync(object id, object currentVersion, async Task InternalForceVersionIncrementAsync() { - object nextVersion = await (VersionType.NextAsync(currentVersion, session, cancellationToken)).ConfigureAwait(false); + object nextVersion = VersionType.Next(currentVersion, session); if (log.IsDebugEnabled()) { log.Debug("Forcing version increment [{0}; {1} -> {2}]", diff --git a/src/NHibernate/Async/Type/AbstractBinaryType.cs b/src/NHibernate/Async/Type/AbstractBinaryType.cs deleted file mode 100644 index ebe6d864485..00000000000 --- a/src/NHibernate/Async/Type/AbstractBinaryType.cs +++ /dev/null @@ -1,67 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data.Common; -using System.Text; -using NHibernate.Engine; -using NHibernate.SqlTypes; -using NHibernate.Util; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public abstract partial class AbstractBinaryType : MutableType, IVersionType, IComparer - { - - #region IVersionType Members - - // Note : simply returns null for seed() and next() as the only known - // application of binary types for versioning is for use with the - // TIMESTAMP datatype supported by Sybase and SQL Server, which - // are completely db-generated values... - - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/AbstractDateTimeType.cs b/src/NHibernate/Async/Type/AbstractDateTimeType.cs deleted file mode 100644 index 827ac034995..00000000000 --- a/src/NHibernate/Async/Type/AbstractDateTimeType.cs +++ /dev/null @@ -1,51 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data.Common; -using System.Globalization; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public abstract partial class AbstractDateTimeType : PrimitiveType, IIdentifierType, ILiteralType, IVersionType - { - - #region IVersionType Members - - /// - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) => - SeedAsync(session, cancellationToken); - - /// - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/ByteType.cs b/src/NHibernate/Async/Type/ByteType.cs deleted file mode 100644 index 0d38fdf1a71..00000000000 --- a/src/NHibernate/Async/Type/ByteType.cs +++ /dev/null @@ -1,58 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data; -using System.Data.Common; -using System.Numerics; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class ByteType : PrimitiveType, IDiscriminatorType, IVersionType - { - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - } -} diff --git a/src/NHibernate/Async/Type/CustomType.cs b/src/NHibernate/Async/Type/CustomType.cs index ca1483b29fb..d14a79d560e 100644 --- a/src/NHibernate/Async/Type/CustomType.cs +++ b/src/NHibernate/Async/Type/CustomType.cs @@ -90,46 +90,6 @@ public override async Task IsDirtyAsync(object old, object current, bool[] return checkable[0] && await (IsDirtyAsync(old, current, session, cancellationToken)).ConfigureAwait(false); } - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (!(userType is IUserVersionType userVersionType)) - throw new InvalidOperationException( - $"User type {userType} does not implement {nameof(IUserVersionType)}, Either implement it, or " + - $"avoid using this user type as a version type."); - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (!(userType is IUserVersionType userVersionType)) - throw new InvalidOperationException( - $"User type {userType} does not implement {nameof(IUserVersionType)}, Either implement it, or " + - $"avoid using this user type as a version type."); - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - public override Task ReplaceAsync(object original, object current, ISessionImplementor session, object owner, IDictionary copiedAlready, CancellationToken cancellationToken) { diff --git a/src/NHibernate/Async/Type/DateTimeNoMsType.cs b/src/NHibernate/Async/Type/DateTimeNoMsType.cs deleted file mode 100644 index 6a8276e1b39..00000000000 --- a/src/NHibernate/Async/Type/DateTimeNoMsType.cs +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using NHibernate.Engine; -using System.Data; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class DateTimeNoMsType : AbstractDateTimeType - { - - #region IVersionType Members - - public override Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/DateTimeOffSetType.cs b/src/NHibernate/Async/Type/DateTimeOffSetType.cs deleted file mode 100644 index 2eedce9041f..00000000000 --- a/src/NHibernate/Async/Type/DateTimeOffSetType.cs +++ /dev/null @@ -1,52 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class DateTimeOffsetType : PrimitiveType, IIdentifierType, ILiteralType, IVersionType - { - - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - return SeedAsync(session, cancellationToken); - } - - /// - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - } -} diff --git a/src/NHibernate/Async/Type/DbTimestampType.cs b/src/NHibernate/Async/Type/DbTimestampType.cs index cfa172aeca9..63a7f3db6a1 100644 --- a/src/NHibernate/Async/Type/DbTimestampType.cs +++ b/src/NHibernate/Async/Type/DbTimestampType.cs @@ -31,12 +31,12 @@ public override async Task SeedAsync(ISessionImplementor session, Cancel if (session == null) { log.Debug("incoming session was null; using current application host time"); - return await (base.SeedAsync(null, cancellationToken)).ConfigureAwait(false); + return base.Seed(null); } if (!SupportsCurrentTimestampSelection(session.Factory.Dialect)) { log.Info("falling back to application host based timestamp, as dialect does not support current timestamp selection"); - return await (base.SeedAsync(session, cancellationToken)).ConfigureAwait(false); + return base.Seed(session); } return await (GetCurrentTimestampAsync(session, cancellationToken)).ConfigureAwait(false); } diff --git a/src/NHibernate/Async/Type/EnumCharType.cs b/src/NHibernate/Async/Type/EnumCharType.cs deleted file mode 100644 index fe9eb513dbe..00000000000 --- a/src/NHibernate/Async/Type/EnumCharType.cs +++ /dev/null @@ -1,55 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class EnumCharType : AbstractEnumType - { - - public override Task AssembleAsync(object cached, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Assemble(cached, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public override Task DisassembleAsync(object value, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Disassemble(value, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - } -} diff --git a/src/NHibernate/Async/Type/EnumStringType.cs b/src/NHibernate/Async/Type/EnumStringType.cs deleted file mode 100644 index 3da2325af89..00000000000 --- a/src/NHibernate/Async/Type/EnumStringType.cs +++ /dev/null @@ -1,64 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Data; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public abstract partial class EnumStringType : AbstractEnumType - { - - /// - /// - /// - /// - /// - /// - /// A cancellation token that can be used to cancel the work - /// - public override Task AssembleAsync(object cached, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Assemble(cached, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public override Task DisassembleAsync(object value, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Disassemble(value, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - } -} diff --git a/src/NHibernate/Async/Type/IVersionType.cs b/src/NHibernate/Async/Type/IVersionType.cs deleted file mode 100644 index f4a17f28986..00000000000 --- a/src/NHibernate/Async/Type/IVersionType.cs +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System.Collections; -using NHibernate.Engine; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial interface IVersionType : IType - { - /// - /// When implemented by a class, increments the version. - /// - /// The current version - /// The current session, if available. - /// A cancellation token that can be used to cancel the work - /// an instance of the that has been incremented. - Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken); - - /// - /// When implemented by a class, gets an initial version. - /// - /// The current session, if available. - /// A cancellation token that can be used to cancel the work - /// An instance of the type. - Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken); - } -} diff --git a/src/NHibernate/Async/Type/Int16Type.cs b/src/NHibernate/Async/Type/Int16Type.cs deleted file mode 100644 index 804d767eafd..00000000000 --- a/src/NHibernate/Async/Type/Int16Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; -using System.Collections.Generic; -using System.Data; -using System.Numerics; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class Int16Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/Int32Type.cs b/src/NHibernate/Async/Type/Int32Type.cs deleted file mode 100644 index 3b4217968dd..00000000000 --- a/src/NHibernate/Async/Type/Int32Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; -using System.Collections.Generic; -using System.Data; -using System.Numerics; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class Int32Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/Int64Type.cs b/src/NHibernate/Async/Type/Int64Type.cs deleted file mode 100644 index e1b07967cbd..00000000000 --- a/src/NHibernate/Async/Type/Int64Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Numerics; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class Int64Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/PersistentEnumType.cs b/src/NHibernate/Async/Type/PersistentEnumType.cs deleted file mode 100644 index df295d96308..00000000000 --- a/src/NHibernate/Async/Type/PersistentEnumType.cs +++ /dev/null @@ -1,56 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections.Generic; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class PersistentEnumType : AbstractEnumType - { - - public override Task AssembleAsync(object cached, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Assemble(cached, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public override Task DisassembleAsync(object value, ISessionImplementor session, object owner, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Disassemble(value, session, owner)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - } -} diff --git a/src/NHibernate/Async/Type/TicksType.cs b/src/NHibernate/Async/Type/TicksType.cs deleted file mode 100644 index 0ffb06b37f6..00000000000 --- a/src/NHibernate/Async/Type/TicksType.cs +++ /dev/null @@ -1,44 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Data; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class TicksType : AbstractDateTimeType - { - - #region IVersionType Members - - public override Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/TimeAsTimeSpanType.cs b/src/NHibernate/Async/Type/TimeAsTimeSpanType.cs deleted file mode 100644 index 185baa88eba..00000000000 --- a/src/NHibernate/Async/Type/TimeAsTimeSpanType.cs +++ /dev/null @@ -1,55 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; -using System.Collections.Generic; -using System.Data; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class TimeAsTimeSpanType : PrimitiveType, IVersionType - { - - #region IVersionType Members - - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - return SeedAsync(session, cancellationToken); - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/TimeSpanType.cs b/src/NHibernate/Async/Type/TimeSpanType.cs deleted file mode 100644 index 0917413671c..00000000000 --- a/src/NHibernate/Async/Type/TimeSpanType.cs +++ /dev/null @@ -1,56 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Data.Common; -using NHibernate.Engine; -using NHibernate.SqlTypes; -using System.Collections.Generic; -using System.Data; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class TimeSpanType : PrimitiveType, IVersionType, ILiteralType - { - - #region IVersionType Members - - public Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - return SeedAsync(session, cancellationToken); - } - - /// - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/UInt16Type.cs b/src/NHibernate/Async/Type/UInt16Type.cs deleted file mode 100644 index cfd05ee60f6..00000000000 --- a/src/NHibernate/Async/Type/UInt16Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Numerics; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class UInt16Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/UInt32Type.cs b/src/NHibernate/Async/Type/UInt32Type.cs deleted file mode 100644 index 2fa37d01162..00000000000 --- a/src/NHibernate/Async/Type/UInt32Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Numerics; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class UInt32Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -} diff --git a/src/NHibernate/Async/Type/UInt64Type.cs b/src/NHibernate/Async/Type/UInt64Type.cs deleted file mode 100644 index d2db5e47c99..00000000000 --- a/src/NHibernate/Async/Type/UInt64Type.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Numerics; -using NHibernate.Engine; -using NHibernate.SqlTypes; - -namespace NHibernate.Type -{ - using System.Threading.Tasks; - using System.Threading; - public partial class UInt64Type : PrimitiveType, IDiscriminatorType, IVersionType - { - - #region IVersionType Members - - public virtual Task NextAsync(object current, ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Next(current, session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - public virtual Task SeedAsync(ISessionImplementor session, CancellationToken cancellationToken) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - try - { - return Task.FromResult(Seed(session)); - } - catch (Exception ex) - { - return Task.FromException(ex); - } - } - - #endregion - } -}