From f5b169078dc9b54603bbf8f0fba7d25f66756cd9 Mon Sep 17 00:00:00 2001
From: Tim M <49349513+TimothyMakkison@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:45:48 +0100
Subject: [PATCH] feat: remove `propertiesToAdd` (#1741)

---
 Refit/RequestBuilderImplementation.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Refit/RequestBuilderImplementation.cs b/Refit/RequestBuilderImplementation.cs
index ccdac3dc9..53e67fbe9 100644
--- a/Refit/RequestBuilderImplementation.cs
+++ b/Refit/RequestBuilderImplementation.cs
@@ -15,7 +15,7 @@ class RequestBuilderImplementation<TApi>(RefitSettings? refitSettings = null)
     partial class RequestBuilderImplementation : IRequestBuilder
     {
         static readonly QueryAttribute DefaultQueryAttribute = new ();
-        static readonly Uri BaseUri = new Uri("http://api");
+        static readonly Uri BaseUri = new ("http://api");
         readonly Dictionary<string, List<RestMethodInfoInternal>> interfaceHttpMethods;
         readonly ConcurrentDictionary<
             CloseGenericMethodKey,
@@ -641,7 +641,6 @@ bool paramsContainsCancellationToken
                     (basePath == "/" ? string.Empty : basePath) + restMethod.RelativePath;
                 var queryParamsToAdd = new List<KeyValuePair<string, string?>>();
                 var headersToAdd = new Dictionary<string, string?>(restMethod.Headers);
-                var propertiesToAdd = new Dictionary<string, object?>();
 
                 RestMethodParameterInfo? parameterInfo = null;
 
@@ -764,9 +763,8 @@ bool paramsContainsCancellationToken
                     }
 
                     //if property, add to populate into HttpRequestMessage.Properties
-                    if (restMethod.PropertyParameterMap.TryGetValue(i, out var propertyParameter))
+                    if (restMethod.PropertyParameterMap.ContainsKey(i))
                     {
-                        propertiesToAdd[propertyParameter] = param;
                         isParameterMappedToRequest = true;
                     }
 
@@ -797,7 +795,7 @@ bool paramsContainsCancellationToken
 
                 AddHeadersToRequest(headersToAdd, ret);
 
-                AddPropertiesToRequest(restMethod, ret, propertiesToAdd);
+                AddPropertiesToRequest(restMethod, ret, paramList);
 
                 // NB: The URI methods in .NET are dumb. Also, we do this
                 // UriBuilder business so that we preserve any hardcoded query
@@ -980,8 +978,7 @@ static void AddHeadersToRequest(Dictionary<string, string?> headersToAdd, HttpRe
             }
         }
 
-        void AddPropertiesToRequest(RestMethodInfoInternal restMethod, HttpRequestMessage ret,
-            Dictionary<string, object?> propertiesToAdd)
+        void AddPropertiesToRequest(RestMethodInfoInternal restMethod, HttpRequestMessage ret, object[] paramList)
         {
             // Add RefitSetting.HttpRequestMessageOptions to the HttpRequestMessage
             if (settings.HttpRequestMessageOptions != null)
@@ -996,16 +993,19 @@ void AddPropertiesToRequest(RestMethodInfoInternal restMethod, HttpRequestMessag
                 }
             }
 
-            foreach (var property in propertiesToAdd)
+            for (var i = 0; i < paramList.Length; i++)
             {
+                if (restMethod.PropertyParameterMap.TryGetValue(i, out var propertyKey))
+                {
 #if NET6_0_OR_GREATER
                     ret.Options.Set(
-                        new HttpRequestOptionsKey<object?>(property.Key),
-                        property.Value
+                        new HttpRequestOptionsKey<object?>(propertyKey),
+                        paramList[i]
                     );
 #else
-                ret.Properties[property.Key] = property.Value;
+                    ret.Properties[propertyKey] = paramList[i];
 #endif
+                }
             }
 
             // Always add the top-level type of the interface to the properties