More feedback

Author: JunTaoLuo

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingContext.cs

@@ -195,7 +195,7 @@ internal string CreateCacheKey(CachedVaryBy varyBy)
                     if (varyBy.Params.Count == 1 && string.Equals(varyBy.Params[0], "*"))
                     {
                         // Vary by all available query params
-                        foreach (var query in _httpContext.Request.Query.OrderBy(q => q.Key))
+                        foreach (var query in _httpContext.Request.Query.OrderBy(q => q.Key, StringComparer.OrdinalIgnoreCase))
                         {
                             builder.Append(KeyDelimiter)
                                 .Append(query.Key.ToUpperInvariant())
@@ -503,7 +503,7 @@ internal void FinalizeCachingHeaders()
                 // Create the cache entry now
                 var response = _httpContext.Response;
                 var varyHeaderValue = response.Headers[HeaderNames.Vary];
-                var varyParamsValue = _httpContext.GetResponseCachingOptions().Params;
+                var varyParamsValue = _httpContext.GetResponseCachingFeature().Params;
                 _cachedResponseValidFor = ResponseCacheControl.SharedMaxAge
                     ?? ResponseCacheControl.MaxAge
                     ?? (ResponseHeaders.Expires - _responseTime)
@@ -596,7 +596,7 @@ internal void ShimResponseStream()
             }
 
             // TODO: Move this temporary interface with endpoint to HttpAbstractions
-            _httpContext.AddResponseCachingOptions();
+            _httpContext.AddResponseCachingFeature();
         }
 
         internal void UnshimResponseStream()
@@ -608,7 +608,7 @@ internal void UnshimResponseStream()
             _httpContext.Features.Set(OriginalSendFileFeature);
 
             // TODO: Move this temporary interface with endpoint to HttpAbstractions
-            _httpContext.RemoveResponseCachingOptions();
+            _httpContext.RemoveResponseCachingFeature();
         }
 
         private enum ResponseType

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingExtensions.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNetCore.ResponseCaching;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Builder
 {

src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingHttpContextExtensions.cs

@@ -8,17 +8,17 @@ namespace Microsoft.AspNetCore.ResponseCaching
     // TODO: Temporary interface for endpoints to specify options for response caching
     public static class ResponseCachingHttpContextExtensions
     {
-        public static void AddResponseCachingOptions(this HttpContext httpContext)
+        public static void AddResponseCachingFeature(this HttpContext httpContext)
         {
             httpContext.Features.Set(new ResponseCachingFeature());
         }
 
-        public static void RemoveResponseCachingOptions(this HttpContext httpContext)
+        public static void RemoveResponseCachingFeature(this HttpContext httpContext)
         {
             httpContext.Features.Set<ResponseCachingFeature>(null);
         }
 
-        public static ResponseCachingFeature GetResponseCachingOptions(this HttpContext httpContext)
+        public static ResponseCachingFeature GetResponseCachingFeature(this HttpContext httpContext)
         {
             return httpContext.Features.Get<ResponseCachingFeature>() ?? new ResponseCachingFeature();
         }

test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingTests.cs

@@ -145,7 +145,7 @@ public async void ServesCachedContent_IfVaryByParams_Matches()
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = "param";
+                context.GetResponseCachingFeature().Params = "param";
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -182,7 +182,7 @@ public async void ServesCachedContent_IfVaryByParamsExplicit_Matches_ParamNameCa
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "ParamA", "paramb" };
+                context.GetResponseCachingFeature().Params = new[] { "ParamA", "paramb" };
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -219,7 +219,7 @@ public async void ServesCachedContent_IfVaryByParamsStar_Matches_ParamNameCaseIn
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "*" };
+                context.GetResponseCachingFeature().Params = new[] { "*" };
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -247,7 +247,7 @@ public async void ServesCachedContent_IfVaryByParamsExplicit_Matches_OrderInsens
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "ParamB", "ParamA" };
+                context.GetResponseCachingFeature().Params = new[] { "ParamB", "ParamA" };
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -275,7 +275,7 @@ public async void ServesCachedContent_IfVaryByParamsStar_Matches_OrderInsensitiv
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "*" };
+                context.GetResponseCachingFeature().Params = new[] { "*" };
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -303,7 +303,7 @@ public async void ServesFreshContent_IfVaryByParams_Mismatches()
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = "param";
+                context.GetResponseCachingFeature().Params = "param";
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -331,7 +331,7 @@ public async void ServesFreshContent_IfVaryByParamsExplicit_Mismatch_ParamValueC
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "ParamA", "ParamB" };
+                context.GetResponseCachingFeature().Params = new[] { "ParamA", "ParamB" };
                 await context.Response.WriteAsync(uniqueId);
             });
 
@@ -359,7 +359,7 @@ public async void ServesFreshContent_IfVaryByParamsStar_Mismatch_ParamValueCaseS
                 };
                 headers.Date = DateTimeOffset.UtcNow;
                 headers.Headers["X-Value"] = uniqueId;
-                context.GetResponseCachingOptions().Params = new[] { "*" };
+                context.GetResponseCachingFeature().Params = new[] { "*" };
                 await context.Response.WriteAsync(uniqueId);
             });