Skip to content

Commit f7f783e

Browse files
fredericDelaportefredericDelaporte
authored
Upgrade AsyncGenerator to 0.13.1 (#1936)
And migrate settings
1 parent 3dcb91b commit f7f783e

22 files changed

+248
-356
lines changed

‎Tools/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
10-
<package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.9" targetFramework="net461" />
10+
<package id="CSharpAsyncGenerator.CommandLine" version="0.13.1" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
1212
<package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
1313
</packages>

‎src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs

+4-18
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,8 @@ public TimeoutCatchingNonBatchingBatcher(ConnectionManager connectionManager, II
114114

115115
public override Task<DbDataReader> ExecuteReaderAsync(DbCommand cmd, CancellationToken cancellationToken)
116116
{
117-
try
118-
{
119-
LastCommandTimeout = cmd.CommandTimeout;
120-
return base.ExecuteReaderAsync(cmd, cancellationToken);
121-
}
122-
catch (System.Exception ex)
123-
{
124-
return Task.FromException<DbDataReader>(ex);
125-
}
117+
LastCommandTimeout = cmd.CommandTimeout;
118+
return base.ExecuteReaderAsync(cmd, cancellationToken);
126119
}
127120

128121
public override DbDataReader ExecuteReader(DbCommand cmd)
@@ -150,15 +143,8 @@ public partial class TimeoutCatchingNonBatchingBatcher : NonBatchingBatcher
150143

151144
public override Task<DbDataReader> ExecuteReaderAsync(DbCommand cmd, CancellationToken cancellationToken)
152145
{
153-
try
154-
{
155-
LastCommandTimeout = cmd.CommandTimeout;
156-
return base.ExecuteReaderAsync(cmd, cancellationToken);
157-
}
158-
catch (System.Exception ex)
159-
{
160-
return Task.FromException<DbDataReader>(ex);
161-
}
146+
LastCommandTimeout = cmd.CommandTimeout;
147+
return base.ExecuteReaderAsync(cmd, cancellationToken);
162148
}
163149
}
164150
}

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,7 @@ private partial class SubstituteDbCommand : DbCommand
158158

159159
protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
160160
{
161-
try
162-
{
163-
return Task.FromResult<DbDataReader>(_substituteReader);
164-
}
165-
catch (Exception ex)
166-
{
167-
return Task.FromException<DbDataReader>(ex);
168-
}
161+
return Task.FromResult<DbDataReader>(_substituteReader);
169162
}
170163

171164
public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken)

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

+6-13
Original file line numberDiff line numberDiff line change
@@ -573,20 +573,13 @@ protected void ClearSecondLevelCacheFor(System.Type entity)
573573

574574
protected Task ClearCollectionCacheAsync<T>(Expression<Func<T, IEnumerable>> pathToCollection, CancellationToken cancellationToken = default(CancellationToken))
575575
{
576-
try
577-
{
578-
var rootEntityTypeFullPath = typeof(T).FullName;
579-
var memberExpression = pathToCollection.Body as MemberExpression;
580-
if (memberExpression == null)
581-
return Task.FromException<object>(new ArgumentException("pathToCollection should be member expression"));
576+
var rootEntityTypeFullPath = typeof(T).FullName;
577+
var memberExpression = pathToCollection.Body as MemberExpression;
578+
if (memberExpression == null)
579+
return Task.FromException<object>(new ArgumentException("pathToCollection should be member expression"));
582580

583-
var role = $"{rootEntityTypeFullPath}.{memberExpression.Member.Name}";
584-
return Sfi.EvictCollectionAsync(role, cancellationToken);
585-
}
586-
catch (Exception ex)
587-
{
588-
return Task.FromException<object>(ex);
589-
}
581+
var role = $"{rootEntityTypeFullPath}.{memberExpression.Member.Name}";
582+
return Sfi.EvictCollectionAsync(role, cancellationToken);
590583
}
591584

592585
protected void ClearCollectionCache<T>(Expression<Func<T, IEnumerable>> pathToCollection)

‎src/NHibernate.Test/Async/SessionBuilder/Fixture.cs

-45
Original file line numberDiff line numberDiff line change
@@ -189,51 +189,6 @@ private void CanSetFlushMode<T>(T sb) where T : ISessionBuilder<T>
189189
FlushMode.Always, FlushMode.Auto, FlushMode.Commit, FlushMode.Manual);
190190
}
191191

192-
[Test]
193-
public async Task CanSetInterceptorAsync()
194-
{
195-
var sb = Sfi.WithOptions();
196-
await (CanSetInterceptorAsync(sb));
197-
using (var s = sb.OpenSession())
198-
{
199-
await (CanSetInterceptorAsync(s.SessionWithOptions()));
200-
}
201-
}
202-
203-
private Task CanSetInterceptorAsync<T>(T sb) where T : ISessionBuilder<T>
204-
{
205-
try
206-
{
207-
var sbType = sb.GetType().Name;
208-
// Do not use .Instance here, we want another instance.
209-
var interceptor = new EmptyInterceptor();
210-
var options = DebugSessionFactory.GetCreationOptions(sb);
211-
212-
Assert.AreEqual(Sfi.Interceptor, options.SessionInterceptor, $"{sbType}: Initial value");
213-
var fsb = sb.Interceptor(interceptor);
214-
Assert.AreEqual(interceptor, options.SessionInterceptor, $"{sbType}: After call with an interceptor");
215-
Assert.AreEqual(sb, fsb, $"{sbType}: Unexpected fluent return after call with an interceptor");
216-
217-
if (sb is ISharedSessionBuilder ssb)
218-
{
219-
var fssb = ssb.Interceptor();
220-
Assert.AreEqual(EmptyInterceptor.Instance, options.SessionInterceptor, $"{sbType}: After call with shared interceptor");
221-
Assert.AreEqual(sb, fssb, $"{sbType}: Unexpected fluent return on shared");
222-
}
223-
224-
Assert.Throws<ArgumentNullException>(() => sb.Interceptor(null), $"{sbType}: After call with null");
225-
226-
fsb = sb.NoInterceptor();
227-
Assert.AreEqual(EmptyInterceptor.Instance, options.SessionInterceptor, $"{sbType}: After no call");
228-
Assert.AreEqual(sb, fsb, $"{sbType}: Unexpected fluent return after no call");
229-
return Task.CompletedTask;
230-
}
231-
catch (Exception ex)
232-
{
233-
return Task.FromException<object>(ex);
234-
}
235-
}
236-
237192
private void CanSet<T, V>(T sb, Func<V, T> setter, Func<V> getter, Func<ISharedSessionBuilder> shared, V initialValue,
238193
params V[] values) where T : ISessionBuilder<T>
239194
{

‎src/NHibernate.Test/Async/SystemTransactions/DistributedSystemTransactionFixture.cs

+3-10
Original file line numberDiff line numberDiff line change
@@ -690,16 +690,9 @@ public async Task EnforceConnectionUsageRulesOnTransactionCompletionAsync()
690690

691691
private Task DodgeTransactionCompletionDelayIfRequiredAsync(CancellationToken cancellationToken = default(CancellationToken))
692692
{
693-
try
694-
{
695-
if (Sfi.ConnectionProvider.Driver.HasDelayedDistributedTransactionCompletion)
696-
return Task.Delay(500, cancellationToken);
697-
return Task.CompletedTask;
698-
}
699-
catch (Exception ex)
700-
{
701-
return Task.FromException<object>(ex);
702-
}
693+
if (Sfi.ConnectionProvider.Driver.HasDelayedDistributedTransactionCompletion)
694+
return Task.Delay(500, cancellationToken);
695+
return Task.CompletedTask;
703696
}
704697

705698
private void DodgeTransactionCompletionDelayIfRequired()

‎src/NHibernate.Test/Async/TransactionTest/TransactionNotificationFixture.cs

+4-18
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,14 @@ public partial class Synchronization : ITransactionCompletionSynchronization
132132

133133
public Task ExecuteBeforeTransactionCompletionAsync(CancellationToken cancellationToken)
134134
{
135-
try
136-
{
137-
BeforeExecutions += 1;
138-
return Task.CompletedTask;
139-
}
140-
catch (Exception ex)
141-
{
142-
return Task.FromException<object>(ex);
143-
}
135+
BeforeExecutions += 1;
136+
return Task.CompletedTask;
144137
}
145138

146139
public Task ExecuteAfterTransactionCompletionAsync(bool success, CancellationToken cancellationToken)
147140
{
148-
try
149-
{
150-
AfterExecutions += 1;
151-
return Task.CompletedTask;
152-
}
153-
catch (Exception ex)
154-
{
155-
return Task.FromException<object>(ex);
156-
}
141+
AfterExecutions += 1;
142+
return Task.CompletedTask;
157143
}
158144
}
159145

‎src/NHibernate.sln.DotSettings

+7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXPLICIT_INTERNAL_MODIFIER/@EntryValue">True</s:Boolean>
88
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXPLICIT_PRIVATE_MODIFIER/@EntryValue">True</s:Boolean>
99
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
10+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
1011
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
12+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
1113
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
1214
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">True</s:Boolean>
1315
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
@@ -20,9 +22,14 @@
2022
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
2123
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
2224
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
25+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
26+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
27+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
2328
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
29+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
2430
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
2531
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
32+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EFormat_002ESettingsUpgrade_002EAlignmentTabFillStyleMigration/@EntryIndexedValue">True</s:Boolean>
2633
<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
2734
<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=0BE95D01E0F2244E97F5FEFAD1EB1A63/@KeyIndexDefined">True</s:Boolean>
2835
<s:String x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=0BE95D01E0F2244E97F5FEFAD1EB1A63/Comment/@EntryValue">NUnit Assert.NotNull</s:String>

‎src/NHibernate/Async/Action/CollectionAction.cs

+2-9
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,8 @@ public virtual Task ExecuteAfterTransactionCompletionAsync(bool success, Cancell
7474
{
7575
return Task.FromCanceled<object>(cancellationToken);
7676
}
77-
try
78-
{
79-
var ck = new CacheKey(key, persister.KeyType, persister.Role, Session.Factory);
80-
return persister.Cache.ReleaseAsync(ck, softLock, cancellationToken);
81-
}
82-
catch (Exception ex)
83-
{
84-
return Task.FromException<object>(ex);
85-
}
77+
var ck = new CacheKey(key, persister.KeyType, persister.Role, Session.Factory);
78+
return persister.Cache.ReleaseAsync(ck, softLock, cancellationToken);
8679
}
8780

8881
#endregion

‎src/NHibernate/Async/Action/EntityIdentityInsertAction.cs

+6-13
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,17 @@ protected override Task AfterTransactionCompletionProcessImplAsync(bool success,
121121
{
122122
return Task.FromCanceled<object>(cancellationToken);
123123
}
124-
try
125-
{
126-
//TODO Make 100% certain that this is called before any subsequent ScheduledUpdate.afterTransactionCompletion()!!
127-
//TODO from H3.2: reenable if we also fix the above todo
128-
/*EntityPersister persister = getEntityPersister();
124+
//TODO Make 100% certain that this is called before any subsequent ScheduledUpdate.afterTransactionCompletion()!!
125+
//TODO from H3.2: reenable if we also fix the above todo
126+
/*EntityPersister persister = getEntityPersister();
129127
if ( success && persister.hasCache() && !persister.isCacheInvalidationRequired() ) {
130128
persister.getCache().afterInsert( getGeneratedId(), cacheEntry );
131129
}*/
132-
if (success)
133-
{
134-
return PostCommitInsertAsync(cancellationToken);
135-
}
136-
return Task.CompletedTask;
137-
}
138-
catch (Exception ex)
130+
if (success)
139131
{
140-
return Task.FromException<object>(ex);
132+
return PostCommitInsertAsync(cancellationToken);
141133
}
134+
return Task.CompletedTask;
142135
}
143136
}
144137
}

‎src/NHibernate/Async/Collection/AbstractPersistentCollection.cs

+13-20
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,23 @@ public virtual Task ForceInitializationAsync(CancellationToken cancellationToken
7373
{
7474
return Task.FromCanceled<object>(cancellationToken);
7575
}
76-
try
76+
if (!initialized)
7777
{
78-
if (!initialized)
78+
if (initializing)
7979
{
80-
if (initializing)
81-
{
82-
return Task.FromException<object>(new AssertionFailure("force initialize loading collection"));
83-
}
84-
if (session == null)
85-
{
86-
return Task.FromException<object>(new HibernateException("collection is not associated with any session"));
87-
}
88-
if (!session.IsConnected)
89-
{
90-
return Task.FromException<object>(new HibernateException("disconnected session"));
91-
}
92-
return session.InitializeCollectionAsync(this, false, cancellationToken);
80+
return Task.FromException<object>(new AssertionFailure("force initialize loading collection"));
9381
}
94-
return Task.CompletedTask;
95-
}
96-
catch (Exception ex)
97-
{
98-
return Task.FromException<object>(ex);
82+
if (session == null)
83+
{
84+
return Task.FromException<object>(new HibernateException("collection is not associated with any session"));
85+
}
86+
if (!session.IsConnected)
87+
{
88+
return Task.FromException<object>(new HibernateException("disconnected session"));
89+
}
90+
return session.InitializeCollectionAsync(this, false, cancellationToken);
9991
}
92+
return Task.CompletedTask;
10093
}
10194

10295
public Task<ICollection> GetQueuedOrphansAsync(string entityName, CancellationToken cancellationToken)

‎src/NHibernate/Async/Engine/ActionQueue.cs

+3-10
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,11 @@ private Task PreInvalidateCachesAsync(CancellationToken cancellationToken)
4646
{
4747
return Task.FromCanceled<object>(cancellationToken);
4848
}
49-
try
50-
{
51-
if (session.Factory.Settings.IsQueryCacheEnabled)
52-
{
53-
return session.Factory.UpdateTimestampsCache.PreInvalidateAsync(executedSpaces, cancellationToken);
54-
}
55-
return Task.CompletedTask;
56-
}
57-
catch (Exception ex)
49+
if (session.Factory.Settings.IsQueryCacheEnabled)
5850
{
59-
return Task.FromException<object>(ex);
51+
return session.Factory.UpdateTimestampsCache.PreInvalidateAsync(executedSpaces, cancellationToken);
6052
}
53+
return Task.CompletedTask;
6154
}
6255

6356
public async Task ExecuteAsync(IExecutable executable, CancellationToken cancellationToken)

0 commit comments

Comments
 (0)