diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs index 110c5b61787c0..feef64fc2dde1 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.cs @@ -28,9 +28,9 @@ public ChainedConfigurationSource() { } public bool ShouldDisposeConfiguration { get { throw null; } set { } } public Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; } } - public sealed partial class Config : Microsoft.Extensions.Configuration.IConfigurationBuilder, Microsoft.Extensions.Configuration.IConfigurationRoot, System.IDisposable + public sealed partial class ConfigurationManager : Microsoft.Extensions.Configuration.IConfigurationBuilder, Microsoft.Extensions.Configuration.IConfigurationRoot, System.IDisposable { - public Config() { } + public ConfigurationManager() { } public string this[string key] { get { throw null; } set { throw null; } } public IConfigurationSection GetSection(string key) { throw null; } public System.Collections.Generic.IEnumerable GetChildren() { throw null; } diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Config.cs b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs similarity index 96% rename from src/libraries/Microsoft.Extensions.Configuration/src/Config.cs rename to src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs index 138d6e532032b..9578f3c334ac3 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Config.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationManager.cs @@ -14,7 +14,7 @@ namespace Microsoft.Extensions.Configuration /// Configuration is mutable configuration object. It is both an and an . /// As sources are added, it updates its current view of configuration. Once Build is called, configuration is frozen. /// - public sealed class Config : IConfigurationBuilder, IConfigurationRoot, IDisposable + public sealed class ConfigurationManager : IConfigurationBuilder, IConfigurationRoot, IDisposable { private readonly ConfigurationSources _sources; private readonly ConfigurationBuilderProperties _properties; @@ -27,7 +27,7 @@ public sealed class Config : IConfigurationBuilder, IConfigurationRoot, IDisposa /// /// Creates an empty mutable configuration object that is both an and an . /// - public Config() + public ConfigurationManager() { _sources = new ConfigurationSources(this); _properties = new ConfigurationBuilderProperties(this); @@ -181,9 +181,9 @@ private void DisposeRegistrationsAndProvidersUnsynchronized() private class ConfigurationSources : IList { private readonly List _sources = new(); - private readonly Config _config; + private readonly ConfigurationManager _config; - public ConfigurationSources(Config config) + public ConfigurationSources(ConfigurationManager config) { _config = config; } @@ -262,9 +262,9 @@ IEnumerator IEnumerable.GetEnumerator() private class ConfigurationBuilderProperties : IDictionary { private readonly Dictionary _properties = new(); - private readonly Config _config; + private readonly ConfigurationManager _config; - public ConfigurationBuilderProperties(Config config) + public ConfigurationBuilderProperties(ConfigurationManager config) { _config = config; } diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigTest.cs b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs similarity index 94% rename from src/libraries/Microsoft.Extensions.Configuration/tests/ConfigTest.cs rename to src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs index 341f833b53cf2..6e7a4919b25e4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/ConfigurationManagerTest.cs @@ -11,12 +11,12 @@ namespace Microsoft.Extensions.Configuration.Test { - public class ConfigTest + public class ConfigurationManagerTest { [Fact] public void AutoUpdates() { - var config = new Config(); + var config = new ConfigurationManager(); config.AddInMemoryCollection(new Dictionary { @@ -29,7 +29,7 @@ public void AutoUpdates() [Fact] public void TriggersReloadTokenOnSourceAddition() { - var config = new Config(); + var config = new ConfigurationManager(); var reloadToken = ((IConfiguration)config).GetReloadToken(); @@ -43,11 +43,10 @@ public void TriggersReloadTokenOnSourceAddition() Assert.True(reloadToken.HasChanged); } - [Fact] public void SettingValuesWorksWithoutManuallyAddingSource() { - var config = new Config + var config = new ConfigurationManager { ["TestKey"] = "TestValue", }; @@ -58,7 +57,7 @@ public void SettingValuesWorksWithoutManuallyAddingSource() [Fact] public void SettingConfigValuesDoesNotTriggerReloadToken() { - var config = new Config(); + var config = new ConfigurationManager(); var reloadToken = ((IConfiguration)config).GetReloadToken(); config["TestKey"] = "TestValue"; @@ -72,7 +71,7 @@ public void SettingConfigValuesDoesNotTriggerReloadToken() [Fact] public void SettingIConfigurationBuilderPropertiesReloadsSources() { - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configBuilder = config; config["PreReloadTestConfigKey"] = "PreReloadTestConfigValue"; @@ -104,7 +103,7 @@ public void DisposesProvidersOnDispose() var provider4 = new DisposableTestConfigurationProvider("qux", "qux-value"); var provider5 = new DisposableTestConfigurationProvider("quux", "quux-value"); - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder builder = config; builder.Add(new TestConfigurationSource(provider1)); @@ -141,7 +140,7 @@ public void DisposesProvidersOnRemoval() var source4 = new TestConfigurationSource(provider4); var source5 = new TestConfigurationSource(provider5); - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder builder = config; builder.Add(source1); @@ -179,7 +178,7 @@ public void DisposesChangeTokenRegistrationsOnDispose() var providerMock = new Mock(); providerMock.Setup(p => p.GetReloadToken()).Returns(changeToken); - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).Add(new TestConfigurationSource(providerMock.Object)); @@ -199,7 +198,7 @@ public void DisposesChangeTokenRegistrationsOnRemoval() var source = new TestConfigurationSource(providerMock.Object); - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder builder = config; builder.Add(source); @@ -221,7 +220,7 @@ public void ChainedConfigurationIsDisposedOnDispose(bool shouldDispose) provider }); - var config = new Config(); + var config = new ConfigurationManager(); config.AddConfiguration(chainedConfig, shouldDisposeConfiguration: shouldDispose); @@ -252,7 +251,7 @@ public void LoadAndCombineKeyValuePairsFromDifferentConfigurationProviders() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -299,7 +298,7 @@ public void CanChainConfiguration() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -307,7 +306,7 @@ public void CanChainConfiguration() configurationBuilder.Add(memConfigSrc2); configurationBuilder.Add(memConfigSrc3); - var chained = new Config(); + var chained = new ConfigurationManager(); chained.AddConfiguration(config); var memVal1 = chained["mem1:keyinmem1"]; var memVal2 = chained["Mem2:KeyInMem2"]; @@ -353,14 +352,14 @@ public void ChainedAsEnumerateFlattensIntoDictionaryTest(bool removePath) var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config1 = new Config(); + var config1 = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config1; // Act configurationBuilder.Add(memConfigSrc1); configurationBuilder.Add(memConfigSrc2); - var config2 = new Config(); + var config2 = new ConfigurationManager(); config2 .AddConfiguration(config1) @@ -413,7 +412,7 @@ public void AsEnumerateFlattensIntoDictionaryTest(bool removePath) var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -467,7 +466,7 @@ public void AsEnumerateStripsKeyFromChildren() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -511,7 +510,7 @@ public void NewConfigurationProviderOverridesOldOneWhenKeyIsDuplicated() var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 }; var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -525,7 +524,7 @@ public void NewConfigurationProviderOverridesOldOneWhenKeyIsDuplicated() [Fact] public void NewConfigurationRootMayBeBuiltFromExistingWithDuplicateKeys() { - var configurationRoot = new Config(); + var configurationRoot = new ConfigurationManager(); configurationRoot.AddInMemoryCollection(new Dictionary { @@ -536,7 +535,7 @@ public void NewConfigurationRootMayBeBuiltFromExistingWithDuplicateKeys() {"KEYA:KEYB", "valueB"}, }); - var newConfigurationRoot = new Config(); + var newConfigurationRoot = new ConfigurationManager(); newConfigurationRoot.AddInMemoryCollection(configurationRoot.AsEnumerable()); @@ -557,7 +556,7 @@ public void SettingValueUpdatesAllConfigurationProviders() var memConfigSrc2 = new TestMemorySourceProvider(dict); var memConfigSrc3 = new TestMemorySourceProvider(dict); - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; configurationBuilder.Add(memConfigSrc1); @@ -604,7 +603,7 @@ public void CanGetConfigurationSection() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; configurationBuilder.Add(memConfigSrc1); @@ -648,7 +647,7 @@ public void CanGetConnectionStrings() var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 }; var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; configurationBuilder.Add(memConfigSrc1); @@ -686,7 +685,7 @@ public void CanGetConfigurationChildren() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dic2 }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dic3 }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; configurationBuilder.Add(memConfigSrc1); @@ -717,7 +716,7 @@ public void SourcesReturnsAddedConfigurationProviders() var memConfigSrc2 = new MemoryConfigurationSource { InitialData = dict }; var memConfigSrc3 = new MemoryConfigurationSource { InitialData = dict }; - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder configurationBuilder = config; // Act @@ -736,7 +735,7 @@ public void SourcesReturnsAddedConfigurationProviders() public void SetValueThrowsExceptionNoSourceRegistered() { // Arrange - var config = new Config(); + var config = new ConfigurationManager(); // A MemoryConfigurationSource is added by default, so there will be no error unless we clear it config["Title"] = "Welcome"; @@ -754,7 +753,7 @@ public void SetValueThrowsExceptionNoSourceRegistered() public void SameReloadTokenIsReturnedRepeatedly() { // Arrange - IConfiguration config = new Config(); + IConfiguration config = new ConfigurationManager(); // Act var token1 = config.GetReloadToken(); @@ -768,7 +767,7 @@ public void SameReloadTokenIsReturnedRepeatedly() public void DifferentReloadTokenReturnedAfterReloading() { // Arrange - IConfigurationRoot config = new Config(); + IConfigurationRoot config = new ConfigurationManager(); // Act var token1 = config.GetReloadToken(); @@ -787,7 +786,7 @@ public void DifferentReloadTokenReturnedAfterReloading() public void TokenTriggeredWhenReloadOccurs() { // Arrange - IConfigurationRoot config = new Config(); + IConfigurationRoot config = new ConfigurationManager(); // Act var token1 = config.GetReloadToken(); @@ -804,7 +803,7 @@ public void TokenTriggeredWhenReloadOccurs() public void MultipleCallbacksCanBeRegisteredToReload() { // Arrange - IConfigurationRoot config = new Config(); + IConfigurationRoot config = new ConfigurationManager(); // Act var token1 = config.GetReloadToken(); @@ -836,7 +835,7 @@ public void MultipleCallbacksCanBeRegisteredToReload() public void NewTokenAfterReloadIsNotChanged() { // Arrange - IConfigurationRoot config = new Config(); + IConfigurationRoot config = new ConfigurationManager(); // Act var token1 = config.GetReloadToken(); @@ -862,7 +861,7 @@ public void KeyStartingWithColonMeansFirstSectionHasEmptyName() { [":Key2"] = "value" }; - var config = new Config(); + var config = new ConfigurationManager(); config.AddInMemoryCollection(dict); // Act @@ -884,7 +883,7 @@ public void KeyWithDoubleColonHasSectionWithEmptyName() ["Key1::Key3"] = "value" }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -908,7 +907,7 @@ public void KeyEndingWithColonMeansLastSectionHasEmptyName() ["Key1:"] = "value" }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -932,7 +931,7 @@ public void SectionWithValueExists() {"Mem1:KeyInMem1:Deep1", "ValueDeep1"} }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -957,7 +956,7 @@ public void SectionGetRequiredSectionSuccess() {"Mem1:KeyInMem1:Deep1", "ValueDeep1"} }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -979,7 +978,7 @@ public void SectionGetRequiredSectionMissingThrowException() {"Mem1:Deep1", "Value1"}, }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); Assert.Throws(() => config.GetRequiredSection("Mem2")); @@ -997,7 +996,7 @@ public void SectionWithChildrenExists() {"Mem2:KeyInMem2:Deep1", "ValueDeep2"} }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -1022,7 +1021,7 @@ public void KeyWithValueAndWithoutChildrenExistsAsSection(string value) {"Mem1", value} }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -1041,7 +1040,7 @@ public void KeyWithNullValueAndWithoutChildrenIsASectionButNotExists() {"Mem1", null} }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -1065,7 +1064,7 @@ public void SectionWithChildrenHasNullValue() }; - var config = new Config(); + var config = new ConfigurationManager(); ((IConfigurationBuilder)config).AddInMemoryCollection(dict); // Act @@ -1079,7 +1078,7 @@ public void SectionWithChildrenHasNullValue() public void ProviderWithNullReloadToken() { // Arrange - var config = new Config(); + var config = new ConfigurationManager(); IConfigurationBuilder builder = config; // Assert @@ -1090,7 +1089,7 @@ public void ProviderWithNullReloadToken() public void BuildReturnsThis() { // Arrange - var config = new Config(); + var config = new ConfigurationManager(); // Assert Assert.Same(config, ((IConfigurationBuilder)config).Build());