Fallbacks, automatic/general invalidation, Redis Optimizations, IScopedCache

AopCaching.UnitTests/Mocks/MockCache.cs

@@ -97,12 +97,12 @@ protected override bool TryGetInner<TValue>(string key, out TValue value)
                 {
                     hits++;
                     // ReSharper disable once CanBeReplacedWithTryCastAndCheckForNull
-                    value = item.Value is TValue ? (TValue)item.Value : default(TValue);
+                    value = item.Value is TValue ? (TValue)item.Value : default;
                     return true;
                 }
 
                 misses++;
-                value = default(TValue);
+                value = default;
                 return false;
             }
 

AopCaching/AopCaching.csproj

@@ -1,29 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>PubComp.Caching.AopCaching</AssemblyName>
-    <RootNamespace>PubComp.Caching.AopCaching</RootNamespace>
-    <Version>4.4.2</Version>
-    <!--Only change AssemblyVersion for major versions!--><AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <FileVersion>4.4.2.0</FileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="PostSharp" Version="6.0.28" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="readme.txt" pack="true" PackagePath="." />
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="&quot;$(SolutionDir).NuGetPack\NuGetPack.exe&quot; &quot;$(ProjectPath)&quot; &quot;$(TargetPath)&quot; $(ConfigurationName)" />
-  </Target>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>PubComp.Caching.AopCaching</AssemblyName>
+    <RootNamespace>PubComp.Caching.AopCaching</RootNamespace>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>5.0.0</Version>
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+    <FileVersion>5.0.0.0</FileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="PostSharp" Version="6.0.28" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="&quot;$(SolutionDir).NuGetPack\NuGetPack.exe&quot; &quot;$(ProjectPath)&quot; &quot;$(TargetPath)&quot; $(ConfigurationName)" />
+  </Target>
 </Project>

AopCaching/CacheAttribute.cs

@@ -1,12 +1,12 @@
-using System;
-using System.Linq;
-using System.Threading;
-using PostSharp.Aspects;
+using PostSharp.Aspects;
 using PubComp.Caching.Core;
+using PubComp.Caching.Core.Attributes;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
-using PubComp.Caching.Core.Attributes;
 
 namespace PubComp.Caching.AopCaching
 {
@@ -71,8 +71,7 @@ public sealed override void OnInvoke(MethodInterceptionArgs args)
             }
 
             var cacheToUse = this.cache;
-
-            if (cacheToUse == null)
+            if (!cacheToUse.IsUseable())
             {
                 base.OnInvoke(args);
                 return;
@@ -94,18 +93,22 @@ public sealed override async Task OnInvokeAsync(MethodInterceptionArgs args)
             }
 
             var cacheToUse = this.cache;
-
-            if (cacheToUse == null)
+            if (!cacheToUse.IsUseable())
             {
-                await base.OnInvokeAsync(args);
-            }
-            else
-            {
-                var key = GetCacheKey(args);
-                var result = await cacheToUse.GetAsync(key, async () => { await base.OnInvokeAsync(args); return args.ReturnValue; });
-                var returnType = GetReturnType(args.Method);
-                args.ReturnValue = SafeCasting.CastTo(returnType, result);
+                await base.OnInvokeAsync(args).ConfigureAwait(false);
+                return;
             }
+
+            var key = GetCacheKey(args);
+            var result = await cacheToUse
+                .GetAsync(key, async () =>
+                {
+                    await base.OnInvokeAsync(args).ConfigureAwait(false);
+                    return args.ReturnValue;
+                })
+                .ConfigureAwait(false);
+            var returnType = GetReturnType(args.Method);
+            args.ReturnValue = SafeCasting.CastTo(returnType, result);
         }
 
         private string GetCacheKey(MethodInterceptionArgs args)
@@ -125,7 +128,7 @@ private string GetCacheKey(MethodInterceptionArgs args)
             var key = new CacheKey(classNameNonGeneric, this.methodName, parameterTypeNamesNonGeneric, parameterValues, genericArgumentTypeNames).ToString();
             return key;
         }
-        
+
         private static Type GetReturnType(MethodBase method)
         {
             var returnType = (method as MethodInfo)?.ReturnType;

AopCaching/CacheListAttribute.cs

@@ -213,8 +213,7 @@ public sealed override void OnInvoke(MethodInterceptionArgs args)
             }
 
             var cacheToUse = this.cache;
-
-            if (cacheToUse == null)
+            if (!cacheToUse.IsUseable())
             {
                 base.OnInvoke(args);
                 return;
@@ -252,16 +251,28 @@ public sealed override void OnInvoke(MethodInterceptionArgs args)
                 return;
             }
 
+            var newValuesTimestamp = DateTimeOffset.UtcNow;
+
             args.Arguments[this.keyParameterNumber] = missingKeys;
             base.OnInvoke(args);
-            var resultsFromerInner = args.ReturnValue;
-            addDataRange.Invoke(resultList, new [] { resultsFromerInner });
+            var resultsFromInner = args.ReturnValue;
+            addDataRange.Invoke(resultList, new [] { resultsFromInner });
 
-            var values = GetKeyValues(args, resultsFromerInner, parameterValues);
+            var values = GetKeyValues(args, resultsFromInner, parameterValues);
 
-            foreach (var value in values)
+            if (cacheToUse is IScopedCache scopedCacheToUse)
             {
-                cacheToUse.Set(value.Key, value.Value);
+                foreach (var value in values)
+                {
+                    scopedCacheToUse.SetScoped(value.Key, value.Value, newValuesTimestamp);
+                }
+            }
+            else
+            {
+                foreach (var value in values)
+                {
+                    cacheToUse.Set(value.Key, value.Value);
+                }
             }
 
             args.ReturnValue = resultList;
@@ -276,8 +287,7 @@ public sealed override async Task OnInvokeAsync(MethodInterceptionArgs args)
             }
 
             var cacheToUse = this.cache;
-
-            if (cacheToUse == null)
+            if (!cacheToUse.IsUseable())
             {
                 await base.OnInvokeAsync(args).ConfigureAwait(false);
                 return;
@@ -315,20 +325,32 @@ public sealed override async Task OnInvokeAsync(MethodInterceptionArgs args)
                 return;
             }
 
+            var newValuesTimestamp = DateTimeOffset.UtcNow;
+
             args.Arguments[this.keyParameterNumber] = missingKeys;
             await base.OnInvokeAsync(args).ConfigureAwait(false);
             var resultsFromerInner = args.ReturnValue;
             addDataRange.Invoke(resultList, new [] { resultsFromerInner });
 
             var values = GetKeyValues(args, resultsFromerInner, parameterValues);
 
-            var tasks = values.Select(async x => await cacheToUse.SetAsync(x.Key, x.Value).ConfigureAwait(false));
-            await Task.WhenAll(tasks).ConfigureAwait(false);
+            if (cacheToUse is IScopedCache scopedCacheToUse)
+            {
+                var tasks = values.Select(async x => await scopedCacheToUse
+                    .SetScopedAsync(x.Key, x.Value, newValuesTimestamp).ConfigureAwait(false));
+                await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
+            else
+            {
+                var tasks = values.Select(async x => await cacheToUse
+                    .SetAsync(x.Key, x.Value).ConfigureAwait(false));
+                await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
 
             args.ReturnValue = resultList;
         }
 
-        private Dictionary<string, object> GetKeyValues(MethodInterceptionArgs args, object resultsFromerInner, object[] parameterValues)
+        private Dictionary<string, object> GetKeyValues(MethodInterceptionArgs args, object resultsFromInner, object[] parameterValues)
         {
             var converter = createDataKeyConverter.Invoke(new object[0]);
 
@@ -341,7 +363,7 @@ private Dictionary<string, object> GetKeyValues(MethodInterceptionArgs args, obj
                 : args.Method.GetParameters().Select(p => p.ParameterType.FullName).ToArray();
 
             Dictionary<string, object> values = new Dictionary<string, object>();
-            foreach (object result in resultsFromerInner as IEnumerable)
+            foreach (object result in resultsFromInner as IEnumerable)
             {
                 var k = convertDataToKey.Invoke(converter, new[] {result});
 

Caching.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{57585B9A-7003-461A-B812-CA48603C839F}"
 EndProject
@@ -49,6 +49,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestHost.WebApi", "WebApi\T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiExtended.NETCore", "WebApiExtended.NETCore\WebApiExtended.NETCore.csproj", "{FAF640A8-7284-4587-8908-560E3BBFB56F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiExtended.Swashbuckle", "WebApiExtended.Swashbuckle\WebApiExtended.Swashbuckle.csproj", "{C0F9B07A-F480-424F-AF19-DCA2FA288318}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiExtended.NETCore.Swashbuckle", "WebApiExtended.NETCore.Swashbuckle\WebApiExtended.NETCore.Swashbuckle.csproj", "{7F3FDEDB-48D7-4BB0-96BD-49107B6A6EC0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -111,6 +115,14 @@ Global
 		{FAF640A8-7284-4587-8908-560E3BBFB56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FAF640A8-7284-4587-8908-560E3BBFB56F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FAF640A8-7284-4587-8908-560E3BBFB56F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0F9B07A-F480-424F-AF19-DCA2FA288318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0F9B07A-F480-424F-AF19-DCA2FA288318}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0F9B07A-F480-424F-AF19-DCA2FA288318}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0F9B07A-F480-424F-AF19-DCA2FA288318}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F3FDEDB-48D7-4BB0-96BD-49107B6A6EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F3FDEDB-48D7-4BB0-96BD-49107B6A6EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F3FDEDB-48D7-4BB0-96BD-49107B6A6EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F3FDEDB-48D7-4BB0-96BD-49107B6A6EC0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Core.UnitTests/CacheControllerUtilTests.cs

@@ -14,6 +14,7 @@ public class CacheControllerUtilTests
         private Mocks.MockMemCache cache1;
         private Mocks.MockMemCache cache2;
         private Mocks.MockMemCache cache3;
+        private Mocks.MockMemCache cache4;
 
         [TestInitialize]
         public void TestInitialize()
@@ -32,6 +33,9 @@ public void TestInitialize()
             cache3 = new Mocks.MockMemCache(typeof(TestProvider).FullName);
             CacheManager.SetCache(cache3.Name, cache3);
 
+            cache4 = new Mocks.MockMemCache("mockCache*");
+            CacheManager.SetCache(cache4.Name, cache4);
+
             this.cacheControllerUtil = new CacheControllerUtilExposed();
             this.cacheControllerUtil.ClearRegistrations();
 
@@ -339,6 +343,34 @@ public void TestCacheRefreshItem_EmptyKey()
             this.cacheControllerUtil.RefreshCacheItem(string.Empty, null);
         }
 
+        [TestMethod]
+        public void TestCacheRefreshItemAopImpliedNamed()
+        {
+            this.cacheControllerUtil.RegisterCacheItem(
+                () => new TestProvider().GetData4("v1", 2, true), true);
+
+            Assert.AreEqual(0, cache4.Hits);
+            Assert.AreEqual(1, TestProvider.Hits4);
+
+            var result = new TestProvider().GetData4("v1", 2, true);
+            Assert.AreEqual("GetData-v1/2/True-1", result);
+            Assert.AreEqual(1, TestProvider.Hits4);
+            Assert.AreEqual(1, cache4.Hits);
+        }
+
+        [TestMethod]
+        public void TestCacheRefreshItemAopImpliedNamedNoCache()
+        {
+            this.cacheControllerUtil.RegisterCacheItem(
+                () => new TestProvider().GetData0("v1", 2, true), true);
+
+            Assert.AreEqual(1, TestProvider.Hits0);
+
+            var result = new TestProvider().GetData0("v1", 2, true);
+            Assert.AreEqual("GetData-v1/2/True-2", result);
+            Assert.AreEqual(2, TestProvider.Hits0);
+        }
+
         [TestMethod]
         public void TestCacheRefreshItemAopNamed()
         {
@@ -409,8 +441,10 @@ public class SubClass1 : BaseClass
         public class TestProvider
         {
             // ReSharper disable RedundantDefaultMemberInitializer
+            internal static int Hits0 = 0;
             internal static int Hits1 = 0;
             internal static int Hits2 = 0;
+            internal static int Hits4 = 0;
 
             [Cache("cache1")]
             public string GetData(string v1, int v2, bool v3)
@@ -425,6 +459,20 @@ public string GetData2(string v1, int v2, bool v3)
                 var hits = Interlocked.Increment(ref Hits2);
                 return string.Concat("GetData2-", v1, '/', v2, '/', v3, '-', hits);
             }
+
+            [Cache("cache0")]
+            public string GetData0(string v1, int v2, bool v3)
+            {
+                var hits = Interlocked.Increment(ref Hits0);
+                return string.Concat("GetData-", v1, '/', v2, '/', v3, '-', hits);
+            }
+
+            [Cache("mockCache0")]
+            public string GetData4(string v1, int v2, bool v3)
+            {
+                var hits = Interlocked.Increment(ref Hits4);
+                return string.Concat("GetData-", v1, '/', v2, '/', v3, '-', hits);
+            }
         }
 
         #endregion