Fix SA1501/IDE0055 (#1957)

* Fix SA1501/IDE0055 * Improve unit test coverage
App-vNext · Feb 16, 2024 · 5fe3377 · 5fe3377
1 parent caa44e3
commit 5fe3377
Show file tree

Hide file tree

Showing 76 changed files with 1,405 additions and 534 deletions.
diff --git a/src/Polly/AsyncPolicy.ContextAndKeys.cs b/src/Polly/AsyncPolicy.ContextAndKeys.cs
@@ -9,7 +9,8 @@ public abstract partial class AsyncPolicy
     /// <param name="policyKey">The unique, used-definable key to assign to this <see cref="AsyncPolicy"/> instance.</param>
     public AsyncPolicy WithPolicyKey(string policyKey)
     {
-        if (policyKeyInternal != null) throw PolicyKeyMustBeImmutableException(nameof(policyKey));
+        if (policyKeyInternal != null)
+            throw PolicyKeyMustBeImmutableException(nameof(policyKey));
 
         policyKeyInternal = policyKey;
         return this;
@@ -22,7 +23,8 @@ public AsyncPolicy WithPolicyKey(string policyKey)
     /// <param name="policyKey">The unique, used-definable key to assign to this <see cref="IAsyncPolicy"/> instance.</param>
     IAsyncPolicy IAsyncPolicy.WithPolicyKey(string policyKey)
     {
-        if (policyKeyInternal != null) throw PolicyKeyMustBeImmutableException(nameof(policyKey));
+        if (policyKeyInternal != null)
+            throw PolicyKeyMustBeImmutableException(nameof(policyKey));
 
         policyKeyInternal = policyKey;
         return this;
@@ -38,7 +40,8 @@ public abstract partial class AsyncPolicy<TResult>
     /// <param name="policyKey">The unique, used-definable key to assign to this <see cref="AsyncPolicy{TResult}"/> instance.</param>
     public AsyncPolicy<TResult> WithPolicyKey(string policyKey)
     {
-        if (policyKeyInternal != null) throw PolicyKeyMustBeImmutableException(nameof(policyKey));
+        if (policyKeyInternal != null)
+            throw PolicyKeyMustBeImmutableException(nameof(policyKey));
 
         policyKeyInternal = policyKey;
         return this;
@@ -51,7 +54,8 @@ public AsyncPolicy<TResult> WithPolicyKey(string policyKey)
     /// <param name="policyKey">The unique, used-definable key to assign to this <see cref="IAsyncPolicy{TResult}"/> instance.</param>
     IAsyncPolicy<TResult> IAsyncPolicy<TResult>.WithPolicyKey(string policyKey)
     {
-        if (policyKeyInternal != null) throw PolicyKeyMustBeImmutableException(nameof(policyKey));
+        if (policyKeyInternal != null)
+            throw PolicyKeyMustBeImmutableException(nameof(policyKey));
 
         policyKeyInternal = policyKey;
         return this;

diff --git a/src/Polly/AsyncPolicy.ExecuteOverloads.cs b/src/Polly/AsyncPolicy.ExecuteOverloads.cs
@@ -93,7 +93,8 @@ public Task ExecuteAsync(Func<Context, CancellationToken, Task> action, IDiction
     [DebuggerStepThrough]
     public async Task ExecuteAsync(Func<Context, CancellationToken, Task> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         SetPolicyContext(context, out string priorPolicyWrapKey, out string priorPolicyKey);
 
@@ -213,7 +214,8 @@ public Task<TResult> ExecuteAsync<TResult>(Func<Context, CancellationToken, Task
     [DebuggerStepThrough]
     public async Task<TResult> ExecuteAsync<TResult>(Func<Context, CancellationToken, Task<TResult>> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         SetPolicyContext(context, out string priorPolicyWrapKey, out string priorPolicyKey);
 
@@ -329,7 +331,8 @@ public Task<PolicyResult> ExecuteAndCaptureAsync(Func<Context, CancellationToken
     [DebuggerStepThrough]
     public async Task<PolicyResult> ExecuteAndCaptureAsync(Func<Context, CancellationToken, Task> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         try
         {
@@ -453,7 +456,8 @@ public Task<PolicyResult<TResult>> ExecuteAndCaptureAsync<TResult>(Func<Context,
     [DebuggerStepThrough]
     public async Task<PolicyResult<TResult>> ExecuteAndCaptureAsync<TResult>(Func<Context, CancellationToken, Task<TResult>> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         try
         {

diff --git a/src/Polly/AsyncPolicy.TResult.ExecuteOverloads.cs b/src/Polly/AsyncPolicy.TResult.ExecuteOverloads.cs
@@ -102,7 +102,8 @@ public Task<TResult> ExecuteAsync(Func<Context, CancellationToken, Task<TResult>
     [DebuggerStepThrough]
     public async Task<TResult> ExecuteAsync(Func<Context, CancellationToken, Task<TResult>> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         SetPolicyContext(context, out string priorPolicyWrapKey, out string priorPolicyKey);
 
@@ -220,7 +221,8 @@ public Task<PolicyResult<TResult>> ExecuteAndCaptureAsync(Func<Context, Cancella
     [DebuggerStepThrough]
     public async Task<PolicyResult<TResult>> ExecuteAndCaptureAsync(Func<Context, CancellationToken, Task<TResult>> action, Context context, CancellationToken cancellationToken, bool continueOnCapturedContext)
     {
-        if (context == null) throw new ArgumentNullException(nameof(context));
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
         try
         {

diff --git a/src/Polly/Bulkhead/AsyncBulkheadEngine.cs b/src/Polly/Bulkhead/AsyncBulkheadEngine.cs
@@ -3,7 +3,7 @@ namespace Polly.Bulkhead;
 
 internal static class AsyncBulkheadEngine
 {
-   internal static async Task<TResult> ImplementationAsync<TResult>(
+    internal static async Task<TResult> ImplementationAsync<TResult>(
         Func<Context, CancellationToken, Task<TResult>> action,
         Context context,
         Func<Context, Task> onBulkheadRejectedAsync,

diff --git a/src/Polly/Bulkhead/AsyncBulkheadSyntax.cs b/src/Polly/Bulkhead/AsyncBulkheadSyntax.cs
@@ -59,9 +59,12 @@ public static AsyncBulkheadPolicy BulkheadAsync(
         int maxQueuingActions,
         Func<Context, Task> onBulkheadRejectedAsync)
     {
-        if (maxParallelization <= 0) throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
-        if (maxQueuingActions < 0) throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
-        if (onBulkheadRejectedAsync == null) throw new ArgumentNullException(nameof(onBulkheadRejectedAsync));
+        if (maxParallelization <= 0)
+            throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
+        if (maxQueuingActions < 0)
+            throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
+        if (onBulkheadRejectedAsync == null)
+            throw new ArgumentNullException(nameof(onBulkheadRejectedAsync));
 
         return new AsyncBulkheadPolicy(
             maxParallelization,

diff --git a/src/Polly/Bulkhead/AsyncBulkheadTResultSyntax.cs b/src/Polly/Bulkhead/AsyncBulkheadTResultSyntax.cs
@@ -56,9 +56,12 @@ public static AsyncBulkheadPolicy<TResult> BulkheadAsync<TResult>(int maxParalle
     /// <exception cref="ArgumentNullException">onBulkheadRejectedAsync</exception>
     public static AsyncBulkheadPolicy<TResult> BulkheadAsync<TResult>(int maxParallelization, int maxQueuingActions, Func<Context, Task> onBulkheadRejectedAsync)
     {
-        if (maxParallelization <= 0) throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
-        if (maxQueuingActions < 0) throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
-        if (onBulkheadRejectedAsync == null) throw new ArgumentNullException(nameof(onBulkheadRejectedAsync));
+        if (maxParallelization <= 0)
+            throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
+        if (maxQueuingActions < 0)
+            throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
+        if (onBulkheadRejectedAsync == null)
+            throw new ArgumentNullException(nameof(onBulkheadRejectedAsync));
 
         return new AsyncBulkheadPolicy<TResult>(
             maxParallelization,

diff --git a/src/Polly/Bulkhead/BulkheadSyntax.cs b/src/Polly/Bulkhead/BulkheadSyntax.cs
@@ -56,9 +56,12 @@ public static BulkheadPolicy Bulkhead(int maxParallelization, int maxQueuingActi
     /// <exception cref="ArgumentNullException">onBulkheadRejected</exception>
     public static BulkheadPolicy Bulkhead(int maxParallelization, int maxQueuingActions, Action<Context> onBulkheadRejected)
     {
-        if (maxParallelization <= 0) throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
-        if (maxQueuingActions < 0) throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
-        if (onBulkheadRejected == null) throw new ArgumentNullException(nameof(onBulkheadRejected));
+        if (maxParallelization <= 0)
+            throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
+        if (maxQueuingActions < 0)
+            throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
+        if (onBulkheadRejected == null)
+            throw new ArgumentNullException(nameof(onBulkheadRejected));
 
         return new BulkheadPolicy(
             maxParallelization,

diff --git a/src/Polly/Bulkhead/BulkheadTResultSyntax.cs b/src/Polly/Bulkhead/BulkheadTResultSyntax.cs
@@ -56,9 +56,12 @@ public static BulkheadPolicy<TResult> Bulkhead<TResult>(int maxParallelization,
     /// <exception cref="ArgumentNullException">onBulkheadRejected</exception>
     public static BulkheadPolicy<TResult> Bulkhead<TResult>(int maxParallelization, int maxQueuingActions, Action<Context> onBulkheadRejected)
     {
-        if (maxParallelization <= 0) throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
-        if (maxQueuingActions < 0) throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
-        if (onBulkheadRejected == null) throw new ArgumentNullException(nameof(onBulkheadRejected));
+        if (maxParallelization <= 0)
+            throw new ArgumentOutOfRangeException(nameof(maxParallelization), "Value must be greater than zero.");
+        if (maxQueuingActions < 0)
+            throw new ArgumentOutOfRangeException(nameof(maxQueuingActions), "Value must be greater than or equal to zero.");
+        if (onBulkheadRejected == null)
+            throw new ArgumentNullException(nameof(onBulkheadRejected));
 
         return new BulkheadPolicy<TResult>(
             maxParallelization,

diff --git a/src/Polly/Caching/AsyncCachePolicy.cs b/src/Polly/Caching/AsyncCachePolicy.cs
@@ -42,9 +42,7 @@ protected override Task ImplementationAsync(
         Func<Context, CancellationToken, Task> action,
         Context context,
         CancellationToken cancellationToken,
-        bool continueOnCapturedContext) =>
-        // Pass-through/NOOP policy action, for void-returning executions through the cache policy.
-        action(context, cancellationToken);
+        bool continueOnCapturedContext) => action(context, cancellationToken); // Pass-through/NOOP policy action, for void-returning executions through the cache policy.
 
     /// <inheritdoc/>
     [DebuggerStepThrough]

diff --git a/src/Polly/Caching/AsyncCacheSyntax.cs b/src/Polly/Caching/AsyncCacheSyntax.cs
@@ -64,9 +64,12 @@ public static AsyncCachePolicy CacheAsync(IAsyncCacheProvider cacheProvider, Tim
     /// <exception cref="ArgumentNullException">cacheKeyStrategy</exception>
     public static AsyncCachePolicy CacheAsync(IAsyncCacheProvider cacheProvider, ITtlStrategy ttlStrategy, ICacheKeyStrategy cacheKeyStrategy, Action<Context, string, Exception>? onCacheError = null)
     {
-        if (cacheProvider == null) throw new ArgumentNullException(nameof(cacheProvider));
-        if (ttlStrategy == null) throw new ArgumentNullException(nameof(ttlStrategy));
-        if (cacheKeyStrategy == null) throw new ArgumentNullException(nameof(cacheKeyStrategy));
+        if (cacheProvider == null)
+            throw new ArgumentNullException(nameof(cacheProvider));
+        if (ttlStrategy == null)
+            throw new ArgumentNullException(nameof(ttlStrategy));
+        if (cacheKeyStrategy == null)
+            throw new ArgumentNullException(nameof(cacheKeyStrategy));
 
         Action<Context, string> emptyDelegate = (_, _) => { };
 
@@ -105,9 +108,12 @@ public static AsyncCachePolicy CacheAsync(IAsyncCacheProvider cacheProvider, Tim
     /// <exception cref="ArgumentNullException">cacheKeyStrategy</exception>
     public static AsyncCachePolicy CacheAsync(IAsyncCacheProvider cacheProvider, ITtlStrategy ttlStrategy, Func<Context, string> cacheKeyStrategy, Action<Context, string, Exception>? onCacheError = null)
     {
-        if (cacheProvider == null) throw new ArgumentNullException(nameof(cacheProvider));
-        if (ttlStrategy == null) throw new ArgumentNullException(nameof(ttlStrategy));
-        if (cacheKeyStrategy == null) throw new ArgumentNullException(nameof(cacheKeyStrategy));
+        if (cacheProvider == null)
+            throw new ArgumentNullException(nameof(cacheProvider));
+        if (ttlStrategy == null)
+            throw new ArgumentNullException(nameof(ttlStrategy));
+        if (cacheKeyStrategy == null)
+            throw new ArgumentNullException(nameof(cacheKeyStrategy));
 
         Action<Context, string> emptyDelegate = (_, _) => { };
 
@@ -296,13 +302,19 @@ public static AsyncCachePolicy CacheAsync(
         Action<Context, string, Exception>? onCacheGetError,
         Action<Context, string, Exception>? onCachePutError)
     {
-        if (cacheProvider == null) throw new ArgumentNullException(nameof(cacheProvider));
-        if (ttlStrategy == null) throw new ArgumentNullException(nameof(ttlStrategy));
-        if (cacheKeyStrategy == null) throw new ArgumentNullException(nameof(cacheKeyStrategy));
+        if (cacheProvider == null)
+            throw new ArgumentNullException(nameof(cacheProvider));
+        if (ttlStrategy == null)
+            throw new ArgumentNullException(nameof(ttlStrategy));
+        if (cacheKeyStrategy == null)
+            throw new ArgumentNullException(nameof(cacheKeyStrategy));
 
-        if (onCacheGet == null) throw new ArgumentNullException(nameof(onCacheGet));
-        if (onCacheMiss == null) throw new ArgumentNullException(nameof(onCacheMiss));
-        if (onCachePut == null) throw new ArgumentNullException(nameof(onCachePut));
+        if (onCacheGet == null)
+            throw new ArgumentNullException(nameof(onCacheGet));
+        if (onCacheMiss == null)
+            throw new ArgumentNullException(nameof(onCacheMiss));
+        if (onCachePut == null)
+            throw new ArgumentNullException(nameof(onCachePut));
 
         return new AsyncCachePolicy(cacheProvider, ttlStrategy, cacheKeyStrategy, onCacheGet, onCacheMiss, onCachePut, onCacheGetError, onCachePutError);
     }