Skip to content

Commit 32d0173

Browse files
committed
Cleanup: used assertion methods
1 parent cf5da2b commit 32d0173

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

Main/src/Threading/AsyncOperationHelper.cs

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public static class AsyncOperationHelper
3131
/// </param>
3232
public static void Post([NotNull] this AsyncOperation asyncOp, [NotNull, InstantHandle] Action runner)
3333
{
34-
if (asyncOp == null) throw new ArgumentNullException(nameof(asyncOp));
35-
if (runner == null) throw new ArgumentNullException(nameof(runner));
34+
Code.NotNull(asyncOp, nameof(asyncOp));
35+
Code.NotNull(runner, nameof(runner));
3636
asyncOp.Post(state => runner(), null);
3737
}
3838

@@ -41,12 +41,10 @@ public static void Post([NotNull] this AsyncOperation asyncOp, [NotNull, Instant
4141
/// </summary>
4242
/// <param name="asyncOp"></param>
4343
/// <param name="runner">A <see cref="Action"/> that wraps the delegate to be called when the operation ends.</param>
44-
public static void PostOperationCompleted(
45-
[NotNull] this AsyncOperation asyncOp,
46-
[NotNull, InstantHandle] Action runner)
44+
public static void PostOperationCompleted([NotNull] this AsyncOperation asyncOp, [NotNull, InstantHandle] Action runner)
4745
{
48-
if (asyncOp == null) throw new ArgumentNullException(nameof(asyncOp));
49-
if (runner == null) throw new ArgumentNullException(nameof(runner));
46+
Code.NotNull(asyncOp, nameof(asyncOp));
47+
Code.NotNull(runner, nameof(runner));
5048
asyncOp.PostOperationCompleted(state => runner(), null);
5149
}
5250

@@ -58,7 +56,7 @@ public static void PostOperationCompleted(
5856
/// <param name="runner">
5957
/// A <see cref="Action"/> that wraps the delegate to be called when the operation ends.
6058
/// </param>
61-
public static void Send([NotNull] this AsyncOperation asyncOp, [NotNull] Action runner)
59+
public static void Send([NotNull] this AsyncOperation asyncOp, [NotNull, InstantHandle] Action runner)
6260
{
6361
if (asyncOp == null) throw new ArgumentNullException(nameof(asyncOp));
6462
if (runner == null) throw new ArgumentNullException(nameof(runner));
@@ -75,10 +73,11 @@ public static void Send([NotNull] this AsyncOperation asyncOp, [NotNull] Action
7573
/// A <see cref="Func{TResult}"/> that wraps the delegate to be called when the operation ends.
7674
/// </param>
7775
/// <returns>Result of <paramref name="runner"/> execution.</returns>
78-
public static T Send<T>([NotNull] this AsyncOperation asyncOp, [NotNull] Func<T> runner)
76+
public static T Send<T>([NotNull] this AsyncOperation asyncOp, [NotNull, InstantHandle] Func<T> runner)
7977
{
80-
if (asyncOp == null) throw new ArgumentNullException(nameof(asyncOp));
81-
if (runner == null) throw new ArgumentNullException(nameof(runner));
78+
Code.NotNull(asyncOp, nameof(asyncOp));
79+
Code.NotNull(runner, nameof(runner));
80+
8281
var result = default(T);
8382
asyncOp.SynchronizationContext.Send(state => result = runner(), null);
8483
return result;
@@ -87,11 +86,10 @@ public static T Send<T>([NotNull] this AsyncOperation asyncOp, [NotNull] Func<T>
8786
/// <summary>
8887
/// Gets thread from pool and run <paramref name="runner"/> inside it.
8988
/// </summary>
90-
/// <param name="runner">Action to run inside created thread</param>
91-
public static void RunAsync([NotNull] Action<AsyncOperation> runner)
89+
/// <param name="runner">Action to run inside created thread.</param>
90+
public static void RunAsync([NotNull, InstantHandle] Action<AsyncOperation> runner)
9291
{
93-
if (runner == null)
94-
throw new ArgumentNullException(nameof(runner));
92+
Code.NotNull(runner, nameof(runner));
9593

9694
var asyncOp = CreateOperation();
9795
ThreadPool.QueueUserWorkItem(state => runner(asyncOp));
@@ -100,18 +98,16 @@ public static void RunAsync([NotNull] Action<AsyncOperation> runner)
10098
/// <summary>
10199
/// Gets thread from pool and run <paramref name="runner"/> inside it.
102100
/// </summary>
103-
/// <param name="runner">Action to run inside created thread</param>
101+
/// <param name="runner">Action to run inside created thread.</param>
104102
/// <param name="completeHandler">
105103
/// Action called after <paramref name="runner"/> complete execution. Synchronized with method calling thread.
106104
/// </param>
107105
public static void RunAsync(
108-
Action<AsyncOperation> runner,
109-
Action completeHandler)
106+
[NotNull, InstantHandle] Action<AsyncOperation> runner,
107+
[NotNull, InstantHandle] Action completeHandler)
110108
{
111-
if (runner == null)
112-
throw new ArgumentNullException(nameof(runner));
113-
if (completeHandler == null)
114-
throw new ArgumentNullException(nameof(completeHandler));
109+
Code.NotNull(runner, nameof(runner));
110+
Code.NotNull(completeHandler, nameof(completeHandler));
115111

116112
var asyncOp = CreateOperation();
117113
ThreadPool.QueueUserWorkItem(

Main/src/Threading/ConcurrentLazyDictionary.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ public class ConcurrentLazyDictionary<TKey, TValue> : ILazyDictionary<TKey, TVal
2727
/// </summary>
2828
/// <param name="valueFactory">Function to create value on demand.</param>
2929
/// <param name="comparer">Key comparer.</param>
30-
public ConcurrentLazyDictionary([NotNull] Func<TKey, TValue> valueFactory, IEqualityComparer<TKey> comparer)
30+
public ConcurrentLazyDictionary([NotNull] Func<TKey, TValue> valueFactory, [NotNull] IEqualityComparer<TKey> comparer)
3131
{
32-
if (valueFactory == null) throw new ArgumentNullException(nameof(valueFactory));
32+
Code.NotNull(valueFactory, nameof(valueFactory));
33+
3334
_valueFactory = valueFactory;
3435
_comparer = comparer;
3536
_map = new ConcurrentDictionary<TKey, TValue>(comparer);

Main/src/Threading/ExecSyncConcurrentLazyDictionary.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ public class ExecSyncConcurrentLazyDictionary<TKey, TValue> : ILazyDictionary<TK
2929
/// </summary>
3030
/// <param name="valueFactory">Function to create value on demand.</param>
3131
/// <param name="comparer">Key comparer.</param>
32-
public ExecSyncConcurrentLazyDictionary([NotNull] Func<TKey, TValue> valueFactory, IEqualityComparer<TKey> comparer)
32+
public ExecSyncConcurrentLazyDictionary(
33+
[NotNull] Func<TKey, TValue> valueFactory,
34+
[NotNull] IEqualityComparer<TKey> comparer)
3335
{
34-
if (valueFactory == null) throw new ArgumentNullException(nameof(valueFactory));
36+
Code.NotNull(valueFactory, nameof(valueFactory));
37+
3538
_valueFactory = valueFactory;
3639
_comparer = comparer;
3740
_map = new ConcurrentDictionary<TKey, Lazy<TValue>>(comparer);

Main/src/Threading/ParallelExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public static void RunInParallel<TSource,TTarget>(
3030
[NotNull, InstantHandle] Action<TTarget> consumerAction,
3131
string processName = "ParallelProcess")
3232
{
33-
if (source == null) throw new ArgumentNullException(nameof(source));
34-
if (providerFunc == null) throw new ArgumentNullException(nameof(providerFunc));
35-
if (consumerAction == null) throw new ArgumentNullException(nameof(consumerAction));
33+
Code.NotNull(source, nameof(source));
34+
Code.NotNull(providerFunc, nameof(providerFunc));
35+
Code.NotNull(consumerAction, nameof(consumerAction));
3636

3737
using (var providerQueue = new ParallelQueue(providerCount, processName + "_provider_"))
3838
using (var consumerQueue = new ParallelQueue(consumerCount, processName + "_consumer_"))

0 commit comments

Comments
 (0)