Optimize Request.SetHeader

sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj

@@ -14,9 +14,10 @@
   </ItemGroup>
   <!-- Import Azure.Core shared source -->
   <ItemGroup>
-    <Compile Include="$(AzureCoreSharedSources)EventSourceEventFormatting.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
-    <Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
-    <Compile Include="$(AzureCoreSharedSources)ConnectionString.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
-    <Compile Include="$(AzureCoreSharedSources)Argument.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
+    <Compile Include="$(AzureCoreSharedSources)ConnectionString.cs" LinkBase="Shared" />
+    <Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared" />
+    <Compile Include="$(AzureCoreSharedSources)DictionaryHeaders.cs" LinkBase="Shared" />
+    <Compile Include="$(AzureCoreSharedSources)EventSourceEventFormatting.cs" LinkBase="Shared" />
   </ItemGroup>
 </Project>

sdk/core/Azure.Core.TestFramework/src/MockRequest.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Azure.Core.TestFramework
 {
@@ -14,8 +13,7 @@ public MockRequest()
             ClientRequestId = Guid.NewGuid().ToString();
         }
 
-        private readonly Dictionary<string, List<string>> _headers = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
-
+        private readonly DictionaryHeaders _headers = new();
         public bool IsDisposed { get; private set; }
 
         public override RequestContent Content
@@ -27,51 +25,19 @@ public override RequestContent Content
             }
         }
 
-        protected override void AddHeader(string name, string value)
-        {
-            if (!_headers.TryGetValue(name, out List<string> values))
-            {
-                _headers[name] = values = new List<string>();
-            }
+        protected override void SetHeader(string name, string value) => _headers.SetHeader(name, value);
 
-            values.Add(value);
-        }
+        protected override void AddHeader(string name, string value) => _headers.AddHeader(name, value);
 
-        protected override bool TryGetHeader(string name, out string value)
-        {
-            if (_headers.TryGetValue(name, out List<string> values))
-            {
-                value = JoinHeaderValue(values);
-                return true;
-            }
+        protected override bool TryGetHeader(string name, out string value) => _headers.TryGetHeader(name, out value);
 
-            value = null;
-            return false;
-        }
+        protected override bool TryGetHeaderValues(string name, out IEnumerable<string> values) => _headers.TryGetHeaderValues(name, out values);
 
-        protected override bool TryGetHeaderValues(string name, out IEnumerable<string> values)
-        {
-            var result = _headers.TryGetValue(name, out List<string> valuesList);
-            values = valuesList;
-            return result;
-        }
+        protected override bool ContainsHeader(string name) => _headers.TryGetHeaderValues(name, out _);
 
-        protected override bool ContainsHeader(string name)
-        {
-            return TryGetHeaderValues(name, out _);
-        }
+        protected override bool RemoveHeader(string name) => _headers.RemoveHeader(name);
 
-        protected override bool RemoveHeader(string name)
-        {
-            return _headers.Remove(name);
-        }
-
-        protected override IEnumerable<HttpHeader> EnumerateHeaders() => _headers.Select(h => new HttpHeader(h.Key, JoinHeaderValue(h.Value)));
-
-        private static string JoinHeaderValue(IEnumerable<string> values)
-        {
-            return string.Join(",", values);
-        }
+        protected override IEnumerable<HttpHeader> EnumerateHeaders() => _headers.EnumerateHeaders();
 
         public override string ClientRequestId { get; set; }
 

sdk/core/Azure.Core/src/Azure.Core.csproj

@@ -33,14 +33,15 @@
     <Compile Include="Shared\AzureKeyCredentialPolicy.cs" />
     <Compile Include="Shared\AzureSasCredentialSynchronousPolicy.cs" />
     <Compile Include="Shared\Base64Url.cs" />
+    <Compile Include="Shared\ClientDiagnostics.cs" />
+    <Compile Include="Shared\ContentTypeUtilities.cs" />
+    <Compile Include="Shared\DiagnosticScope.cs" />
+    <Compile Include="Shared\DiagnosticScopeFactory.cs" />
+    <Compile Include="Shared\DictionaryHeaders.cs" />
     <Compile Include="Shared\EventSourceEventFormatting.cs" />
     <Compile Include="Shared\HashCodeBuilder.cs" />
-    <Compile Include="Shared\ClientDiagnostics.cs" />
     <Compile Include="Shared\HttpMessageSanitizer.cs" />
     <Compile Include="Shared\NullableAttributes.cs" />
-    <Compile Include="Shared\ContentTypeUtilities.cs" />
-    <Compile Include="Shared\DiagnosticScopeFactory.cs" />
-    <Compile Include="Shared\DiagnosticScope.cs" />
     <Compile Include="Shared\TaskExtensions.cs" />
   </ItemGroup>
 

sdk/core/Azure.Core/src/Pipeline/HttpClientTransport.cs

@@ -260,6 +260,18 @@ public override string ClientRequestId
                 }
             }
 
+            protected internal override void SetHeader(string name, string value)
+            {
+                if (name.Equals(HttpHeader.Names.Authorization) && AuthenticationHeaderValue.TryParse(value, out var authHeader))
+                {
+                    _requestMessage.Headers.Authorization = authHeader;
+                }
+                else
+                {
+                    base.SetHeader(name, value);
+                }
+            }
+
             protected internal override void AddHeader(string name, string value)
             {
                 if (_requestMessage.Headers.TryAddWithoutValidation(name, value))

sdk/core/Azure.Core/src/Pipeline/HttpWebRequestTransport.cs

@@ -27,7 +27,7 @@ internal class HttpWebRequestTransport : HttpPipelineTransport
         /// <summary>
         /// Creates a new instance of <see cref="HttpWebRequestTransport"/>
         /// </summary>
-        public HttpWebRequestTransport(): this (_ => { })
+        public HttpWebRequestTransport() : this(_ => { })
         {
         }
 
@@ -58,7 +58,7 @@ private async ValueTask ProcessInternal(HttpMessage message, bool async)
 
             ServicePointHelpers.SetLimits(request.ServicePoint);
 
-            using var registration = message.CancellationToken.Register(state => ((HttpWebRequest) state).Abort(), request);
+            using var registration = message.CancellationToken.Register(state => ((HttpWebRequest)state).Abort(), request);
             try
             {
                 if (message.Request.Content != null)
@@ -90,7 +90,7 @@ private async ValueTask ProcessInternal(HttpMessage message, bool async)
                     webResponse = exception.Response;
                 }
 
-                message.Response = new HttpWebResponseImplementation(message.Request.ClientRequestId, (HttpWebResponse) webResponse);
+                message.Response = new HttpWebResponseImplementation(message.Request.ClientRequestId, (HttpWebResponse)webResponse);
             }
             // ObjectDisposedException might be thrown if the request is aborted during the content upload via SSL
             catch (ObjectDisposedException) when (message.CancellationToken.IsCancellationRequested)
@@ -239,7 +239,7 @@ public override Request CreateRequest()
             return new HttpWebRequestImplementation();
         }
 
-        private sealed class HttpWebResponseImplementation: Response
+        private sealed class HttpWebResponseImplementation : Response
         {
             private readonly HttpWebResponse _webResponse;
             private Stream? _contentStream;
@@ -253,7 +253,7 @@ public HttpWebResponseImplementation(string clientRequestId, HttpWebResponse web
                 ClientRequestId = clientRequestId;
             }
 
-            public override int Status => (int) _webResponse.StatusCode;
+            public override int Status => (int)_webResponse.StatusCode;
 
             public override string ReasonPhrase => _webResponse.StatusDescription;
 
@@ -302,61 +302,30 @@ protected internal override IEnumerable<HttpHeader> EnumerateHeaders()
             }
         }
 
-        private sealed class HttpWebRequestImplementation: Request
+        private sealed class HttpWebRequestImplementation : Request
         {
             public HttpWebRequestImplementation()
             {
                 Method = RequestMethod.Get;
             }
 
             private string? _clientRequestId;
-            private readonly Dictionary<string, List<string>> _headers = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+            private readonly DictionaryHeaders _headers = new();
 
-            protected internal override void AddHeader(string name, string value)
-            {
-                if (!_headers.TryGetValue(name, out List<string> values))
-                {
-                    _headers[name] = values = new List<string>();
-                }
+        protected internal override void SetHeader(string name, string value) => _headers.SetHeader(name, value);
 
-                values.Add(value);
-            }
+        protected internal override void AddHeader(string name, string value) => _headers.AddHeader(name, value);
 
-            protected internal override bool TryGetHeader(string name, [NotNullWhen(true)] out string? value)
-            {
-                if (_headers.TryGetValue(name, out List<string> values))
-                {
-                    value = JoinHeaderValue(values);
-                    return true;
-                }
+        protected internal override bool TryGetHeader(string name, out string value) => _headers.TryGetHeader(name, out value);
 
-                value = null;
-                return false;
-            }
+        protected internal override bool TryGetHeaderValues(string name, out IEnumerable<string> values) => _headers.TryGetHeaderValues(name, out values);
 
-            protected internal override bool TryGetHeaderValues(string name, out IEnumerable<string> values)
-            {
-                var result = _headers.TryGetValue(name, out List<string> valuesList);
-                values = valuesList;
-                return result;
-            }
+        protected internal override bool ContainsHeader(string name) => _headers.TryGetHeaderValues(name, out _);
 
-            protected internal override bool ContainsHeader(string name)
-            {
-                return TryGetHeaderValues(name, out _);
-            }
+        protected internal override bool RemoveHeader(string name) => _headers.RemoveHeader(name);
 
-            protected internal override bool RemoveHeader(string name)
-            {
-                return _headers.Remove(name);
-            }
-
-            protected internal override IEnumerable<HttpHeader> EnumerateHeaders() => _headers.Select(h => new HttpHeader(h.Key, JoinHeaderValue(h.Value)));
+        protected internal override IEnumerable<HttpHeader> EnumerateHeaders() => _headers.EnumerateHeaders();
 
-            private static string JoinHeaderValue(IEnumerable<string> values)
-            {
-                return string.Join(",", values);
-            }
             public override string ClientRequestId
             {
                 get => _clientRequestId ??= Guid.NewGuid().ToString();
@@ -376,4 +345,4 @@ public override void Dispose()
         }
     }
 #endif
-}
+}

sdk/core/Azure.Core/src/Request.cs

@@ -83,6 +83,7 @@ protected internal virtual void SetHeader(string name, string value)
             RemoveHeader(name);
             AddHeader(name, value);
         }
+
         /// <summary>
         /// Removes the header from the collection.
         /// </summary>
@@ -103,7 +104,7 @@ protected internal virtual void SetHeader(string name, string value)
         /// <summary>
         /// Gets the response HTTP headers.
         /// </summary>
-        public RequestHeaders Headers => new RequestHeaders(this);
+        public RequestHeaders Headers => new(this);
 
         /// <summary>
         /// Frees resources held by this <see cref="Response"/> instance.