From 3b19e325993b077589a707db0087ddac9d6cf9a7 Mon Sep 17 00:00:00 2001
From: Zhiyuan Liang <zhiyuanliang@microsoft.com>
Date: Fri, 2 Feb 2024 16:04:49 +0800
Subject: [PATCH 1/2] add new constructor

---
 .../FeatureManager.cs                         | 30 +++++++++++++++++++
 .../ServiceCollectionExtensions.cs            |  8 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.FeatureManagement/FeatureManager.cs b/src/Microsoft.FeatureManagement/FeatureManager.cs
index 55dde3f5..b0ab483a 100644
--- a/src/Microsoft.FeatureManagement/FeatureManager.cs
+++ b/src/Microsoft.FeatureManagement/FeatureManager.cs
@@ -34,6 +34,22 @@ private class ConfigurationCacheItem
             public object Settings { get; set; }
         }
 
+        /// <summary>
+        /// Creates a feature manager.
+        /// </summary>
+        /// <param name="featureDefinitionProvider">The provider of feature flag definitions.</param>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="featureDefinitionProvider"/> is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="options"/> is null.</exception>
+        public FeatureManager(IFeatureDefinitionProvider featureDefinitionProvider)
+        {
+            _filterMetadataCache = new ConcurrentDictionary<string, IFeatureFilterMetadata>();
+            _contextualFeatureFilterCache = new ConcurrentDictionary<string, ContextualFeatureFilterEvaluator>();
+            _featureDefinitionProvider = featureDefinitionProvider ?? throw new ArgumentNullException(nameof(featureDefinitionProvider));
+            _options = new FeatureManagementOptions();
+            _featureFilters = Enumerable.Empty<IFeatureFilterMetadata>();
+            _sessionManagers = Enumerable.Empty<ISessionManager>();
+        }
+
         /// <summary>
         /// Creates a feature manager.
         /// </summary>
@@ -53,6 +69,20 @@ public FeatureManager(
             _sessionManagers = Enumerable.Empty<ISessionManager>();
         }
 
+        /// <summary>
+        /// Options controlling the behavior of the feature manager.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if it is set to null.</exception>
+        public FeatureManagementOptions Options
+        {
+            get => _options;
+
+            init
+            {
+                _options = value ?? throw new ArgumentNullException(nameof(value));
+            }
+        }
+
         /// <summary>
         /// The collection of feature filter metadata.
         /// </summary>
diff --git a/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs b/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
index 02225d2c..63c8ecf6 100644
--- a/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
+++ b/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
@@ -43,9 +43,9 @@ public static IFeatureManagementBuilder AddFeatureManagement(this IServiceCollec
             services.TryAddSingleton<IFeatureDefinitionProvider, ConfigurationFeatureDefinitionProvider>();
 
             services.AddSingleton<IFeatureManager>(sp => new FeatureManager(
-                sp.GetRequiredService<IFeatureDefinitionProvider>(),
-                sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value)
+                sp.GetRequiredService<IFeatureDefinitionProvider>())
             {
+                Options = sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value,
                 FeatureFilters = sp.GetRequiredService<IEnumerable<IFeatureFilterMetadata>>(),
                 SessionManagers = sp.GetRequiredService<IEnumerable<ISessionManager>>(),
                 Cache = sp.GetRequiredService<IMemoryCache>(),
@@ -115,9 +115,9 @@ public static IFeatureManagementBuilder AddScopedFeatureManagement(this IService
             services.TryAddSingleton<IFeatureDefinitionProvider, ConfigurationFeatureDefinitionProvider>();
 
             services.AddScoped<IFeatureManager>(sp => new FeatureManager(
-                sp.GetRequiredService<IFeatureDefinitionProvider>(),
-                sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value)
+                sp.GetRequiredService<IFeatureDefinitionProvider>())
             {
+                Options = sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value,
                 FeatureFilters = sp.GetRequiredService<IEnumerable<IFeatureFilterMetadata>>(),
                 SessionManagers = sp.GetRequiredService<IEnumerable<ISessionManager>>(),
                 Cache = sp.GetRequiredService<IMemoryCache>(),

From 0bd773fa16097361eeae95762deccbee34fa4790 Mon Sep 17 00:00:00 2001
From: Zhiyuan Liang <zhiyuanliang@microsoft.com>
Date: Mon, 5 Feb 2024 16:19:07 +0800
Subject: [PATCH 2/2] update

---
 .../FeatureManager.cs                         | 35 ++-----------------
 .../ServiceCollectionExtensions.cs            |  8 ++---
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/Microsoft.FeatureManagement/FeatureManager.cs b/src/Microsoft.FeatureManagement/FeatureManager.cs
index b0ab483a..ef850a03 100644
--- a/src/Microsoft.FeatureManagement/FeatureManager.cs
+++ b/src/Microsoft.FeatureManagement/FeatureManager.cs
@@ -34,55 +34,24 @@ private class ConfigurationCacheItem
             public object Settings { get; set; }
         }
 
-        /// <summary>
-        /// Creates a feature manager.
-        /// </summary>
-        /// <param name="featureDefinitionProvider">The provider of feature flag definitions.</param>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="featureDefinitionProvider"/> is null.</exception>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="options"/> is null.</exception>
-        public FeatureManager(IFeatureDefinitionProvider featureDefinitionProvider)
-        {
-            _filterMetadataCache = new ConcurrentDictionary<string, IFeatureFilterMetadata>();
-            _contextualFeatureFilterCache = new ConcurrentDictionary<string, ContextualFeatureFilterEvaluator>();
-            _featureDefinitionProvider = featureDefinitionProvider ?? throw new ArgumentNullException(nameof(featureDefinitionProvider));
-            _options = new FeatureManagementOptions();
-            _featureFilters = Enumerable.Empty<IFeatureFilterMetadata>();
-            _sessionManagers = Enumerable.Empty<ISessionManager>();
-        }
-
         /// <summary>
         /// Creates a feature manager.
         /// </summary>
         /// <param name="featureDefinitionProvider">The provider of feature flag definitions.</param>
         /// <param name="options">Options controlling the behavior of the feature manager.</param>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="featureDefinitionProvider"/> is null.</exception>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="options"/> is null.</exception>
         public FeatureManager(
             IFeatureDefinitionProvider featureDefinitionProvider,
-            FeatureManagementOptions options)
+            FeatureManagementOptions options = null)
         {
             _filterMetadataCache = new ConcurrentDictionary<string, IFeatureFilterMetadata>();
             _contextualFeatureFilterCache = new ConcurrentDictionary<string, ContextualFeatureFilterEvaluator>();
             _featureDefinitionProvider = featureDefinitionProvider ?? throw new ArgumentNullException(nameof(featureDefinitionProvider));
-            _options = options ?? throw new ArgumentNullException(nameof(options));
+            _options = options ?? new FeatureManagementOptions();
             _featureFilters = Enumerable.Empty<IFeatureFilterMetadata>();
             _sessionManagers = Enumerable.Empty<ISessionManager>();
         }
 
-        /// <summary>
-        /// Options controlling the behavior of the feature manager.
-        /// </summary>
-        /// <exception cref="ArgumentNullException">Thrown if it is set to null.</exception>
-        public FeatureManagementOptions Options
-        {
-            get => _options;
-
-            init
-            {
-                _options = value ?? throw new ArgumentNullException(nameof(value));
-            }
-        }
-
         /// <summary>
         /// The collection of feature filter metadata.
         /// </summary>
diff --git a/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs b/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
index 63c8ecf6..02225d2c 100644
--- a/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
+++ b/src/Microsoft.FeatureManagement/ServiceCollectionExtensions.cs
@@ -43,9 +43,9 @@ public static IFeatureManagementBuilder AddFeatureManagement(this IServiceCollec
             services.TryAddSingleton<IFeatureDefinitionProvider, ConfigurationFeatureDefinitionProvider>();
 
             services.AddSingleton<IFeatureManager>(sp => new FeatureManager(
-                sp.GetRequiredService<IFeatureDefinitionProvider>())
+                sp.GetRequiredService<IFeatureDefinitionProvider>(),
+                sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value)
             {
-                Options = sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value,
                 FeatureFilters = sp.GetRequiredService<IEnumerable<IFeatureFilterMetadata>>(),
                 SessionManagers = sp.GetRequiredService<IEnumerable<ISessionManager>>(),
                 Cache = sp.GetRequiredService<IMemoryCache>(),
@@ -115,9 +115,9 @@ public static IFeatureManagementBuilder AddScopedFeatureManagement(this IService
             services.TryAddSingleton<IFeatureDefinitionProvider, ConfigurationFeatureDefinitionProvider>();
 
             services.AddScoped<IFeatureManager>(sp => new FeatureManager(
-                sp.GetRequiredService<IFeatureDefinitionProvider>())
+                sp.GetRequiredService<IFeatureDefinitionProvider>(),
+                sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value)
             {
-                Options = sp.GetRequiredService<IOptions<FeatureManagementOptions>>().Value,
                 FeatureFilters = sp.GetRequiredService<IEnumerable<IFeatureFilterMetadata>>(),
                 SessionManagers = sp.GetRequiredService<IEnumerable<ISessionManager>>(),
                 Cache = sp.GetRequiredService<IMemoryCache>(),