fix more code review feedback

lanlanlee2008 · lanlanlee2008 · commit 8dc6676a7bcc · 2016-08-05T16:27:10.000-07:00
diff --git a/src/OutputCacheModuleAsync/CachedRawResponse.cs b/src/OutputCacheModuleAsync/CachedRawResponse.cs
@@ -1,7 +1,7 @@
 ﻿namespace Microsoft.AspNet.OutputCache {
     using System;
 
-    internal class CachedRawResponse {
+    class CachedRawResponse {
 
         public Guid CachedVaryId { get; set; }
 
diff --git a/src/OutputCacheModuleAsync/CachedVary.cs b/src/OutputCacheModuleAsync/CachedVary.cs
@@ -1,7 +1,7 @@
 ﻿namespace Microsoft.AspNet.OutputCache {
     using System;
 
-    internal class CachedVary {
+    class CachedVary {
         public string[] ContentEncodings { get; set; }
         public string[] Headers { get; set; }
         public string[] Params { get; set; }
@@ -24,17 +24,5 @@ public override bool Equals(object obj) {
                    && StringUtil.StringArrayEquals(Headers, cv.Headers)
                    && StringUtil.StringArrayEquals(Params, cv.Params);
         }
-
-        /*
-        public override int GetHashCode() {
-            var hashCodeCombiner = new HashCodeCombiner();
-            hashCodeCombiner.AddObject(VaryByAllParams);
-            hashCodeCombiner.AddObject((object) VaryByCustom);
-            hashCodeCombiner.AddArray(ContentEncodings);
-            hashCodeCombiner.AddArray(Headers);
-            hashCodeCombiner.AddArray(Params);
-            return hashCodeCombiner.CombinedHash32;
-        }
-        */
     }
 }
diff --git a/src/OutputCacheModuleAsync/DependencyCacheEntry.cs b/src/OutputCacheModuleAsync/DependencyCacheEntry.cs
@@ -2,13 +2,13 @@
     using System;
     using System.Web.Caching;
 
-    internal class DependencyCacheEntry {
+    class DependencyCacheEntry {
         public string RawResponseKey;
         public string KernelCacheUrl;
         public string Name;
     }
 
-    internal class DependencyCacheEntryWrapper {
+    class DependencyCacheEntryWrapper {
         public DependencyCacheEntry DependencyCacheEntry;
         public CacheDependency Dependencies;
         public TimeSpan DependencyCacheTimeSpan;
diff --git a/src/OutputCacheModuleAsync/HttpCachePolicySettings.cs b/src/OutputCacheModuleAsync/HttpCachePolicySettings.cs
@@ -1,11 +1,9 @@
-﻿using System.Linq;
-
-namespace Microsoft.AspNet.OutputCache {
+﻿namespace Microsoft.AspNet.OutputCache {
     using System;
     using System.Collections.Generic;
     using System.Web;
-
-    internal class HttpCachePolicySettings {
+    using System.Linq;
+    class HttpCachePolicySettings {
         public HttpCacheability Cacheability { get; set; }
         public IEnumerable<KeyValuePair<HttpCacheValidateHandler, object>> ValidationCallbackInfo { get; set; }
         public bool IgnoreRangeRequests { get; set; }
diff --git a/src/OutputCacheModuleAsync/HttpRawResponse.cs b/src/OutputCacheModuleAsync/HttpRawResponse.cs
@@ -2,7 +2,7 @@
     using System.Collections;
     using System.Collections.Specialized;
 
-    internal class HttpRawResponse {
+    class HttpRawResponse {
         public int StatusCode { get; set; }
         public string StatusDescription { get; set; }
         public NameValueCollection Headers { get; set; }
diff --git a/src/OutputCacheModuleAsync/InMemoryOutputCacheProvider.cs b/src/OutputCacheModuleAsync/InMemoryOutputCacheProvider.cs
@@ -4,8 +4,8 @@
     using System.Threading.Tasks;
     using System.Web.Caching;
     using Microsoft.AspNet.OutputCache.Resource;
-    internal class InMemoryOutputCacheProvider : OutputCacheProviderAsync {
-         private readonly MemoryCache _cache = new MemoryCache(SR.Microsoft_AspNet_OutputCache_Default_InMemory_Provider);
+    class InMemoryOutputCacheProvider : OutputCacheProviderAsync {
+        private readonly MemoryCache _cache = new MemoryCache(SR.Microsoft_AspNet_OutputCache_Default_InMemory_Provider);
 
         public override Task<object> GetAsync(string key) {
             return Task.FromResult(Get(key)); 
diff --git a/src/OutputCacheModuleAsync/OutputCacheEntry.cs b/src/OutputCacheModuleAsync/OutputCacheEntry.cs
@@ -3,7 +3,7 @@
     using System.Collections;
     using System.Collections.Specialized;
 
-    internal class OutputCacheEntry {
+    class OutputCacheEntry {
         public Guid CachedVaryId { get; set; }
         public HttpCachePolicySettings Settings { get; set; }
         public string KernelCacheUrl { get; set; }
diff --git a/src/OutputCacheModuleAsync/OutputCacheHelper.cs b/src/OutputCacheModuleAsync/OutputCacheHelper.cs
@@ -1,7 +1,4 @@
-﻿using System.IO;
-using Microsoft.AspNet.OutputCache.Resource;
-
-namespace Microsoft.AspNet.OutputCache {
+﻿namespace Microsoft.AspNet.OutputCache {
     using System.Collections.Generic;
     using System.Linq;
     using System;
@@ -13,8 +10,10 @@ namespace Microsoft.AspNet.OutputCache {
     using System.Text;
     using System.Globalization;
     using System.Diagnostics;
+    using System.IO;
+    using Microsoft.AspNet.OutputCache.Resource;
 
-    internal class OutputCacheHelper {
+    class OutputCacheHelper {
         private const int MaxPostKeyLength = 15000;
         private const string NullVarybyValue = "+n+";
         internal const string TagOutputcache = "OutputCache";
@@ -23,7 +22,6 @@ internal class OutputCacheHelper {
         private const string Identity = "identity";
         private const string Asterisk = "*";
         private const string OutputcacheKeyprefixDependencies = "Microsoft.AspNet.OutputCache.Dependencies";
-        private readonly CacheItemRemovedCallback _dependencyRemovedCallback = null;
         private InMemoryOutputCacheProvider _inMemoryOutputCacheProvider;
 
         private InMemoryOutputCacheProvider InMemoryOutputCacheProvider => _inMemoryOutputCacheProvider ??
@@ -37,7 +35,7 @@ private async Task RemoveFromProvider(string key, string providerName) {
             // it's in the internal cache.
             if (providerName != null) {
                 OutputCacheProviderCollection providers = OutputCache.Providers;
-                provider = (OutputCacheProviderAsync) providers?[providerName];
+                provider = providers?[providerName] as OutputCacheProviderAsync;
             }
             else {
                 provider = InMemoryOutputCacheProvider;
@@ -70,7 +68,6 @@ private bool HasDependencyChanged(string depKey, string[] fileDeps, string kerne
             var dep = new CacheDependency(fileDeps);
             int idStartIndex = OutputcacheKeyprefixDependencies.Length;
             int idLength = depKey.Length - idStartIndex;
-            CacheItemRemovedCallback callback = _dependencyRemovedCallback;
             // have the file dependencies changed?
             if (string.Compare(dep.GetUniqueID(), 0, depKey, idStartIndex, idLength, StringComparison.Ordinal) == 0) {
                 // file dependencies have not changed--cache them with callback to remove OutputCacheEntry if they change
@@ -84,7 +81,7 @@ private bool HasDependencyChanged(string depKey, string[] fileDeps, string kerne
                     Dependencies = dep,
                     CacheItemPriority = CacheItemPriority.Normal,
                     DependencyCacheTimeSpan = Cache.NoSlidingExpiration,
-                    DependencyRemovedCallback = callback
+                    DependencyRemovedCallback = null
                 };
                 InMemoryOutputCacheProvider.Add(depKey, dcew, DateTimeOffset.MaxValue);
                 return false;
@@ -155,7 +152,7 @@ private static CachedRawResponse Convert(OutputCacheEntry oce) {
             };
         }
 
-        internal async Task<object> GetAsync(string key) {
+        public async Task<object> GetAsync(string key) {
             OutputCacheProviderAsync provider = GetProvider(HttpContext.Current);
             object result = await provider.GetAsync(key);
             var oce = result as OutputCacheEntry;
@@ -170,7 +167,7 @@ internal async Task<object> GetAsync(string key) {
             return result;
         }
 
-        internal async Task RemoveAsync(string key, HttpContext context) {
+        public async Task RemoveAsync(string key, HttpContext context) {
             // we don't know if it's in the internal cache or
             // one of the providers.  If a context is given,
             // then we can narrow down to at most one provider.
@@ -189,7 +186,7 @@ internal async Task RemoveAsync(string key, HttpContext context) {
             }
         }
 
-        internal async Task InsertResponseAsync(string cachedVaryKey,
+        public async Task InsertResponseAsync(string cachedVaryKey,
             CachedVary cachedVary,
             string rawResponseKey,
             CachedRawResponse rawResponse,
@@ -248,7 +245,7 @@ internal async Task InsertResponseAsync(string cachedVaryKey,
                         Dependencies = dependencies,
                         CacheItemPriority = CacheItemPriority.Normal,
                         DependencyCacheTimeSpan = Cache.NoSlidingExpiration,
-                        DependencyRemovedCallback = _dependencyRemovedCallback
+                        DependencyRemovedCallback = null
                     };
                     object d = await provider.AddAsync(depKey, dcew, absExp);
                     if (d != null) {
@@ -258,7 +255,7 @@ internal async Task InsertResponseAsync(string cachedVaryKey,
             }
         }
 
-        internal static bool IsCacheableEncoding(string coding, string[] contentEncodings) {
+        public static bool IsCacheableEncoding(string coding, string[] contentEncodings) {
             // return true if we are not varying by content encoding.
             if (contentEncodings == null) {
                 return true;
@@ -268,7 +265,7 @@ internal static bool IsCacheableEncoding(string coding, string[] contentEncoding
             // return true if the Content-Encoding header is listed
         }
 
-        internal static bool ContainsNonShareableCookies(HttpResponse response) {
+        public static bool ContainsNonShareableCookies(HttpResponse response) {
             HttpCookieCollection cookies = response.Cookies;
             for (int i = 0; i < cookies.Count; i++) {
                 HttpCookie httpCookie = cookies[i];
@@ -279,7 +276,7 @@ internal static bool ContainsNonShareableCookies(HttpResponse response) {
             return false;
         }
 
-        internal static void UseSnapshot(HttpRawResponse rawResponse, bool sendBody, HttpResponse response) {
+        public static void UseSnapshot(HttpRawResponse rawResponse, bool sendBody, HttpResponse response) {
             if (response.HeadersWritten)
                 throw new HttpException(SR.Cannot_use_snapshot_after_headers_sent);
             response.Clear();
@@ -296,7 +293,7 @@ internal static void UseSnapshot(HttpRawResponse rawResponse, bool sendBody, Htt
             response.SuppressContent = !sendBody;
         }
 
-        internal static HttpRawResponse GetSnapshot(HttpResponse response) {
+        public static HttpRawResponse GetSnapshot(HttpResponse response) {
             var headers = new NameValueCollection();
             const bool hasSubstBlocks = false;
             if (response.HeadersWritten)
@@ -328,7 +325,7 @@ internal static HttpRawResponse GetSnapshot(HttpResponse response) {
             };
         }
 
-        internal static HttpCachePolicySettings GetCurrentSettings(HttpResponse response) {
+        public static HttpCachePolicySettings GetCurrentSettings(HttpResponse response) {
             IEnumerable<KeyValuePair<HttpCacheValidateHandler, object>> validationCallbackInfo =
                 OutputCacheUtility.GetValidationCallbacks(response);
 
@@ -353,7 +350,7 @@ internal static HttpCachePolicySettings GetCurrentSettings(HttpResponse response
             };
         }
 
-        internal static void ResetFromHttpCachePolicySettings(HttpCachePolicySettings settings,
+        public static void ResetFromHttpCachePolicySettings(HttpCachePolicySettings settings,
             DateTime utcTimestampRequest, HttpResponse response) {
             response.Cache.SetCacheability(settings.Cacheability);
             response.Cache.VaryByContentEncodings.SetContentEncodings(settings.VaryByContentEncodings);
@@ -385,7 +382,7 @@ internal static void ResetFromHttpCachePolicySettings(HttpCachePolicySettings se
             }
         }
 
-        internal static void UpdateCachedHeaders(HttpResponse response) {
+        public static void UpdateCachedHeaders(HttpResponse response) {
             //To enable Out of Band OutputCache Module support, we will always refresh the UtcTimestampRequest.
             if (response.Cache.UtcTimestampCreated == DateTime.MinValue) {
                 response.Cache.UtcTimestampCreated = HttpContext.Current.Timestamp.ToUniversalTime();
@@ -395,6 +392,7 @@ internal static void UpdateCachedHeaders(HttpResponse response) {
 
         private static void UpdateFromDependencies(HttpResponse response) {
             CacheDependency dep = null;
+            DateTime utcFileLastModifiedMax;
             // if response.Cache.GetETag() != null && response.Cache.GetETagFromFileDependencies() == true, then this HttpCachePolicy
             // was created from HttpCachePolicySettings and we don't need to update _etag.
             if (response.Cache.GetETag() == null && response.Cache.GetETagFromFileDependencies()) {
@@ -406,7 +404,7 @@ private static void UpdateFromDependencies(HttpResponse response) {
                 if (id == null) {
                     throw new HttpException(SR.No_UniqueId_Cache_Dependency);
                 }
-                DateTime utcFileLastModifiedMax = UpdateLastModifiedTimeFromDependency(dep, response);
+                utcFileLastModifiedMax = UpdateLastModifiedTimeFromDependency(dep, response);
                 var sb = new StringBuilder(256);
                 sb.Append(HttpRuntime.AppDomainId);
                 sb.Append(id);
@@ -415,22 +413,17 @@ private static void UpdateFromDependencies(HttpResponse response) {
                 response.Cache.SetETag("\"" +
                                        System.Convert.ToBase64String(
                                            CryptoUtil.ComputeSha256Hash(Encoding.UTF8.GetBytes(sb.ToString()))) + "\"");
-
-
                 if (!response.Cache.GetLastModifiedFromFileDependencies())
                     return;
             }
-
-            {
+            if (dep == null) {
+                dep = OutputCacheUtility.CreateCacheDependency(response);
                 if (dep == null) {
-                    dep = OutputCacheUtility.CreateCacheDependency(response);
-                    if (dep == null) {
-                        return;
-                    }
+                    return;
                 }
-                DateTime utcFileLastModifiedMax = UpdateLastModifiedTimeFromDependency(dep,response);
-                UtcSetLastModified(utcFileLastModifiedMax, response);
             }
+            utcFileLastModifiedMax = UpdateLastModifiedTimeFromDependency(dep, response);
+            UtcSetLastModified(utcFileLastModifiedMax, response);
         }
 
         private static void UtcSetLastModified(DateTime utcDate, HttpResponse response) {
@@ -439,7 +432,6 @@ private static void UtcSetLastModified(DateTime utcDate, HttpResponse response)
                  * Time may differ if the system time changes in the middle of the request. 
                  * Adjust the timestamp to Now if necessary.
                  */
-
                 DateTime utcNow = DateTime.UtcNow;
                 if (utcDate > utcNow) {
                     utcDate = utcNow;
@@ -450,16 +442,12 @@ private static void UtcSetLastModified(DateTime utcDate, HttpResponse response)
                  * need to store dates with 1 second resolution or comparisons
                  * will be off.
                  */
-
                 utcDate = new DateTime(utcDate.Ticks - (utcDate.Ticks % TimeSpan.TicksPerSecond));
                 if (response.Cache.GetUtcLastModified()!= DateTime.MinValue || utcDate > response.Cache.GetUtcLastModified()) {
                  response.Cache.SetLastModified(utcDate);
                 }
-            
-
         }
 
-
         private static DateTime UpdateLastModifiedTimeFromDependency(CacheDependency dep, HttpResponse response) {
                   DateTime utcFileLastModifiedMax = dep.UtcLastModified;
                 if (utcFileLastModifiedMax <  response.Cache.GetUtcLastModified()) {
@@ -474,7 +462,6 @@ private static DateTime UpdateLastModifiedTimeFromDependency(CacheDependency dep
                     utcFileLastModifiedMax = utcNow;
                 }
                 return utcFileLastModifiedMax;
-            
         }
 
         private static string CreateOutputCachedItemKey(
@@ -616,7 +603,7 @@ private static string CreateOutputCachedItemKey(
          * and form posted data.
          */
 
-        internal static string CreateOutputCachedItemKey(HttpContext context, CachedVary cachedVary) {
+        public static string CreateOutputCachedItemKey(HttpContext context, CachedVary cachedVary) {
             return CreateOutputCachedItemKey(context.Request.Path, context.Request.HttpMethod, context, cachedVary);
         }
 
@@ -626,7 +613,7 @@ internal static string CreateOutputCachedItemKey(HttpContext context, CachedVary
          * returns either i) an acceptable index in contentEncodings, ii) -1 if the identity is acceptable, or iii) -2 if nothing is acceptable
          */
 
-        internal static int GetAcceptableEncoding(string[] contentEncodings, int startIndex, string acceptEncoding) {
+        public static int GetAcceptableEncoding(string[] contentEncodings, int startIndex, string acceptEncoding) {
             // The format of Accept-Encoding is ( 1#( codings [ ";" "q" "=" qvalue ] ) | "*" )
             if (string.IsNullOrEmpty(acceptEncoding)) {
                 return -1; // use "identity"
@@ -692,7 +679,7 @@ internal static int GetAcceptableEncoding(string[] contentEncodings, int startIn
 
         private static double Tolerance { get; set; }
 
-        // GetAsync the weight of the specified coding from the Accept-Encoding header.
+        // Get the weight of the specified coding from the Accept-Encoding header.
         // 1 means use this coding.  0 means don't use this coding.  A number between
         // 1 and 0 must be compared with other codings.  -1 means the coding was not found
         private static double GetAcceptableEncodingHelper(string coding, string acceptEncoding) {
@@ -775,7 +762,7 @@ private static bool IsIdentityAcceptable(string acceptEncoding) {
             return result;
         }
 
-        internal static bool IsAcceptableEncoding(string contentEncoding, string acceptEncoding) {
+        public static bool IsAcceptableEncoding(string contentEncoding, string acceptEncoding) {
             if (string.IsNullOrEmpty(contentEncoding)) {
                 // if Content-Encoding is not set treat it as the identity
                 contentEncoding = Identity;
@@ -789,7 +776,5 @@ internal static bool IsAcceptableEncoding(string contentEncoding, string acceptE
             return !(Math.Abs(weight) < tolerance) &&
                    (!(weight <= 0) || Math.Abs(GetAcceptableEncodingHelper(Asterisk, acceptEncoding)) > 0);
         }
-
-
     }
 }
diff --git a/src/OutputCacheModuleAsync/OutputCacheModuleAsync.cs b/src/OutputCacheModuleAsync/OutputCacheModuleAsync.cs
@@ -590,7 +590,7 @@ private static bool CheckHasQueryStringOrFormPost(HttpRequest request, string ke
         }
     }
 
-    internal class CachedItem {
+    class CachedItem {
         public bool DoReturn { get; set; }
         public object Item { get; set; }
     }
diff --git a/src/OutputCacheModuleAsync/TaskAsyncHelper.cs b/src/OutputCacheModuleAsync/TaskAsyncHelper.cs
@@ -3,7 +3,7 @@
     using System;
     using System.Threading.Tasks;
 
-    internal class TaskAsyncHelper {
+    class TaskAsyncHelper {
         /// Assists in converting an method written using the Task Asynchronous Pattern to a Begin/End method pair 
         public static IAsyncResult BeginTask(Func<Task> taskFunc, AsyncCallback callback, object state) {
             Task task = taskFunc();
diff --git a/src/OutputCacheModuleAsync/TaskWrapperAsyncResults.cs b/src/OutputCacheModuleAsync/TaskWrapperAsyncResults.cs
@@ -4,7 +4,7 @@
     using System.Threading;
 
     // Wraps a Task class, optionally overriding the State object (since the Task Asynchronous Pattern doesn't normally use them).
-    internal class TaskWrapperAsyncResult : IAsyncResult {
+    class TaskWrapperAsyncResult : IAsyncResult {
         private bool _forceCompletedSynchronously;
 
         public TaskWrapperAsyncResult(Task task, object asyncState) {

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ private static bool CheckHasQueryStringOrFormPost(HttpRequest request, string ke`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`
`593`		`- internal class CachedItem {`
	`593`	`+ class CachedItem {`
`594`	`594`	`public bool DoReturn { get; set; }`
`595`	`595`	`public object Item { get; set; }`
`596`	`596`	`}`