Remove empty headers HEA_;

Author: thomasgalliker

HttpClient.Caching/InMemory/MethodUriHeadersCacheKeysProvider.cs

@@ -51,13 +51,9 @@ public string GetKey(HttpRequestMessage request)
                     {
                         sb.AppendFormat("HEA_{0}_{1};", headerName, this.GetHeaderValue(request, headerName));
                     }
-                    else
-                    {
-                        sb.Append("HEA_;");
-                    }
-
                 }
             }
+
             sb.AppendFormat("URI_{0};", request.RequestUri);
 
             return sb.ToString();
@@ -75,15 +71,15 @@ private string GetHeaderValue(HttpRequestMessage request, string headerName)
                 throw new ArgumentException($"'{nameof(headerName)}' cannot be null or empty.", nameof(headerName));
             }
 
-            var retVal = string.Empty;
+            var orderedHeaderValues = string.Empty;
 
             var headerValues = request.Headers.GetValues(headerName);
             if (headerValues != null)
             {
-                retVal = string.Join(",", headerValues.OrderBy(i => i));
+                orderedHeaderValues = string.Join(",", headerValues.OrderBy(i => i));
             }
 
-            return retVal;
+            return orderedHeaderValues;
         }
     }
 }

Tests/HttpClient.Caching.Tests/InMemory/MethodUriHeadersCacheKeysProviderTests.cs

@@ -34,7 +34,7 @@ public void ShouldGetKey_EmptyHeaderNames()
         public void ShouldGetKey_WithMatchingHeader()
         {
             // Arrange
-            var headersNames = new[] { "X-HEADER-1", "X-HEADER-2" };
+            var headersNames = new[] { "X-HEADER-2", "X-HEADER-1" };
             var cacheKeysProvider = new MethodUriHeadersCacheKeysProvider(headersNames);
             var request = new HttpRequestMessage
             {
@@ -47,14 +47,14 @@ public void ShouldGetKey_WithMatchingHeader()
             var cacheKey = cacheKeysProvider.GetKey(request);
 
             // Assert
-            cacheKey.Should().Be("MET_GET;HEA_X-HEADER-1_Value1;HEA_;URI_http://unittest/;");
+            cacheKey.Should().Be("MET_GET;HEA_X-HEADER-1_Value1;URI_http://unittest/;");
         }
 
         [Fact]
         public void ShouldGetKey_WithoutMatchingHeader()
         {
             // Arrange
-            var headersNames = new[] { "X-HEADER-1", "X-HEADER-2" };
+            var headersNames = new[] {  "X-HEADER-2", "X-HEADER-1" };
             var cacheKeysProvider = new MethodUriHeadersCacheKeysProvider(headersNames);
             var request = new HttpRequestMessage
             {
@@ -67,7 +67,7 @@ public void ShouldGetKey_WithoutMatchingHeader()
             var cacheKey = cacheKeysProvider.GetKey(request);
 
             // Assert
-            cacheKey.Should().Be("MET_GET;HEA_;HEA_;URI_http://unittest/;");
+            cacheKey.Should().Be("MET_GET;URI_http://unittest/;");
         }
     }
 }