Merge pull request #394 from App-vNext/v570dev

Merge v5.7.0dev branch to master
App-vNext · Jan 6, 2018 · 32c6228 · 32c6228
2 parents 64095be + 4df2018
commit 32c6228
Show file tree

Hide file tree

Showing 37 changed files with 2,000 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+
+## 5.7.0
+- Minor cache fixes
+- Add ability to calculate cache Ttl based on item to cache
+- Allow user-created custom policies 
+
 ## 5.6.1
 - Extend PolicyWrap syntax with interfaces
 

diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
@@ -1 +1 @@
-next-version: 5.6.1
+next-version: 5.7.0
diff --git a/README.md b/README.md
@@ -951,6 +951,7 @@ For details of changes by release see the [change log](https://github.com/App-vN
 * [@reisenberger](https://github.com/reisenberger) - Add new .HandleInner<TException>(...) syntax for handling inner exceptions natively.
 * [@rjongeneelen](https://github.com/rjongeneelen) and [@reisenberger](https://github.com/reisenberger) - Allow PolicyWrap configuration to configure policies via interfaces. 
 * [@reisenberger](https://github.com/reisenberger) - Performance improvements.
+* [@awarrenlove](https://github.com/awarrenlove) - Add ability to calculate cache Ttl based on item to cache.
 
 # Sample Projects
 

diff --git a/build.cake b/build.cake
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -92,12 +92,16 @@ Teardown(_ =>
 Task("__Clean")
     .Does(() =>
 {
-    CleanDirectories(new DirectoryPath[] {
+    DirectoryPath[] cleanDirectories = new DirectoryPath[] {
         buildDir,
-        artifactsDir,
         testResultsDir,
-        nupkgDestDir
-  	});
+        nupkgDestDir,
+        artifactsDir
+  	};
+
+    CleanDirectories(cleanDirectories);
+
+    foreach(var path in cleanDirectories) { EnsureDirectoryExists(path); }
 
     foreach(var path in solutionPaths)
     {

diff --git a/src/Polly.Net40Async.nuspec b/src/Polly.Net40Async.nuspec
@@ -15,6 +15,12 @@
     <releaseNotes>
      v5.0 is a major release with significant new resilience policies: Timeout; Bulkhead Isolation; Fallback; Cache; and PolicyWrap.  See release notes back to v5.0.0 for full details.
 
+     5.7.0
+     ---------------------
+     - Minor cache fixes
+     - Add ability to calculate cache Ttl based on item to cache
+     - Allow user-created custom policies
+
      5.6.1
      ---------------------
      - Extend PolicyWrap syntax with interfaces

diff --git a/src/Polly.NetStandard11/Properties/AssemblyInfo.cs b/src/Polly.NetStandard11/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Polly")]
-[assembly: AssemblyVersion("5.6.1.0")]
+[assembly: AssemblyVersion("5.7.0.0")]
 [assembly: CLSCompliant(true)]
 
 [assembly: InternalsVisibleTo("Polly.NetStandard11.Specs")]
diff --git a/src/Polly.Shared/Caching/CacheEngine.cs b/src/Polly.Shared/Caching/CacheEngine.cs
@@ -7,7 +7,7 @@ internal static partial class CacheEngine
     {
         internal static TResult Implementation<TResult>(
             ISyncCacheProvider<TResult> cacheProvider,
-            ITtlStrategy ttlStrategy,
+            ITtlStrategy<TResult> ttlStrategy,
             Func<Context, string> cacheKeyStrategy,
             Func<Context, CancellationToken, TResult> action,
             Context context,
@@ -48,8 +48,8 @@ internal static TResult Implementation<TResult>(
 
             TResult result = action(context, cancellationToken);
 
-            Ttl ttl = ttlStrategy.GetTtl(context);
-            if (ttl.Timespan > TimeSpan.Zero)
+            Ttl ttl = ttlStrategy.GetTtl(context, result);
+            if (ttl.Timespan > TimeSpan.Zero && result != null && !result.Equals(default(TResult)))
             {
                 try
                 {

diff --git a/src/Polly.Shared/Caching/CacheEngineAsync.cs b/src/Polly.Shared/Caching/CacheEngineAsync.cs
@@ -8,7 +8,7 @@ internal static partial class CacheEngine
     {
         internal static async Task<TResult> ImplementationAsync<TResult>(
             IAsyncCacheProvider<TResult> cacheProvider,
-            ITtlStrategy ttlStrategy,
+            ITtlStrategy<TResult> ttlStrategy,
             Func<Context, string> cacheKeyStrategy,
             Func<Context, CancellationToken, Task<TResult>> action,
             Context context,
@@ -50,8 +50,8 @@ internal static async Task<TResult> ImplementationAsync<TResult>(
 
             TResult result = await action(context, cancellationToken).ConfigureAwait(continueOnCapturedContext);
 
-            Ttl ttl = ttlStrategy.GetTtl(context);
-            if (ttl.Timespan > TimeSpan.Zero)
+            Ttl ttl = ttlStrategy.GetTtl(context, result);
+            if (ttl.Timespan > TimeSpan.Zero && result != null && !result.Equals(default(TResult)))
             {
                 try
                 {

diff --git a/src/Polly.Shared/Caching/CachePolicy.cs b/src/Polly.Shared/Caching/CachePolicy.cs
@@ -55,7 +55,7 @@ public override TResult ExecuteInternal<TResult>(Func<Context, CancellationToken
         {
             return CacheEngine.Implementation<TResult>(
                 _syncCacheProvider.For<TResult>(), 
-                _ttlStrategy, 
+                _ttlStrategy.For<TResult>(),
                 _cacheKeyStrategy, 
                 action, 
                 context, 
@@ -75,7 +75,7 @@ public partial class CachePolicy<TResult> : Policy<TResult>, ICachePolicy<TResul
     {
         internal CachePolicy(
             ISyncCacheProvider<TResult> syncCacheProvider, 
-            ITtlStrategy ttlStrategy,
+            ITtlStrategy<TResult> ttlStrategy,
             Func<Context, string> cacheKeyStrategy,
             Action<Context, string> onCacheGet,
             Action<Context, string> onCacheMiss,

diff --git a/src/Polly.Shared/Caching/CachePolicyAsync.cs b/src/Polly.Shared/Caching/CachePolicyAsync.cs
@@ -47,7 +47,7 @@ public override Task<TResult> ExecuteAsyncInternal<TResult>(Func<Context, Cancel
         {
             return CacheEngine.ImplementationAsync<TResult>(
                 _asyncCacheProvider.AsyncFor<TResult>(), 
-                _ttlStrategy, 
+                _ttlStrategy.For<TResult>(), 
                 _cacheKeyStrategy, 
                 action, 
                 context, 
@@ -65,7 +65,7 @@ public partial class CachePolicy<TResult>
     {
         internal CachePolicy(
             IAsyncCacheProvider<TResult> asyncCacheProvider, 
-            ITtlStrategy ttlStrategy,
+            ITtlStrategy<TResult> ttlStrategy,
             Func<Context, string> cacheKeyStrategy,
             Action<Context, string> onCacheGet,
             Action<Context, string> onCacheMiss,