Skip to content

Commit 46aa3de

Browse files
Update cache check (#591)
1 parent dabb8a4 commit 46aa3de

5 files changed

Lines changed: 6 additions & 22 deletions

File tree

src/Microsoft.FeatureManagement/ConfigurationFeatureDefinitionProvider.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ namespace Microsoft.FeatureManagement
1717
/// <summary>
1818
/// A feature definition provider that pulls feature definitions from the .NET Core <see cref="IConfiguration"/> system.
1919
/// </summary>
20-
public sealed class ConfigurationFeatureDefinitionProvider : IFeatureDefinitionProvider, IDisposable, IFeatureDefinitionProviderCacheable
20+
public sealed class ConfigurationFeatureDefinitionProvider : IFeatureDefinitionProvider, IDisposable
2121
{
22-
//
23-
// IFeatureDefinitionProviderCacheable interface is only used to mark this provider as cacheable. This allows our test suite's
24-
// provider to be marked for caching as well.
2522
private readonly IConfiguration _configuration;
2623
private readonly ConfigurationFeatureDefinitionProviderOptions _options;
2724
private IEnumerable<IConfigurationSection> _dotnetFeatureDefinitionSections;

src/Microsoft.FeatureManagement/FeatureManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ private void BindSettings(IFeatureFilterMetadata filter, FeatureFilterEvaluation
681681
return;
682682
}
683683

684-
if (!(_featureDefinitionProvider is IFeatureDefinitionProviderCacheable) || Cache == null)
684+
if (!(context.Parameters is ConfigurationWrapper) || Cache == null)
685685
{
686686
context.Settings = binder.BindParameters(context.Parameters);
687687

src/Microsoft.FeatureManagement/IFeatureDefinitionProviderCacheable.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/Tests.FeatureManagement/FeatureManagementTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -967,10 +967,10 @@ public async Task BindsFeatureFlagSettings()
967967
FeatureFilterConfiguration testFilterConfiguration = new FeatureFilterConfiguration
968968
{
969969
Name = "Test",
970-
Parameters = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string>()
970+
Parameters = new ConfigurationWrapper(new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string>()
971971
{
972972
{ "P1", "V1" },
973-
}).Build()
973+
}).Build())
974974
};
975975

976976
var services = new ServiceCollection();
@@ -1039,7 +1039,7 @@ public async Task BindsFeatureFlagSettings()
10391039

10401040
//
10411041
// Cache break.
1042-
testFilterConfiguration.Parameters = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string>()).Build();
1042+
testFilterConfiguration.Parameters = new ConfigurationWrapper(new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string>()).Build());
10431043

10441044
binderCalled = false;
10451045

tests/Tests.FeatureManagement/InMemoryFeatureDefinitionProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Tests.FeatureManagement
88
{
9-
class InMemoryFeatureDefinitionProvider : IFeatureDefinitionProvider, IFeatureDefinitionProviderCacheable
9+
class InMemoryFeatureDefinitionProvider : IFeatureDefinitionProvider
1010
{
1111
private IEnumerable<FeatureDefinition> _definitions;
1212

0 commit comments

Comments
 (0)