Revert "Revert "Added default value for cancellation token in interfaces to keep existing usage possible. (#133)" (#138)"

This reverts commit 8f9a7e4.

Author: amerjusupovic

examples/ConsoleApp/FeatureFilters/AccountIdFilter.cs

@@ -18,7 +18,7 @@ namespace Consoto.Banking.AccountService.FeatureManagement
     [FilterAlias("AccountId")]
     class AccountIdFilter : IContextualFeatureFilter<IAccountContext>
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureEvaluationContext, IAccountContext accountContext, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureEvaluationContext, IAccountContext accountContext, CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(accountContext?.AccountId))
             {

examples/FeatureFlagDemo/BrowserFilter.cs

@@ -24,7 +24,7 @@ public BrowserFilter(IHttpContextAccessor httpContextAccessor)
             _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
         }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken)
         {
             BrowserFilterSettings settings = context.Parameters.Get<BrowserFilterSettings>() ?? new BrowserFilterSettings();
 

examples/FeatureFlagDemo/HttpContextTargetingContextAccessor.cs

@@ -24,7 +24,7 @@ public HttpContextTargetingContextAccessor(IHttpContextAccessor httpContextAcces
             _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
         }
 
-        public ValueTask<TargetingContext> GetContextAsync(CancellationToken _)
+        public ValueTask<TargetingContext> GetContextAsync(CancellationToken cancellationToken)
         {
             HttpContext httpContext = _httpContextAccessor.HttpContext;
 

examples/FeatureFlagDemo/SuperUserFilter.cs

@@ -9,7 +9,7 @@ namespace FeatureFlagDemo.FeatureManagement.FeatureFilters
 {
     public class SuperUserFilter : IFeatureFilter
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken)
         {
             return Task.FromResult(false);
         }

src/Microsoft.FeatureManagement/ConfigurationFeatureDefinitionProvider.cs

@@ -46,7 +46,7 @@ public void Dispose()
             _changeSubscription = null;
         }
 
-        public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken _)
+        public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken cancellationToken)
         {
             if (featureName == null)
             {
@@ -69,7 +69,7 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, Can
         // The async key word is necessary for creating IAsyncEnumerable.
         // The need to disable this warning occurs when implementaing async stream synchronously. 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-        public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync([EnumeratorCancellation] CancellationToken _)
+        public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
 #pragma warning restore CS1998
         {
             if (Interlocked.Exchange(ref _stale, 0) != 0)

src/Microsoft.FeatureManagement/EmptySessionManager.cs

@@ -11,12 +11,12 @@ namespace Microsoft.FeatureManagement
     /// </summary>
     class EmptySessionManager : ISessionManager
     {
-        public Task SetAsync(string featureName, bool enabled, CancellationToken _)
+        public Task SetAsync(string featureName, bool enabled, CancellationToken cancellationToken)
         {
             return Task.CompletedTask;
         }
 
-        public Task<bool?> GetAsync(string featureName, CancellationToken _)
+        public Task<bool?> GetAsync(string featureName, CancellationToken cancellationToken)
         {
             return Task.FromResult((bool?)null);
         }

src/Microsoft.FeatureManagement/IContextualFeatureFilter.cs

@@ -21,6 +21,6 @@ public interface IContextualFeatureFilter<TContext> : IFeatureFilterMetadata
         /// <param name="appContext">A context defined by the application that is passed in to the feature management system to provide contextual information for evaluating a feature's state.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>True if the filter's criteria has been met, false otherwise.</returns>
-        Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, TContext appContext, CancellationToken cancellationToken);
+        Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, TContext appContext, CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.FeatureManagement/IFeatureDefinitionProvider.cs

@@ -18,13 +18,13 @@ public interface IFeatureDefinitionProvider
         /// <param name="featureName">The name of the feature to retrieve the definition for.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>The feature's definition.</returns>	
-        Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken cancellationToken);
+        Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Retrieves definitions for all features.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>An enumerator which provides asynchronous iteration over feature definitions.</returns>
-        IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync(CancellationToken cancellationToken);
+        IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync(CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.FeatureManagement/IFeatureFilter.cs

@@ -17,6 +17,6 @@ public interface IFeatureFilter : IFeatureFilterMetadata
         /// <param name="context">A feature filter evaluation context that contains information that may be needed to evaluate the filter. This context includes configuration, if any, for this filter for the feature being evaluated.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>True if the filter's criteria has been met, false otherwise.</returns>
-        Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken);
+        Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.FeatureManagement/IFeatureManager.cs

@@ -17,15 +17,15 @@ public interface IFeatureManager
         /// </summary>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>An enumerator which provides asynchronous iteration over the feature names registered in the feature manager.</returns>
-        IAsyncEnumerable<string> GetFeatureNamesAsync(CancellationToken cancellationToken);
+        IAsyncEnumerable<string> GetFeatureNamesAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Checks whether a given feature is enabled.
         /// </summary>
         /// <param name="feature">The name of the feature to check.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>True if the feature is enabled, otherwise false.</returns>
-        Task<bool> IsEnabledAsync(string feature, CancellationToken cancellationToken);
+        Task<bool> IsEnabledAsync(string feature, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Checks whether a given feature is enabled.
@@ -34,6 +34,6 @@ public interface IFeatureManager
         /// <param name="context">A context providing information that can be used to evaluate whether a feature should be on or off.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>True if the feature is enabled, otherwise false.</returns>
-        Task<bool> IsEnabledAsync<TContext>(string feature, TContext context, CancellationToken cancellationToken);
+        Task<bool> IsEnabledAsync<TContext>(string feature, TContext context, CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.FeatureManagement/ISessionManager.cs

@@ -17,14 +17,14 @@ public interface ISessionManager
         /// <param name="featureName">The name of the feature.</param>
         /// <param name="enabled">The state of the feature.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
-        Task SetAsync(string featureName, bool enabled, CancellationToken cancellationToken);
+        Task SetAsync(string featureName, bool enabled, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Queries the session manager for the session's feature state, if any, for the given feature.
         /// </summary>
         /// <param name="featureName">The name of the feature.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>The state of the feature if it is present in the session, otherwise null.</returns>
-        Task<bool?> GetAsync(string featureName, CancellationToken cancellationToken);
+        Task<bool?> GetAsync(string featureName, CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.FeatureManagement/Targeting/ITargetingContextAccessor.cs

@@ -16,6 +16,6 @@ public interface ITargetingContextAccessor
         /// </summary>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>The current targeting context.</returns>
-        ValueTask<TargetingContext> GetContextAsync(CancellationToken cancellationToken);
+        ValueTask<TargetingContext> GetContextAsync(CancellationToken cancellationToken = default);
     }
 }

tests/Tests.FeatureManagement/ContextualTestFilter.cs

@@ -12,7 +12,7 @@ class ContextualTestFilter : IContextualFeatureFilter<IAccountContext>
     {
         public Func<FeatureFilterEvaluationContext, IAccountContext, bool> ContextualCallback { get; set; }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, IAccountContext accountContext, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, IAccountContext accountContext, CancellationToken cancellationToken)
         {
             return Task.FromResult(ContextualCallback?.Invoke(context, accountContext) ?? false);
         }

tests/Tests.FeatureManagement/InMemoryFeatureDefinitionProvider.cs

@@ -18,7 +18,7 @@ public InMemoryFeatureDefinitionProvider(IEnumerable<FeatureDefinition> featureD
         }
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-        public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync([EnumeratorCancellation] CancellationToken _)
+        public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
         {
             foreach (FeatureDefinition definition in _definitions)
@@ -27,7 +27,7 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync([
             }
         }
 
-        public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken _)
+        public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName, CancellationToken cancellationToken)
         {
             return Task.FromResult(_definitions.FirstOrDefault(definitions => definitions.Name.Equals(featureName, StringComparison.OrdinalIgnoreCase)));
         }

tests/Tests.FeatureManagement/InvalidFeatureFilter.cs

@@ -11,12 +11,12 @@ namespace Tests.FeatureManagement
     // Cannot implement more than one IFeatureFilter interface
     class InvalidFeatureFilter : IContextualFeatureFilter<IAccountContext>, IContextualFeatureFilter<object>
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, IAccountContext accountContext, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, IAccountContext accountContext, CancellationToken cancellationToken)
         {
             return Task.FromResult(false);
         }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, object appContext, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, object appContext, CancellationToken cancellationToken)
         {
             return Task.FromResult(false);
         }
@@ -26,12 +26,12 @@ public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterCont
     // Cannot implement more than one IFeatureFilter interface
     class InvalidFeatureFilter2 : IFeatureFilter, IContextualFeatureFilter<object>
     {
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, object appContext, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext featureFilterContext, object appContext, CancellationToken cancellationToken)
         {
             return Task.FromResult(false);
         }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken)
         {
             return Task.FromResult(false);
         }

tests/Tests.FeatureManagement/OnDemandTargetingContextAccessor.cs

@@ -11,7 +11,7 @@ class OnDemandTargetingContextAccessor : ITargetingContextAccessor
     {
         public TargetingContext Current { get; set; }
 
-        public ValueTask<TargetingContext> GetContextAsync(CancellationToken _)
+        public ValueTask<TargetingContext> GetContextAsync(CancellationToken cancellationToken)
         {
             return new ValueTask<TargetingContext>(Current);
         }

tests/Tests.FeatureManagement/TestFilter.cs

@@ -25,7 +25,7 @@ public object BindParameters(IConfiguration parameters)
             return parameters;
         }
 
-        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken _)
+        public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context, CancellationToken cancellationToken)
         {
             return Callback?.Invoke(context) ?? Task.FromResult(false);
         }