Skip to content

Commit 179056e

Browse files
lofczlofcz
authored
Add default value for CancellationToken in IQueryBatch.GetResultAsync (nhibernate#2571)
1 parent b36d177 commit 179056e

File tree

19 files changed

+101
-110
lines changed

19 files changed

+101
-110
lines changed

‎src/AsyncGenerator.yml

+1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ methodRules:
287287
- containingType: NHibernate.Linq.DmlExtensionMethods
288288
- containingType: NHibernate.Linq.InsertBuilder<TSource, TTarget>
289289
- containingType: NHibernate.Linq.UpdateBuilder<TSource>
290+
- containingType: NHibernate.Multi.IQueryBatch
290291
name: PubliclyExposedType
291292
- filters:
292293
- hasAttributeName: ObsoleteAttribute

‎src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ public async Task QueryCacheTestAsync()
11121112

11131113
using (var t = s.BeginTransaction())
11141114
{
1115-
await (queries.ExecuteAsync(CancellationToken.None));
1115+
await (queries.ExecuteAsync());
11161116
await (t.CommitAsync());
11171117
}
11181118

@@ -1127,24 +1127,24 @@ public async Task QueryCacheTestAsync()
11271127
// Run a second time, to test the query cache
11281128
using (var t = s.BeginTransaction())
11291129
{
1130-
await (queries.ExecuteAsync(CancellationToken.None));
1130+
await (queries.ExecuteAsync());
11311131
await (t.CommitAsync());
11321132
}
11331133

11341134
Assert.That(
1135-
await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
1135+
await (queries.GetResultAsync<ReadOnly>(0)),
11361136
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1");
11371137
Assert.That(
1138-
await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
1138+
await (queries.GetResultAsync<ReadOnly>(1)),
11391139
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2");
11401140
Assert.That(
1141-
await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
1141+
await (queries.GetResultAsync<ReadWrite>(2)),
11421142
Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name3), "q3");
11431143
Assert.That(
1144-
await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
1144+
await (queries.GetResultAsync<ReadWrite>(3)),
11451145
Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4");
11461146
Assert.That(
1147-
await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
1147+
await (queries.GetResultAsync<ReadOnly>(4)),
11481148
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5");
11491149

11501150
Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(2), "cache GetMany secondExecution");
@@ -1174,24 +1174,24 @@ public async Task QueryCacheTestAsync()
11741174
// Run a third time, to re-test the query cache
11751175
using (var t = s.BeginTransaction())
11761176
{
1177-
await (queries.ExecuteAsync(CancellationToken.None));
1177+
await (queries.ExecuteAsync());
11781178
await (t.CommitAsync());
11791179
}
11801180

11811181
Assert.That(
1182-
await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
1182+
await (queries.GetResultAsync<ReadOnly>(0)),
11831183
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1 after update");
11841184
Assert.That(
1185-
await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
1185+
await (queries.GetResultAsync<ReadOnly>(1)),
11861186
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2 after update");
11871187
Assert.That(
1188-
await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
1188+
await (queries.GetResultAsync<ReadWrite>(2)),
11891189
Has.Count.EqualTo(0), "q3 after update");
11901190
Assert.That(
1191-
await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
1191+
await (queries.GetResultAsync<ReadWrite>(3)),
11921192
Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4 after update");
11931193
Assert.That(
1194-
await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
1194+
await (queries.GetResultAsync<ReadOnly>(4)),
11951195
Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5 after update");
11961196

11971197
Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(3), "cache GetMany thirdExecution");

‎src/NHibernate.Test/Async/Criteria/Lambda/IntegrationFixture.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ public async Task MultiQueryAsync()
428428
.Add("page", query)
429429
.Add<int>("count", query.ToRowCountQuery());
430430

431-
var pageResults = await (multiQuery.GetResultAsync<Person>("page", CancellationToken.None));
432-
var countResults = await (multiQuery.GetResultAsync<int>("count", CancellationToken.None));
431+
var pageResults = await (multiQuery.GetResultAsync<Person>("page"));
432+
var countResults = await (multiQuery.GetResultAsync<int>("count"));
433433

434434
Assert.That(pageResults.Count, Is.EqualTo(1));
435435
Assert.That(pageResults[0].Name, Is.EqualTo("Name 3"));
@@ -451,8 +451,8 @@ public async Task MultiQueryAsync()
451451
.Add("page", query)
452452
.Add<int>("count", query.ToRowCountQuery());
453453

454-
var pageResults = await (multiCriteria.GetResultAsync<Person>("page", CancellationToken.None));
455-
var countResults = await (multiCriteria.GetResultAsync<int>("count", CancellationToken.None));
454+
var pageResults = await (multiCriteria.GetResultAsync<Person>("page"));
455+
var countResults = await (multiCriteria.GetResultAsync<int>("count"));
456456

457457
Assert.That(pageResults.Count, Is.EqualTo(1));
458458
Assert.That(pageResults[0].Name, Is.EqualTo("Name 3"));

‎src/NHibernate.Test/Async/Futures/QueryBatchFixture.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace NHibernate.Test.Futures
2323
{
2424
using System.Threading.Tasks;
25-
using System.Threading;
2625
[TestFixture]
2726
public class QueryBatchFixtureAsync : TestCaseMappingByCode
2827
{
@@ -81,10 +80,10 @@ public async Task CanCombineCriteriaAndHqlInBatchAsync()
8180

8281
using (var sqlLog = new SqlLogSpy())
8382
{
84-
await (batch.GetResultAsync<int>(0, CancellationToken.None));
85-
await (batch.GetResultAsync<EntityComplex>("queryOver", CancellationToken.None));
86-
await (batch.GetResultAsync<EntityComplex>(2, CancellationToken.None));
87-
await (batch.GetResultAsync<EntitySimpleChild>("sql", CancellationToken.None));
83+
await (batch.GetResultAsync<int>(0));
84+
await (batch.GetResultAsync<EntityComplex>("queryOver"));
85+
await (batch.GetResultAsync<EntityComplex>(2));
86+
await (batch.GetResultAsync<EntitySimpleChild>("sql"));
8887
if (SupportsMultipleQueries)
8988
Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1));
9089
}
@@ -142,7 +141,7 @@ public async Task CanFetchCollectionInBatchAsync()
142141

143142
batch.Add(q1);
144143
batch.Add(session.Query<EntityComplex>().Fetch(c => c.ChildrenList));
145-
await (batch.ExecuteAsync(CancellationToken.None));
144+
await (batch.ExecuteAsync());
146145

147146
var parent = await (session.LoadAsync<EntityComplex>(_parentId));
148147
Assert.That(NHibernateUtil.IsInitialized(parent), Is.True);
@@ -162,7 +161,7 @@ public async Task AfterLoadCallbackAsync()
162161
int count = 0;
163162
batch.Add(session.Query<EntityComplex>().WithOptions(o => o.SetCacheable(true)), r => results = r);
164163
batch.Add(session.Query<EntityComplex>().WithOptions(o => o.SetCacheable(true)), ec => ec.Count(), r => count = r);
165-
await (batch.ExecuteAsync(CancellationToken.None));
164+
await (batch.ExecuteAsync());
166165

167166
Assert.That(results, Is.Not.Null);
168167
Assert.That(count, Is.GreaterThan(0));
@@ -177,7 +176,7 @@ public async Task AfterLoadCallbackAsync()
177176
batch.Add(session.Query<EntityComplex>().WithOptions(o => o.SetCacheable(true)), r => results = r);
178177
batch.Add(session.Query<EntityComplex>().WithOptions(o => o.SetCacheable(true)), ec => ec.Count(), r => count = r);
179178

180-
await (batch.ExecuteAsync(CancellationToken.None));
179+
await (batch.ExecuteAsync());
181180

182181
Assert.That(results, Is.Not.Null);
183182
Assert.That(count, Is.GreaterThan(0));

‎src/NHibernate.Test/Async/NHSpecificTest/DataReaderWrapperTest/Fixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
namespace NHibernate.Test.NHSpecificTest.DataReaderWrapperTest
1717
{
1818
using System.Threading.Tasks;
19-
using System.Threading;
2019
[TestFixture]
2120
public class FixtureAsync : BugTestCase
2221
{
@@ -71,7 +70,7 @@ public async Task CanUseDatareadersGetValueWithQueryBatchAsync()
7170
var crit = s.CreateCriteria(typeof (TheEntity));
7271
var multi = s.CreateQueryBatch();
7372
multi.Add<TheEntity>(crit);
74-
var res = await (multi.GetResultAsync<TheEntity>(0, CancellationToken.None));
73+
var res = await (multi.GetResultAsync<TheEntity>(0));
7574
Assert.That(res.Count, Is.EqualTo(1));
7675
}
7776
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH1253/Fixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
namespace NHibernate.Test.NHSpecificTest.NH1253
1616
{
1717
using System.Threading.Tasks;
18-
using System.Threading;
1918
[TestFixture]
2019
public class FixtureAsync : BugTestCase
2120
{
@@ -119,7 +118,7 @@ public async Task QueryBatchSingleInListAsync()
119118
await (s.CreateQueryBatch()
120119
.Add<Car>(q1)
121120
.Add<Car>(q2)
122-
.ExecuteAsync(CancellationToken.None));
121+
.ExecuteAsync());
123122

124123
await (tx.CommitAsync());
125124
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH1508/Fixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
namespace NHibernate.Test.NHSpecificTest.NH1508
1616
{
1717
using System.Threading.Tasks;
18-
using System.Threading;
1918
[TestFixture]
2019
public class FixtureAsync : BugTestCase
2120
{
@@ -81,7 +80,7 @@ public async Task DoesntThrowExceptionWhenHqlQueryIsGivenToQueryBatchAsync()
8180
var q = session
8281
.CreateQueryBatch()
8382
.Add<Document>(sqlQuery);
84-
await (q.ExecuteAsync(CancellationToken.None));
83+
await (q.ExecuteAsync());
8584
}
8685
}
8786
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH1609/Fixture.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public async Task TestWithQueryBatchAsync()
8686
session.CreateCriteria(typeof (EntityB)).Add(Restrictions.Eq("A.Id", a1.Id)).Add(Restrictions.Eq("C.Id", c.Id)).
8787
SetFirstResult(0).SetMaxResults(1));
8888

89-
Assert.That(await (multi.GetResultAsync<EntityA>(0, CancellationToken.None)), Has.Count.EqualTo(1));
90-
Assert.That(await (multi.GetResultAsync<EntityA>(1, CancellationToken.None)), Has.Count.EqualTo(1));
91-
Assert.That(await (multi.GetResultAsync<EntityB>(2, CancellationToken.None)), Has.Count.EqualTo(1));
89+
Assert.That(await (multi.GetResultAsync<EntityA>(0)), Has.Count.EqualTo(1));
90+
Assert.That(await (multi.GetResultAsync<EntityA>(1)), Has.Count.EqualTo(1));
91+
Assert.That(await (multi.GetResultAsync<EntityB>(2)), Has.Count.EqualTo(1));
9292
}
9393
}
9494

‎src/NHibernate.Test/Async/NHSpecificTest/NH1836/Fixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
namespace NHibernate.Test.NHSpecificTest.NH1836
1919
{
2020
using System.Threading.Tasks;
21-
using System.Threading;
2221
[TestFixture]
2322
public class FixtureAsync : BugTestCase
2423
{
@@ -70,7 +69,7 @@ public async Task AliasToBeanTransformerShouldApplyCorrectlyToQueryBatchAsync()
7069
.SetResultTransformer(Transformers.AliasToBean(typeof(EntityDTO))));
7170

7271
Assert.That(multiQuery.Execute, Throws.Nothing);
73-
var results = await (multiQuery.GetResultAsync<EntityDTO>(0, CancellationToken.None));
72+
var results = await (multiQuery.GetResultAsync<EntityDTO>(0));
7473
Assert.That(results.First(), Is.TypeOf<EntityDTO>().And.Property("EntityId").EqualTo(1));
7574
await (t.CommitAsync());
7675
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH1869/Fixture.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public async Task TestWithQueryBatchAsync()
107107
using (var session = Sfi.OpenSession())
108108
{
109109
var result = await (GetResultWithQueryBatchAsync(session));
110-
Assert.That(await (result.GetResultAsync<NodeKeyword>(0, CancellationToken.None)), Has.Count.EqualTo(1));
111-
Assert.That(await (result.GetResultAsync<NodeKeyword>(1, CancellationToken.None)), Has.Count.EqualTo(1));
110+
Assert.That(await (result.GetResultAsync<NodeKeyword>(0)), Has.Count.EqualTo(1));
111+
Assert.That(await (result.GetResultAsync<NodeKeyword>(1)), Has.Count.EqualTo(1));
112112
}
113113
}
114114

‎src/NHibernate.Test/Async/NHSpecificTest/NH2195/SQLiteMultiCriteriaTest.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
namespace NHibernate.Test.NHSpecificTest.NH2195
2121
{
2222
using System.Threading.Tasks;
23-
using System.Threading;
2423
[TestFixture]
2524
public class SQLiteMultiCriteriaTestAsync : BugTestCase
2625
{
@@ -173,8 +172,8 @@ public async Task QueryBatchWithIntsShouldExecuteCorrectlyAsync()
173172
multi.Add<DomainClass>(criteriaWithPagination);
174173
multi.Add<long>(criteriaWithRowCount);
175174

176-
var numResults = (await (multi.GetResultAsync<long>(1, CancellationToken.None))).Single();
177-
var list = await (multi.GetResultAsync<DomainClass>(0, CancellationToken.None));
175+
var numResults = (await (multi.GetResultAsync<long>(1))).Single();
176+
var list = await (multi.GetResultAsync<DomainClass>(0));
178177

179178
Assert.That(numResults, Is.EqualTo(2));
180179
Assert.That(list.Count, Is.EqualTo(1));
@@ -198,8 +197,8 @@ public async Task QueryBatchWithStringsShouldExecuteCorrectlyAsync()
198197
multi.Add<DomainClass>(criteriaWithPagination);
199198
multi.Add<long>(criteriaWithRowCount);
200199

201-
var numResults = (await (multi.GetResultAsync<long>(1, CancellationToken.None))).Single();
202-
var list = await (multi.GetResultAsync<DomainClass>(0, CancellationToken.None));
200+
var numResults = (await (multi.GetResultAsync<long>(1))).Single();
201+
var list = await (multi.GetResultAsync<DomainClass>(0));
203202

204203
Assert.That(numResults, Is.EqualTo(2));
205204
Assert.That(list.Count, Is.EqualTo(1));

‎src/NHibernate.Test/Async/NHSpecificTest/NH2201/Fixture.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
namespace NHibernate.Test.NHSpecificTest.NH2201
1717
{
1818
using System.Threading.Tasks;
19-
using System.Threading;
2019
[TestFixture]
2120
public class FixtureAsync : BugTestCase
2221
{
@@ -78,8 +77,8 @@ public async Task CanUseQueryBatchAndFetchSelectAsync()
7877
.Add<Parent>(s.CreateCriteria<Parent>())
7978
.Add<Parent>(s.CreateCriteria<Parent>());
8079

81-
var result1 = await (multi.GetResultAsync<Parent>(0, CancellationToken.None));
82-
var result2 = await (multi.GetResultAsync<Parent>(1, CancellationToken.None));
80+
var result1 = await (multi.GetResultAsync<Parent>(0));
81+
var result2 = await (multi.GetResultAsync<Parent>(1));
8382

8483
Assert.That(result1.Count, Is.EqualTo(2));
8584
Assert.That(result2.Count, Is.EqualTo(2));

‎src/NHibernate.Test/Async/NHSpecificTest/NH2959/Fixture.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
namespace NHibernate.Test.NHSpecificTest.NH2959
1616
{
1717
using System.Threading.Tasks;
18-
using System.Threading;
1918
[TestFixture]
2019
public class FixtureAsync : BugTestCase
2120
{
@@ -89,7 +88,7 @@ public async Task CanUsePolymorphicCriteriaInQueryBatchAsync()
8988
{
9089
var results = await (session.CreateQueryBatch()
9190
.Add<BaseEntity>(session.CreateCriteria(typeof(BaseEntity)))
92-
.GetResultAsync<BaseEntity>(0, CancellationToken.None));
91+
.GetResultAsync<BaseEntity>(0));
9392

9493
Assert.That(results, Has.Count.EqualTo(2));
9594
}
@@ -103,7 +102,7 @@ public async Task CanUsePolymorphicQueryInQueryBatchAsync()
103102
{
104103
var results = await (session.CreateQueryBatch()
105104
.Add<BaseEntity>(session.CreateQuery("from " + typeof(BaseEntity).FullName))
106-
.GetResultAsync<BaseEntity>(0, CancellationToken.None));
105+
.GetResultAsync<BaseEntity>(0));
107106

108107
Assert.That(results, Has.Count.EqualTo(2));
109108
}

‎src/NHibernate.Test/Async/NHSpecificTest/SqlConverterAndMultiQuery/Fixture.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
namespace NHibernate.Test.NHSpecificTest.SqlConverterAndMultiQuery
1919
{
2020
using System.Threading.Tasks;
21-
using System.Threading;
2221
[TestFixture]
2322
public class FixtureAsync : BugTestCase
2423
{
@@ -76,7 +75,7 @@ public void QueryBatchShouldThrowUserExceptionAsync()
7675
var multi = s.CreateQueryBatch();
7776
multi.Add<int>(s.CreateQuery(hqlQuery));
7877
s.Connection.Close();
79-
Assert.ThrowsAsync<UnitTestException>(() => multi.ExecuteAsync(CancellationToken.None));
78+
Assert.ThrowsAsync<UnitTestException>(() => multi.ExecuteAsync());
8079
}
8180
}
8281

@@ -118,7 +117,7 @@ public void CriteriaQueryBatchShouldThrowUserExceptionAsync()
118117
var multi = s.CreateQueryBatch();
119118
multi.Add<ClassA>(s.CreateCriteria(typeof(ClassA)));
120119
s.Connection.Close();
121-
Assert.ThrowsAsync<UnitTestException>(() => multi.ExecuteAsync(CancellationToken.None));
120+
Assert.ThrowsAsync<UnitTestException>(() => multi.ExecuteAsync());
122121
}
123122
}
124123
}

‎src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
namespace NHibernate.Test.Pagination
2424
{
2525
using System.Threading.Tasks;
26-
using System.Threading;
2726
[TestFixture]
2827
public class CustomDialectFixtureAsync : TestCase
2928
{
@@ -153,7 +152,7 @@ public async Task LimitFirstQueryBatchAsync()
153152
.SetFirstResult(1)
154153
.SetMaxResults(2));
155154

156-
var points = await (query.GetResultAsync<DataPoint>(0, CancellationToken.None));
155+
var points = await (query.GetResultAsync<DataPoint>(0));
157156

158157
Assert.That(points.Count, Is.EqualTo(2));
159158
Assert.That(points[0].X, Is.EqualTo(7d));

0 commit comments

Comments
 (0)