Rename requestMessage parameter to baseRequestMessage

nozzlegear · May 16, 2024 · 212beda · 212beda
1 parent 922a9b7
commit 212beda
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/ShopifySharp.Extensions.DependencyInjection.Tests/TestClasses.cs b/ShopifySharp.Extensions.DependencyInjection.Tests/TestClasses.cs
@@ -8,7 +8,7 @@ public class TestException : Exception;
 public class TestRequestExecutionPolicy : IRequestExecutionPolicy
 {
     public Task<RequestResult<T>> Run<T>(
-        CloneableRequestMessage requestMessage,
+        CloneableRequestMessage baseRequestMessage,
         ExecuteRequestAsync<T> executeRequestAsync,
         CancellationToken cancellationToken,
         int? graphqlQueryCost = null

diff --git a/ShopifySharp/Infrastructure/Policies/Default/DefaultRequestExecutionPolicy.cs b/ShopifySharp/Infrastructure/Policies/Default/DefaultRequestExecutionPolicy.cs
@@ -7,9 +7,9 @@ namespace ShopifySharp;
 
 public class DefaultRequestExecutionPolicy : IRequestExecutionPolicy
 {
-    public async Task<RequestResult<T>> Run<T>(CloneableRequestMessage request, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null)
+    public async Task<RequestResult<T>> Run<T>(CloneableRequestMessage baseRequestMessage, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null)
     {
-        var fullResult = await executeRequestAsync(request);
+        var fullResult = await executeRequestAsync(baseRequestMessage);
 
         return fullResult;
     }

diff --git a/ShopifySharp/Infrastructure/Policies/IRequestExecutionPolicy.cs b/ShopifySharp/Infrastructure/Policies/IRequestExecutionPolicy.cs
@@ -13,9 +13,9 @@ namespace ShopifySharp;
 /// </summary>
 public interface IRequestExecutionPolicy
 {
-    /// <param name="requestMessage">The base request that was built by a service to execute.</param>
+    /// <param name="baseRequestMessage">The base request that was built by a service to execute.</param>
     /// <param name="executeRequestAsync">A delegate that executes the request you pass to it.</param>
     /// <param name="cancellationToken">Cancellation token</param>
     /// <param name="graphqlQueryCost">Optional expected Graphql query cost (as seen in GraphQL response at extensions.cost.requestedQueryCost</param>
-    Task<RequestResult<T>> Run<T>(CloneableRequestMessage requestMessage, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null);
+    Task<RequestResult<T>> Run<T>(CloneableRequestMessage baseRequestMessage, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null);
 }
diff --git a/ShopifySharp/Infrastructure/Policies/LeakyBucket/LeakyBucketExecutionPolicy.cs b/ShopifySharp/Infrastructure/Policies/LeakyBucket/LeakyBucketExecutionPolicy.cs
@@ -74,14 +74,14 @@ public LeakyBucketExecutionPolicy(int maxRetriesPerNonLimitedRequest, bool retry
         _getRequestContext = getRequestContext ?? (() => RequestContext.Foreground);
     }
 
-    public async Task<RequestResult<T>> Run<T>(CloneableRequestMessage baseRequest, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null)
+    public async Task<RequestResult<T>> Run<T>(CloneableRequestMessage baseRequestMessage, ExecuteRequestAsync<T> executeRequestAsync, CancellationToken cancellationToken, int? graphqlQueryCost = null)
     {
-        var accessToken = GetAccessToken(baseRequest);
+        var accessToken = GetAccessToken(baseRequestMessage);
         var bucket = accessToken == null ? null : _shopAccessTokenToLeakyBucket.GetOrAdd(accessToken, _ => new MultiShopifyApiBucket(_getRequestContext));
         var apiType = ApiType.RestAdmin;
 
-        if (baseRequest?.RequestUri?.AbsolutePath.EndsWith("graphql.json") == true)
-            apiType = baseRequest.RequestUri.Host == "partners.shopify.com" ? ApiType.GraphQlPartner : ApiType.GraphQlAdmin;
+        if (baseRequestMessage?.RequestUri?.AbsolutePath.EndsWith("graphql.json") == true)
+            apiType = baseRequestMessage.RequestUri.Host == "partners.shopify.com" ? ApiType.GraphQlPartner : ApiType.GraphQlAdmin;
 
         return apiType switch
         {
@@ -91,17 +91,17 @@ public async Task<RequestResult<T>> Run<T>(CloneableRequestMessage baseRequest,
                 // If the user didn't pass a request query cost, we assume a cost of 50
                 graphqlQueryCost ?? 50,
                 bucket,
-                baseRequest),
+                baseRequestMessage),
             ApiType.RestAdmin => await ExecuteRestAdminRequest(
                 executeRequestAsync,
                 cancellationToken,
                 bucket,
-                baseRequest),
+                baseRequestMessage),
             ApiType.GraphQlPartner => await ExecuteGraphPartnerRequest(
                 executeRequestAsync,
                 cancellationToken,
                 bucket,
-                baseRequest),
+                baseRequestMessage),
             _ => throw new ArgumentOutOfRangeException()
         };
     }

diff --git a/ShopifySharp/Infrastructure/Policies/Retry/RetryExecutionPolicy.cs b/ShopifySharp/Infrastructure/Policies/Retry/RetryExecutionPolicy.cs
@@ -42,7 +42,7 @@ public RetryExecutionPolicy(bool retryOnlyIfLeakyBucketFull = true)
     }
 
     public async Task<RequestResult<T>> Run<T>(
-        CloneableRequestMessage baseRequest,
+        CloneableRequestMessage baseRequestMessage,
         ExecuteRequestAsync<T> executeRequestAsync,
         CancellationToken cancellationToken,
         int? graphqlQueryCost = null
@@ -53,7 +53,7 @@ public RetryExecutionPolicy(bool retryOnlyIfLeakyBucketFull = true)
 
         while (true)
         {
-            using var request = await baseRequest.CloneAsync();
+            using var request = await baseRequestMessage.CloneAsync();
 
             try
             {