Merge pull request #140 from filipw/dev

filipw · filipw · commit 68096a16c344 · 2015-07-02T16:59:40.000+02:00
Release 0.8.0
diff --git a/src/WebApi.OutputCache.Core/Cache/IApiOutputCache.cs b/src/WebApi.OutputCache.Core/Cache/IApiOutputCache.cs
@@ -6,11 +6,18 @@ namespace WebApi.OutputCache.Core.Cache
     public interface IApiOutputCache
     {
         void RemoveStartsWith(string key);
+
         T Get<T>(string key) where T : class;
+
+        [Obsolete("Use Get<T> instead")]
         object Get(string key);
+
         void Remove(string key);
+
         bool Contains(string key);
+
         void Add(string key, object o, DateTimeOffset expiration, string dependsOnKey = null);
+
         IEnumerable<string> AllKeys { get; }
     }
 }
diff --git a/src/WebApi.OutputCache.Core/Cache/MemoryCacheDefault.cs b/src/WebApi.OutputCache.Core/Cache/MemoryCacheDefault.cs
@@ -23,6 +23,7 @@ public T Get<T>(string key) where T : class
             return o;
         }
 
+        [Obsolete("Use Get<T> instead")]
         public object Get(string key)
         {
             return Cache.Get(key);
diff --git a/src/WebApi.OutputCache.V2/AutoInvalidateCacheOutputAttribute.cs b/src/WebApi.OutputCache.V2/AutoInvalidateCacheOutputAttribute.cs
@@ -20,7 +20,9 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
             if (actionExecutedContext.Response != null && !actionExecutedContext.Response.IsSuccessStatusCode) return;
             if (actionExecutedContext.ActionContext.Request.Method != HttpMethod.Post &&
                 actionExecutedContext.ActionContext.Request.Method != HttpMethod.Put &&
-                actionExecutedContext.ActionContext.Request.Method != HttpMethod.Delete) return;
+                actionExecutedContext.ActionContext.Request.Method != HttpMethod.Delete &&
+                actionExecutedContext.ActionContext.Request.Method.Method.ToLower() != "patch" &&
+                actionExecutedContext.ActionContext.Request.Method.Method.ToLower() != "merge") return;
 
             var controller = actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor;
             var actions = FindAllGetMethods(controller.ControllerType, TryMatchType ? actionExecutedContext.ActionContext.ActionDescriptor.GetParameters() : null);
@@ -30,7 +32,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
 
             foreach (var action in actions)
             {
-                var key = config.CacheOutputConfiguration().MakeBaseCachekey(controller.ControllerName, action);
+                var key = config.CacheOutputConfiguration().MakeBaseCachekey(controller.ControllerType.FullName, action);
                 if (WebApiCache.Contains(key))
                 {
                     WebApiCache.RemoveStartsWith(key);
diff --git a/src/WebApi.OutputCache.V2/CacheOutputAttribute.cs b/src/WebApi.OutputCache.V2/CacheOutputAttribute.cs
@@ -20,6 +20,7 @@ namespace WebApi.OutputCache.V2
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public class CacheOutputAttribute : ActionFilterAttribute
     {
+        private const string CurrentRequestMediaType = "CacheOutput:CurrentRequestMediaType";
         protected static MediaTypeHeaderValue DefaultMediaType = new MediaTypeHeaderValue("application/json") {CharSet = Encoding.UTF8.HeaderName};
 
         /// <summary>
@@ -62,8 +63,6 @@ public class CacheOutputAttribute : ActionFilterAttribute
         /// </summary>
         public Type CacheKeyGenerator { get; set; }
         
-        private MediaTypeHeaderValue _responseMediaType;
-        
         // cache repository
         private IApiOutputCache _webApiCache;
 
@@ -100,9 +99,15 @@ protected virtual MediaTypeHeaderValue GetExpectedMediaType(HttpConfiguration co
             var negotiator = config.Services.GetService(typeof(IContentNegotiator)) as IContentNegotiator;
             var returnType = actionContext.ActionDescriptor.ReturnType;
 
-            if (negotiator != null && returnType != typeof(HttpResponseMessage))
+            if (negotiator != null && returnType != typeof(HttpResponseMessage) && (returnType != typeof(IHttpActionResult) || typeof(IHttpActionResult).IsAssignableFrom(returnType)))
             {
                 var negotiatedResult = negotiator.Negotiate(returnType, actionContext.Request, config.Formatters);
+
+                if (negotiatedResult == null)
+                {
+                    return DefaultMediaType;
+                }
+
                 responseMediaType = negotiatedResult.MediaType;
                 if (string.IsNullOrWhiteSpace(responseMediaType.CharSet))
                 {
@@ -114,8 +119,7 @@ protected virtual MediaTypeHeaderValue GetExpectedMediaType(HttpConfiguration co
                 if (actionContext.Request.Headers.Accept != null)
                 {
                     responseMediaType = actionContext.Request.Headers.Accept.FirstOrDefault();
-                    if (responseMediaType == null ||
-                        !config.Formatters.Any(x => x.SupportedMediaTypes.Contains(responseMediaType)))
+                    if (responseMediaType == null || !config.Formatters.Any(x => x.SupportedMediaTypes.Contains(responseMediaType)))
                     {
                         return DefaultMediaType;
                     }
@@ -138,14 +142,15 @@ public override void OnActionExecuting(HttpActionContext actionContext)
 
             var cacheKeyGenerator = config.CacheOutputConfiguration().GetCacheKeyGenerator(actionContext.Request, CacheKeyGenerator);
 
-            _responseMediaType = GetExpectedMediaType(config, actionContext);
-            var cachekey = cacheKeyGenerator.MakeCacheKey(actionContext, _responseMediaType, ExcludeQueryStringFromCacheKey);
+            var responseMediaType = GetExpectedMediaType(config, actionContext);
+            actionContext.Request.Properties[CurrentRequestMediaType] = responseMediaType;
+            var cachekey = cacheKeyGenerator.MakeCacheKey(actionContext, responseMediaType, ExcludeQueryStringFromCacheKey);
 
             if (!_webApiCache.Contains(cachekey)) return;
 
             if (actionContext.Request.Headers.IfNoneMatch != null)
             {
-                var etag = _webApiCache.Get(cachekey + Constants.EtagKey) as string;
+                var etag = _webApiCache.Get<string>(cachekey + Constants.EtagKey);
                 if (etag != null)
                 {
                     if (actionContext.Request.Headers.IfNoneMatch.Any(x => x.Tag ==  etag))
@@ -159,16 +164,16 @@ public override void OnActionExecuting(HttpActionContext actionContext)
                 }
             }
 
-            var val = _webApiCache.Get(cachekey) as byte[];
+            var val = _webApiCache.Get<byte[]>(cachekey);
             if (val == null) return;
 
-            var contenttype = _webApiCache.Get(cachekey + Constants.ContentTypeKey) as MediaTypeHeaderValue ?? new MediaTypeHeaderValue(cachekey.Split(new[] {':'},2)[1]);
+            var contenttype = _webApiCache.Get<MediaTypeHeaderValue>(cachekey + Constants.ContentTypeKey) ?? new MediaTypeHeaderValue(cachekey.Split(new[] {':'},2)[1]);
 
             actionContext.Response = actionContext.Request.CreateResponse();
             actionContext.Response.Content = new ByteArrayContent(val);
 
             actionContext.Response.Content.Headers.ContentType = contenttype;
-            var responseEtag = _webApiCache.Get(cachekey + Constants.EtagKey) as string;
+            var responseEtag = _webApiCache.Get<string>(cachekey + Constants.EtagKey);
             if (responseEtag != null) SetEtag(actionContext.Response,  responseEtag);
 
             var cacheTime = CacheTimeQuery.Execute(DateTime.Now);
@@ -184,10 +189,12 @@ public override async Task OnActionExecutedAsync(HttpActionExecutedContext actio
             var cacheTime = CacheTimeQuery.Execute(DateTime.Now);
             if (cacheTime.AbsoluteExpiration > DateTime.Now)
             {
-                var config = actionExecutedContext.Request.GetConfiguration().CacheOutputConfiguration();
+                var httpConfig = actionExecutedContext.Request.GetConfiguration();
+                var config = httpConfig.CacheOutputConfiguration();
                 var cacheKeyGenerator = config.GetCacheKeyGenerator(actionExecutedContext.Request, CacheKeyGenerator);
 
-                var cachekey = cacheKeyGenerator.MakeCacheKey(actionExecutedContext.ActionContext, _responseMediaType, ExcludeQueryStringFromCacheKey);
+                var responseMediaType = actionExecutedContext.Request.Properties[CurrentRequestMediaType] as MediaTypeHeaderValue ?? GetExpectedMediaType(httpConfig, actionExecutedContext.ActionContext);
+                var cachekey = cacheKeyGenerator.MakeCacheKey(actionExecutedContext.ActionContext, responseMediaType, ExcludeQueryStringFromCacheKey);
 
                 if (!string.IsNullOrWhiteSpace(cachekey) && !(_webApiCache.Contains(cachekey)))
                 {
@@ -197,7 +204,7 @@ public override async Task OnActionExecutedAsync(HttpActionExecutedContext actio
 
                     if (responseContent != null)
                     {
-                        var baseKey = config.MakeBaseCachekey(actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerName, actionExecutedContext.ActionContext.ActionDescriptor.ActionName);
+                        var baseKey = config.MakeBaseCachekey(actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerType.FullName, actionExecutedContext.ActionContext.ActionDescriptor.ActionName);
                         var contentType = responseContent.Headers.ContentType;
                         string etag = actionExecutedContext.Response.Headers.ETag.Tag;
                         //ConfigureAwait false to avoid deadlocks
diff --git a/src/WebApi.OutputCache.V2/CacheOutputConfiguration.cs b/src/WebApi.OutputCache.V2/CacheOutputConfiguration.cs
@@ -54,7 +54,7 @@ public string MakeBaseCachekey<T, U>(Expression<Func<T, U>> expression)
                 }
             }
 
-            return string.Format("{0}-{1}", typeof(T).Name.Replace("Controller",string.Empty).ToLower(), methodName.ToLower());
+            return string.Format("{0}-{1}", typeof(T).FullName.ToLower(), methodName.ToLower());
         }
 
         private static ICacheKeyGenerator TryActivateCacheKeyGenerator(Type generatorType)
diff --git a/src/WebApi.OutputCache.V2/DefaultCacheKeyGenerator.cs b/src/WebApi.OutputCache.V2/DefaultCacheKeyGenerator.cs
@@ -13,7 +13,7 @@ public class DefaultCacheKeyGenerator : ICacheKeyGenerator
     {
         public virtual string MakeCacheKey(HttpActionContext context, MediaTypeHeaderValue mediaType, bool excludeQueryString = false)
         {
-            var controller = context.ControllerContext.ControllerDescriptor.ControllerName;
+            var controller = context.ControllerContext.ControllerDescriptor.ControllerType.FullName;
             var action = context.ActionDescriptor.ActionName;
             var key = context.Request.GetConfiguration().CacheOutputConfiguration().MakeBaseCachekey(controller, action);
             var actionParameters = context.ActionArguments.Where(x => x.Value != null).Select(x => x.Key + "=" + GetValue(x.Value));
diff --git a/src/WebApi.OutputCache.V2/InvalidateCacheOutputAttribute.cs b/src/WebApi.OutputCache.V2/InvalidateCacheOutputAttribute.cs
@@ -24,7 +24,7 @@ public InvalidateCacheOutputAttribute(string methodName, Type type = null)
         public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
         {
             if (actionExecutedContext.Response != null && !actionExecutedContext.Response.IsSuccessStatusCode) return;
-            _controller = _controller ?? actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerName;
+            _controller = _controller ?? actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerType.FullName;
 
             var config = actionExecutedContext.Request.GetConfiguration();
             EnsureCache(config, actionExecutedContext.Request);
diff --git a/test/WebApi.OutputCache.V2.Tests/CacheKeyGeneratorRegistrationTests.cs b/test/WebApi.OutputCache.V2.Tests/CacheKeyGeneratorRegistrationTests.cs
@@ -89,7 +89,7 @@ public void selected_generator_with_internal_registration_is_used()
             var client = new HttpClient(_server);
             var result = client.GetAsync(_url + "cachekey/get_internalregistered").Result;
 
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "internal"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_internalregistered")), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "internal"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_internalregistered")), Times.Once());
         }
 
         [Test]
diff --git a/test/WebApi.OutputCache.V2.Tests/CacheKeyGeneratorTests.cs b/test/WebApi.OutputCache.V2.Tests/CacheKeyGeneratorTests.cs
@@ -66,8 +66,8 @@ public void custom_default_cache_key_generator_called_and_key_used()
             var result = client.GetAsync(_url + "sample/Get_c100_s100").Result;
 
             _cache.Verify(s => s.Contains(It.Is<string>(x => x == "keykeykey")), Times.Exactly(2));
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());
             
             _keyGeneratorA.VerifyAll();
         }
@@ -79,8 +79,8 @@ public void custom_cache_key_generator_called()
             var result = client.GetAsync(_url + "cachekey/get_custom_key").Result;
 
             _cache.Verify(s => s.Contains(It.Is<string>(x => x == "custom_key")), Times.Exactly(2));
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_custom_key")), Times.Once());
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_custom_key")), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_custom_key")), Times.Once());
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_custom_key")), Times.Once());
         }
     }
 }
diff --git a/test/WebApi.OutputCache.V2.Tests/ConfigurationTests.cs b/test/WebApi.OutputCache.V2.Tests/ConfigurationTests.cs
@@ -33,10 +33,10 @@ public void cache_singleton_in_pipeline()
             var client = new HttpClient(_server);
             var result = client.GetAsync(_url + "Get_c100_s100").Result;
 
-            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(2));
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(2));
 
             var result2 = client.GetAsync(_url + "Get_c100_s100").Result;
-            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(4));
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(4));
 
             _server.Dispose();
         }
diff --git a/test/WebApi.OutputCache.V2.Tests/ConnegTests.cs b/test/WebApi.OutputCache.V2.Tests/ConnegTests.cs
@@ -42,15 +42,15 @@ public void subsequent_xml_request_is_not_cached()
             var client = new HttpClient(_server);
             var result = client.GetAsync(_url + "Get_c100_s100").Result;
 
-            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(2));
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_c100_s100:application/json; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x < DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:application/json; charset=utf-8")), Times.Exactly(2));
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:application/json; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x < DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());
 
             var req = new HttpRequestMessage(HttpMethod.Get, _url + "Get_c100_s100");
             req.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/xml"));
 
             var result2 = client.SendAsync(req).Result;
-            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "sample-get_c100_s100:text/xml; charset=utf-8")), Times.Exactly(2));
-            _cache.Verify(s => s.Add(It.Is<string>(x => x == "sample-get_c100_s100:text/xml; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x < DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());
+            _cache.Verify(s => s.Contains(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:text/xml; charset=utf-8")), Times.Exactly(2));
+            _cache.Verify(s => s.Add(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100:text/xml; charset=utf-8"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x < DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());
 
         }
             
diff --git a/test/WebApi.OutputCache.V2.Tests/InlineInvalidateTests.cs b/test/WebApi.OutputCache.V2.Tests/InlineInvalidateTests.cs
@@ -44,7 +44,7 @@ public void inline_call_to_invalidate_is_correct()
 
             var result = client.PostAsync(_url + "Post", new StringContent(string.Empty)).Result;
 
-            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "inlineinvalidate-get_c100_s100")), Times.Exactly(1));
+            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.inlineinvalidatecontroller-get_c100_s100")), Times.Exactly(1));
         }
 
         [Test]
@@ -53,7 +53,7 @@ public void inline_call_to_invalidate_using_expression_tree_is_correct()
             var client = new HttpClient(_server);
             var result = client.PutAsync(_url + "Put", new StringContent(string.Empty)).Result;
 
-            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "inlineinvalidate-get_c100_s100")), Times.Exactly(1));
+            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.inlineinvalidatecontroller-get_c100_s100")), Times.Exactly(1));
         }
 
         [Test]
@@ -62,7 +62,7 @@ public void inline_call_to_invalidate_using_expression_tree_with_param_is_correc
             var client = new HttpClient(_server);
             var result = client.DeleteAsync(_url + "Delete_parameterized").Result;
 
-            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "inlineinvalidate-get_c100_s100_with_param")), Times.Exactly(1));
+            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.inlineinvalidatecontroller-get_c100_s100_with_param")), Times.Exactly(1));
         }
 
         [Test]
@@ -71,7 +71,7 @@ public void inline_call_to_invalidate_using_expression_tree_with_custom_action_n
             var client = new HttpClient(_server);
             var result = client.DeleteAsync(_url + "Delete_non_standard_name").Result;
 
-            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "inlineinvalidate-getbyid")), Times.Exactly(1));
+            _cache.Verify(s => s.RemoveStartsWith(It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.inlineinvalidatecontroller-getbyid")), Times.Exactly(1));
         }
 
         [TearDown]
diff --git a/test/WebApi.OutputCache.V2.Tests/InvalidateTests.cs b/test/WebApi.OutputCache.V2.Tests/InvalidateTests.cs
diff --git a/test/WebApi.OutputCache.V2.Tests/ServerSideTests.cs b/test/WebApi.OutputCache.V2.Tests/ServerSideTests.cs
diff --git a/test/WebApi.OutputCache.V2.Tests/TestControllers/InlineInvalidateController.cs b/test/WebApi.OutputCache.V2.Tests/TestControllers/InlineInvalidateController.cs
diff --git a/test/WebApi.OutputCache.V2.Tests/TestControllers/SampleController.cs b/test/WebApi.OutputCache.V2.Tests/TestControllers/SampleController.cs

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,18 @@ namespace WebApi.OutputCache.Core.Cache`
`6`	`6`	`public interface IApiOutputCache`
`7`	`7`	`{`
`8`	`8`	`void RemoveStartsWith(string key);`
	`9`	`+`
`9`	`10`	`T Get<T>(string key) where T : class;`
	`11`	`+`
	`12`	`+ [Obsolete("Use Get<T> instead")]`
`10`	`13`	`object Get(string key);`
	`14`	`+`
`11`	`15`	`void Remove(string key);`
	`16`	`+`
`12`	`17`	`bool Contains(string key);`
	`18`	`+`
`13`	`19`	`void Add(string key, object o, DateTimeOffset expiration, string dependsOnKey = null);`
	`20`	`+`
`14`	`21`	`IEnumerable<string> AllKeys { get; }`
`15`	`22`	`}`
`16`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public T Get<T>(string key) where T : class`
`23`	`23`	`return o;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ [Obsolete("Use Get<T> instead")]`
`26`	`27`	`public object Get(string key)`
`27`	`28`	`{`
`28`	`29`	`return Cache.Get(key);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public string MakeBaseCachekey<T, U>(Expression<Func<T, U>> expression)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- return string.Format("{0}-{1}", typeof(T).Name.Replace("Controller",string.Empty).ToLower(), methodName.ToLower());`
	`57`	`+ return string.Format("{0}-{1}", typeof(T).FullName.ToLower(), methodName.ToLower());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private static ICacheKeyGenerator TryActivateCacheKeyGenerator(Type generatorType)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class DefaultCacheKeyGenerator : ICacheKeyGenerator`
`13`	`13`	`{`
`14`	`14`	`public virtual string MakeCacheKey(HttpActionContext context, MediaTypeHeaderValue mediaType, bool excludeQueryString = false)`
`15`	`15`	`{`
`16`		`- var controller = context.ControllerContext.ControllerDescriptor.ControllerName;`
	`16`	`+ var controller = context.ControllerContext.ControllerDescriptor.ControllerType.FullName;`
`17`	`17`	`var action = context.ActionDescriptor.ActionName;`
`18`	`18`	`var key = context.Request.GetConfiguration().CacheOutputConfiguration().MakeBaseCachekey(controller, action);`
`19`	`19`	`var actionParameters = context.ActionArguments.Where(x => x.Value != null).Select(x => x.Key + "=" + GetValue(x.Value));`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public InvalidateCacheOutputAttribute(string methodName, Type type = null)`
`24`	`24`	`public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)`
`25`	`25`	`{`
`26`	`26`	`if (actionExecutedContext.Response != null && !actionExecutedContext.Response.IsSuccessStatusCode) return;`
`27`		`- _controller = _controller ?? actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerName;`
	`27`	`+ _controller = _controller ?? actionExecutedContext.ActionContext.ControllerContext.ControllerDescriptor.ControllerType.FullName;`
`28`	`28`
`29`	`29`	`var config = actionExecutedContext.Request.GetConfiguration();`
`30`	`30`	`EnsureCache(config, actionExecutedContext.Request);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void selected_generator_with_internal_registration_is_used()`
`89`	`89`	`var client = new HttpClient(_server);`
`90`	`90`	`var result = client.GetAsync(_url + "cachekey/get_internalregistered").Result;`
`91`	`91`
`92`		`- _cache.Verify(s => s.Add(It.Is<string>(x => x == "internal"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_internalregistered")), Times.Once());`
	`92`	`+ _cache.Verify(s => s.Add(It.Is<string>(x => x == "internal"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_internalregistered")), Times.Once());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public void custom_default_cache_key_generator_called_and_key_used()`
`66`	`66`	`var result = client.GetAsync(_url + "sample/Get_c100_s100").Result;`
`67`	`67`
`68`	`68`	`_cache.Verify(s => s.Contains(It.Is<string>(x => x == "keykeykey")), Times.Exactly(2));`
`69`		`- _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());`
`70`		`- _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "sample-get_c100_s100")), Times.Once());`
	`69`	`+ _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());`
	`70`	`+ _cache.Verify(s => s.Add(It.Is<string>(x => x == "keykeykey:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.samplecontroller-get_c100_s100")), Times.Once());`
`71`	`71`
`72`	`72`	`_keyGeneratorA.VerifyAll();`
`73`	`73`	`}`
`@@ -79,8 +79,8 @@ public void custom_cache_key_generator_called()`
`79`	`79`	`var result = client.GetAsync(_url + "cachekey/get_custom_key").Result;`
`80`	`80`
`81`	`81`	`_cache.Verify(s => s.Contains(It.Is<string>(x => x == "custom_key")), Times.Exactly(2));`
`82`		`- _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_custom_key")), Times.Once());`
`83`		`- _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "cachekey-get_custom_key")), Times.Once());`
	`82`	`+ _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key"), It.IsAny<byte[]>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_custom_key")), Times.Once());`
	`83`	`+ _cache.Verify(s => s.Add(It.Is<string>(x => x == "custom_key:response-ct"), It.IsAny<object>(), It.Is<DateTimeOffset>(x => x <= DateTime.Now.AddSeconds(100)), It.Is<string>(x => x == "webapi.outputcache.v2.tests.testcontrollers.cachekeycontroller-get_custom_key")), Times.Once());`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`