Code-style clean-ups: simplify some defaults (App-vNext#704)

yangzhinong · Nov 27, 2019 · c495de9 · c495de9
1 parent 268ccdc
commit c495de9
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 47 deletions.
diff --git a/src/Polly.Specs/Caching/CacheAsyncSpecs.cs b/src/Polly.Specs/Caching/CacheAsyncSpecs.cs
@@ -235,7 +235,7 @@ public async Task Should_allow_custom_ICacheKeyStrategy()
         [Fact]
         public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_reference_type()
         {
-            ResultClass valueToReturn = default(ResultClass);
+            ResultClass valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             IAsyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -255,7 +255,7 @@ public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_n
         [Fact]
         public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_reference_type()
         {
-            ResultClass valueToReturnFromCache = default(ResultClass);
+            ResultClass valueToReturnFromCache = default;
             ResultClass valueToReturnFromExecution = new ResultClass(ResultPrimitive.Good);
             const string operationKey = "SomeOperationKey";
 
@@ -280,7 +280,7 @@ public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cac
         [Fact]
         public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturn = default(ResultPrimitive);
+            ResultPrimitive valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             IAsyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -300,7 +300,7 @@ public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_n
         [Fact]
         public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturnFromCache = default(ResultPrimitive);
+            ResultPrimitive valueToReturnFromCache = default;
             ResultPrimitive valueToReturnFromExecution = ResultPrimitive.Good;
             valueToReturnFromExecution.Should().NotBe(valueToReturnFromCache);
             const string operationKey = "SomeOperationKey";

diff --git a/src/Polly.Specs/Caching/CacheSpecs.cs b/src/Polly.Specs/Caching/CacheSpecs.cs
@@ -232,7 +232,7 @@ public void Should_allow_custom_ICacheKeyStrategy()
         [Fact]
         public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_reference_type()
         {
-            ResultClass valueToReturn = default(ResultClass);
+            ResultClass valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             ISyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -252,7 +252,7 @@ public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hol
         [Fact]
         public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_reference_type()
         {
-            ResultClass valueToReturnFromCache = default(ResultClass);
+            ResultClass valueToReturnFromCache = default;
             ResultClass valueToReturnFromExecution = new ResultClass(ResultPrimitive.Good);
             const string operationKey = "SomeOperationKey";
 
@@ -275,7 +275,7 @@ public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_hol
         [Fact]
         public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturn = default(ResultPrimitive);
+            ResultPrimitive valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             ISyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -295,7 +295,7 @@ public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hol
         [Fact]
         public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturnFromCache = default(ResultPrimitive); 
+            ResultPrimitive valueToReturnFromCache = default; 
             ResultPrimitive valueToReturnFromExecution = ResultPrimitive.Good;
             valueToReturnFromExecution.Should().NotBe(valueToReturnFromCache);
             const string operationKey = "SomeOperationKey";

diff --git a/src/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs b/src/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs
@@ -236,7 +236,7 @@ public async Task Should_allow_custom_ICacheKeyStrategy()
         [Fact]
         public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_reference_type()
         {
-            ResultClass valueToReturn = default(ResultClass);
+            ResultClass valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             IAsyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -256,7 +256,7 @@ public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_n
         [Fact]
         public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_reference_type()
         {
-            ResultClass valueToReturnFromCache = default(ResultClass);
+            ResultClass valueToReturnFromCache = default;
             ResultClass valueToReturnFromExecution = new ResultClass(ResultPrimitive.Good);
             const string operationKey = "SomeOperationKey";
 
@@ -281,7 +281,7 @@ public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cac
         [Fact]
         public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturn = default(ResultPrimitive);
+            ResultPrimitive valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             IAsyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -301,7 +301,7 @@ public async Task Should_execute_delegate_and_put_value_in_cache_if_cache_does_n
         [Fact]
         public async Task Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturnFromCache = default(ResultPrimitive);
+            ResultPrimitive valueToReturnFromCache = default;
             ResultPrimitive valueToReturnFromExecution = ResultPrimitive.Good;
             valueToReturnFromExecution.Should().NotBe(valueToReturnFromCache);
             const string operationKey = "SomeOperationKey";

diff --git a/src/Polly.Specs/Caching/CacheTResultSpecs.cs b/src/Polly.Specs/Caching/CacheTResultSpecs.cs
@@ -232,7 +232,7 @@ public void Should_allow_custom_ICacheKeyStrategy()
         [Fact]
         public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_reference_type()
         {
-            ResultClass valueToReturn = default(ResultClass);
+            ResultClass valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             ISyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -252,7 +252,7 @@ public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hol
         [Fact]
         public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_reference_type()
         {
-            ResultClass valueToReturnFromCache = default(ResultClass);
+            ResultClass valueToReturnFromCache = default;
             ResultClass valueToReturnFromExecution = new ResultClass(ResultPrimitive.Good);
             const string operationKey = "SomeOperationKey";
 
@@ -275,7 +275,7 @@ public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_hol
         [Fact]
         public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hold_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturn = default(ResultPrimitive);
+            ResultPrimitive valueToReturn = default;
             const string operationKey = "SomeOperationKey";
 
             ISyncCacheProvider stubCacheProvider = new StubCacheProvider();
@@ -295,7 +295,7 @@ public void Should_execute_delegate_and_put_value_in_cache_if_cache_does_not_hol
         [Fact]
         public void Should_return_value_from_cache_and_not_execute_delegate_if_cache_holds_value__default_for_value_type()
         {
-            ResultPrimitive valueToReturnFromCache = default(ResultPrimitive);
+            ResultPrimitive valueToReturnFromCache = default;
             ResultPrimitive valueToReturnFromExecution = ResultPrimitive.Good;
             valueToReturnFromExecution.Should().NotBe(valueToReturnFromCache);
             const string operationKey = "SomeOperationKey";

diff --git a/src/Polly.Specs/Caching/SerializingCacheProviderAsyncSpecs.cs b/src/Polly.Specs/Caching/SerializingCacheProviderAsyncSpecs.cs
@@ -78,7 +78,7 @@ public async Task Single_generic_SerializingCacheProvider_should_serialize_on_pu
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            object objectToCache = default(object);
+            object objectToCache = default;
             string key = "some key";
 
             AsyncSerializingCacheProvider<StubSerialized> serializingCacheProvider = new AsyncSerializingCacheProvider<StubSerialized>(stubCacheProvider.AsyncFor<StubSerialized>(), stubSerializer);
@@ -134,7 +134,7 @@ public async Task Single_generic_SerializingCacheProvider_should_not_deserialize
 
             cacheHit.Should().BeFalse();
             deserializeInvoked.Should().BeFalse();
-            fromCache.Should().Be(default(object));
+            fromCache.Should().Be(default);
         }
 
         [Fact]
@@ -170,7 +170,7 @@ public async Task Single_generic_SerializingCacheProvider_from_extension_syntax_
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            object objectToCache = default(object);
+            object objectToCache = default;
             string key = "some key";
 
             AsyncSerializingCacheProvider<StubSerialized> serializingCacheProvider = stubCacheProvider.AsyncFor<StubSerialized>().WithSerializer(stubSerializer);
@@ -225,7 +225,7 @@ public async Task Single_generic_SerializingCacheProvider_from_extension_syntax_
 
             cacheHit.Should().BeFalse();
             deserializeInvoked.Should().BeFalse();
-            fromCache.Should().Be(default(object));
+            fromCache.Should().Be(default);
         }
 
         #endregion
@@ -297,7 +297,7 @@ public async Task Double_generic_SerializingCacheProvider_should_serialize_on_pu
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            ResultPrimitive objectToCache = default(ResultPrimitive);
+            ResultPrimitive objectToCache = default;
             string key = "some key";
 
             AsyncSerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>> serializingCacheProvider = new AsyncSerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>>(stubCacheProvider.AsyncFor<StubSerialized<ResultPrimitive>>(), stubTResultSerializer);
@@ -388,7 +388,7 @@ public async Task Double_generic_SerializingCacheProvider_from_extension_syntax_
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            ResultPrimitive objectToCache = default(ResultPrimitive);
+            ResultPrimitive objectToCache = default;
             string key = "some key";
 
             AsyncSerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>> serializingCacheProvider =

diff --git a/src/Polly.Specs/Caching/SerializingCacheProviderSpecs.cs b/src/Polly.Specs/Caching/SerializingCacheProviderSpecs.cs
@@ -76,7 +76,7 @@ public void Single_generic_SerializingCacheProvider_should_serialize_on_put_for_
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            object objectToCache = default(object);
+            object objectToCache = default;
             string key = "some key";
 
             SerializingCacheProvider<StubSerialized> serializingCacheProvider = new SerializingCacheProvider<StubSerialized>(stubCacheProvider.For<StubSerialized>(), stubSerializer);
@@ -132,7 +132,7 @@ public void Single_generic_SerializingCacheProvider_should_not_deserialize_on_ge
 
             cacheHit.Should().BeFalse();
             deserializeInvoked.Should().BeFalse();
-            fromCache.Should().Be(default(object));
+            fromCache.Should().Be(default);
         }
 
         [Fact]
@@ -168,7 +168,7 @@ public void Single_generic_SerializingCacheProvider_from_extension_syntax_should
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            object objectToCache = default(object);
+            object objectToCache = default;
             string key = "some key";
 
             SerializingCacheProvider<StubSerialized> serializingCacheProvider = stubCacheProvider.For<StubSerialized>().WithSerializer(stubSerializer);
@@ -223,7 +223,7 @@ public void Single_generic_SerializingCacheProvider_from_extension_syntax_should
 
             cacheHit.Should().BeFalse();
             deserializeInvoked.Should().BeFalse();
-            fromCache.Should().Be(default(object));
+            fromCache.Should().Be(default);
         }
 
         #endregion
@@ -295,7 +295,7 @@ public void Double_generic_SerializingCacheProvider_should_serialize_on_put_for_
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            ResultPrimitive objectToCache = default(ResultPrimitive);
+            ResultPrimitive objectToCache = default;
             string key = "some key";
 
             SerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>> serializingCacheProvider = new SerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>>(stubCacheProvider.For<StubSerialized<ResultPrimitive>>(), stubTResultSerializer);
@@ -387,7 +387,7 @@ public void Double_generic_SerializingCacheProvider_from_extension_syntax_should
                 deserialize: s => s.Original
             );
             StubCacheProvider stubCacheProvider = new StubCacheProvider();
-            ResultPrimitive objectToCache = default(ResultPrimitive);
+            ResultPrimitive objectToCache = default;
             string key = "some key";
 
             SerializingCacheProvider<ResultPrimitive, StubSerialized<ResultPrimitive>> serializingCacheProvider =

diff --git a/src/Polly.Specs/Helpers/Bulkhead/TraceableAction.cs b/src/Polly.Specs/Helpers/Bulkhead/TraceableAction.cs
@@ -106,7 +106,7 @@ public Task<TResult> ExecuteOnBulkhead<TResult>(BulkheadPolicy<TResult> bulkhead
             }
             Status = TraceableActionStatus.StartRequested;
 
-            TResult result = default(TResult);
+            TResult result = default;
             return Task.Factory.StartNew(() =>
             {
                 try
@@ -121,7 +121,7 @@ public Task<TResult> ExecuteOnBulkhead<TResult>(BulkheadPolicy<TResult> bulkhead
 
                         _testOutputHelper.WriteLine(_id + "Exiting execution.");
 
-                        return default(TResult);
+                        return default;
                     }, CancellationSource.Token);
                 }
                 catch (BulkheadRejectedException)
@@ -214,7 +214,7 @@ public Task<TResult> ExecuteOnBulkheadAsync<TResult>(AsyncBulkheadPolicy<TResult
             }
             Status = TraceableActionStatus.StartRequested;
 
-            TResult result = default(TResult);
+            TResult result = default;
             return Task.Factory.StartNew(async () =>
             {
                 try
@@ -229,7 +229,7 @@ public Task<TResult> ExecuteOnBulkheadAsync<TResult>(AsyncBulkheadPolicy<TResult
 
                         _testOutputHelper.WriteLine(_id + "Exiting execution.");
 
-                        return default(TResult);
+                        return default;
                     }, CancellationSource.Token).ConfigureAwait(true); 
                 }
                 catch (BulkheadRejectedException)

diff --git a/src/Polly.Specs/Helpers/ContextualPolicyExtensionsAsync.cs b/src/Polly.Specs/Helpers/ContextualPolicyExtensionsAsync.cs
@@ -9,7 +9,7 @@ namespace Polly.Specs.Helpers
     public static class ContextualPolicyExtensionsAsync
     {
 
-        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, int numberOfTimesToRaiseException, IDictionary<string, object> contextData, Action<TException, int> configureException = null, CancellationToken cancellationToken = default(CancellationToken)) where TException : Exception, new()
+        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, int numberOfTimesToRaiseException, IDictionary<string, object> contextData, Action<TException, int> configureException = null, CancellationToken cancellationToken = default) where TException : Exception, new()
         {
             int counter = 0;
 
@@ -29,7 +29,7 @@ public static class ContextualPolicyExtensionsAsync
             }, contextData, cancellationToken);
         }
 
-        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, IDictionary<string, object> contextData, Action<TException, int> configureException = null, CancellationToken cancellationToken = default(CancellationToken)) where TException : Exception, new()
+        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, IDictionary<string, object> contextData, Action<TException, int> configureException = null, CancellationToken cancellationToken = default) where TException : Exception, new()
         {
             return policy.RaiseExceptionAsync(1, contextData, configureException, cancellationToken);
         }

diff --git a/src/Polly.Specs/Helpers/PolicyExtensionsAsync.cs b/src/Polly.Specs/Helpers/PolicyExtensionsAsync.cs
@@ -33,7 +33,7 @@ public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, TExc
             return policy.RaiseExceptionAsync(1, configureException);
         }
 
-        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, int numberOfTimesToRaiseException, Action<TException, int> configureException = null, CancellationToken cancellationToken = default(CancellationToken)) where TException : Exception, new()
+        public static Task RaiseExceptionAsync<TException>(this AsyncPolicy policy, int numberOfTimesToRaiseException, Action<TException, int> configureException = null, CancellationToken cancellationToken = default) where TException : Exception, new()
         {
             ExceptionAndOrCancellationScenario scenario = new ExceptionAndOrCancellationScenario
             {

diff --git a/src/Polly.Specs/Helpers/PolicyTResultExtensionsAsync.cs b/src/Polly.Specs/Helpers/PolicyTResultExtensionsAsync.cs
@@ -17,7 +17,7 @@ public static Task<TResult> RaiseResultSequenceAsync<TResult>(this AsyncPolicy<T
 
         public static Task<TResult> RaiseResultSequenceAsync<TResult>(this AsyncPolicy<TResult> policy, IEnumerable<TResult> resultsToRaise)
         {
-            return policy.RaiseResultSequenceAsync(default(CancellationToken), resultsToRaise);
+            return policy.RaiseResultSequenceAsync(default, resultsToRaise);
         }
 
         public static async Task<TResult> RaiseResultSequenceAsync<TResult>(this AsyncPolicy<TResult> policy,

diff --git a/src/Polly/Caching/AsyncCacheEngine.cs b/src/Polly/Caching/AsyncCacheEngine.cs
@@ -37,7 +37,7 @@ internal static async Task<TResult> ImplementationAsync<TResult>(
             catch (Exception ex)
             {
                 cacheHit = false;
-                valueFromCache = default(TResult);
+                valueFromCache = default;
                 onCacheGetError(context, cacheKey, ex);
             }
             if (cacheHit)

diff --git a/src/Polly/Caching/AsyncSerializingCacheProvider.cs b/src/Polly/Caching/AsyncSerializingCacheProvider.cs
@@ -100,7 +100,7 @@ public AsyncSerializingCacheProvider(IAsyncCacheProvider<TSerialized> wrappedCac
         public async Task<(bool, TResult)> TryGetAsync(string key, CancellationToken cancellationToken, bool continueOnCapturedContext)
         {
             (bool cacheHit, TSerialized objectToDeserialize) = await _wrappedCacheProvider.TryGetAsync(key, cancellationToken, continueOnCapturedContext).ConfigureAwait(continueOnCapturedContext);
-            return (cacheHit, cacheHit ? _serializer.Deserialize(objectToDeserialize) : default(TResult));
+            return (cacheHit, cacheHit ? _serializer.Deserialize(objectToDeserialize) : default);
         }
 
         /// <summary>

diff --git a/src/Polly/Caching/CacheEngine.cs b/src/Polly/Caching/CacheEngine.cs
@@ -35,7 +35,7 @@ internal static TResult Implementation<TResult>(
             catch (Exception ex)
             {
                 cacheHit = false;
-                valueFromCache = default(TResult);
+                valueFromCache = default;
                 onCacheGetError(context, cacheKey, ex);
             }
             if (cacheHit)