Merge pull request #22 from Cabazure/request-base-address

Change the way request options can affect a request (breaking change)

Author: rickykaare

src/Cabazure.Client.Runtime/Builder/MessageRequestBuilder.cs

@@ -13,6 +13,7 @@ public class MessageRequestBuilder : IMessageRequestBuilder
         private readonly IClientSerializer serializer;
         private readonly string clientName;
         private string content = string.Empty;
+        private IRequestOptions? options;
 
         public MessageRequestBuilder(
             string template,
@@ -40,6 +41,11 @@ public HttpRequestMessage Build(HttpMethod method)
                 message.Headers.Add(header.Key, header.Value.ToArray());
             }
 
+            if (options is not null)
+            {
+                options.ConfigureHttpRequest(message);
+            }
+
             return message;
         }
 
@@ -56,14 +62,7 @@ public IMessageRequestBuilder WithHeader(string name, StringValues value)
         public IMessageRequestBuilder WithRequestOptions(
             IRequestOptions? options)
         {
-            if (options is { } o)
-            {
-                foreach (var header in o.GetHeaders())
-                {
-                    WithHeader(header.Key, header.Value);
-                }
-            }
-
+            this.options = options;
             return this;
         }
 
@@ -104,7 +103,7 @@ private Uri BuildRequestUri()
 
             if (queryMapper.Count != 0)
             {
-                urlBuilder.Append(template.Contains('?') ? '&': '?');
+                urlBuilder.Append(template.Contains('?') ? '&' : '?');
                 urlBuilder.Append(string.Join("&", queryMapper.Select(q => $"{q.Key}={Uri.EscapeDataString(q.Value)}")));
             }
 

src/Cabazure.Client.Runtime/ClientRequestOptions.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Primitives;
-
-namespace Cabazure.Client;
+namespace Cabazure.Client;
 
 /// <summary>
 /// Options for a client request.
@@ -19,20 +17,16 @@ public class ClientRequestOptions : IRequestOptions
     /// </summary>
     public TimeSpan? Timeout { get; set; }
 
-    IDictionary<string, StringValues> IRequestOptions.GetHeaders()
+    void IRequestOptions.ConfigureHttpRequest(HttpRequestMessage request)
     {
-        var headers = new Dictionary<string, StringValues>();
-        AppendHeaders(headers);
-
-        return headers;
+        ConfigureHttpRequest(request);
     }
 
-    protected virtual void AppendHeaders(
-        IDictionary<string, StringValues> headers)
-    { 
+    protected virtual void ConfigureHttpRequest(HttpRequestMessage request)
+    {
         if (CorrelationId is { } id)
         {
-            headers[HeaderCorrelationId] = id;
+            request.Headers.TryAddWithoutValidation(HeaderCorrelationId, id);
         }
     }
 }

src/Cabazure.Client.Runtime/IRequestOptions.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Primitives;
-
-namespace Cabazure.Client;
+namespace Cabazure.Client;
 
 public interface IRequestOptions
 {
@@ -10,8 +8,8 @@ public interface IRequestOptions
     TimeSpan? Timeout { get; set; }
 
     /// <summary>
-    /// Gets the headers to be sent with the request.
+    /// Allows the options implementation to configure the HTTP request message.
     /// </summary>
-    /// <returns>Dictionary of header names and header values.</returns>
-    IDictionary<string, StringValues> GetHeaders();
+    /// <param name="request">The http request being sent.</param>
+    void ConfigureHttpRequest(HttpRequestMessage request);
 }

src/Cabazure.Client.Runtime/PagedRequestOptions.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using Microsoft.Extensions.Primitives;
 
 namespace Cabazure.Client;
 
@@ -21,18 +20,18 @@ public class PagedRequestOptions : ClientRequestOptions
     /// </summary>
     public string? ContinuationToken { get; set; }
 
-    protected override void AppendHeaders(IDictionary<string, StringValues> headers)
+    protected override void ConfigureHttpRequest(HttpRequestMessage request)
     {
-        base.AppendHeaders(headers);
-        
+        base.ConfigureHttpRequest(request);
+
         if (MaxItemCount is { } maxItemCount)
         {
-            headers[HeaderMaxItemCount] = maxItemCount.ToString(CultureInfo.InvariantCulture);
+            request.Headers.TryAddWithoutValidation(HeaderMaxItemCount, maxItemCount.ToString(CultureInfo.InvariantCulture));
         }
 
         if (ContinuationToken is { } continuationToken)
         {
-            headers[HeaderContinuation] = continuationToken;
+            request.Headers.TryAddWithoutValidation(HeaderContinuation, continuationToken);
         }
     }
 }