obsolete Get() in favor of Get<T> on IApiOutputCache

Author: filipw

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; }
     }
 }

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);

src/WebApi.OutputCache.V2/CacheOutputAttribute.cs

@@ -150,7 +150,7 @@ public override void OnActionExecuting(HttpActionContext actionContext)
 
             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))
@@ -164,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);

test/WebApi.OutputCache.V2.Tests/ServerSideTests.cs

@@ -237,7 +237,7 @@ public void no_caching_if_user_authenticated_and_flag_set_to_off()
         public void etag_match_304_if_none_match()
         {
             _cache.Setup(x => x.Contains(It.Is<string>(i => i.Contains("etag_match_304")))).Returns(true);
-            _cache.Setup(x => x.Get(It.Is<string>(i => i.Contains("etag_match_304") && i.Contains(Constants.EtagKey))))
+            _cache.Setup(x => x.Get<string>(It.Is<string>(i => i.Contains("etag_match_304") && i.Contains(Constants.EtagKey))))
                   .Returns(@"""abc""");
 
             var client = new HttpClient(_server);
@@ -254,8 +254,9 @@ public void etag_match_304_if_none_match()
         public void etag_not_match_304_if_none_match()
         {
             _cache.Setup(x => x.Contains(It.Is<string>(i => i.Contains("etag_match_304")))).Returns(true);
-            _cache.Setup(x => x.Get(It.Is<string>(i => i.Contains("etag_match_304") && i.Contains(Constants.EtagKey))))
-                  .Returns((object)new EntityTagHeaderValue(@"""abcdef"""));
+            _cache.Setup(x => x.Get<byte[]>(It.IsAny<string>())).Returns((byte[])null);
+            _cache.Setup(x => x.Get<string>(It.Is<string>(i => i.Contains("etag_match_304") && i.Contains(Constants.EtagKey))))
+                  .Returns(@"""abcdef""");
 
             var client = new HttpClient(_server);
             var req = new HttpRequestMessage(HttpMethod.Get, _url + "etag_match_304");