Merge pull request #71 from dotnet-campus/t/lindexi/GetAppConfigurator

允许从配置里面重新获取配置管理应用
dotnet-campus · Dec 10, 2024 · 6ff90f6 · 6ff90f6
2 parents a8b5126 + 9972612
commit 6ff90f6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 20 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,5 +12,16 @@
       <RepositoryType>git</RepositoryType>
       <LangVersion>latest</LangVersion>
       <Nullable>enable</Nullable>
+      <Copyright>Copyright (c) dotnet-campus 2020-$([System.DateTime]::Now.ToString(`yyyy`))</Copyright>
+      <PackageReadmeFile>README.md</PackageReadmeFile>
+      <!-- 嵌入源代码到符号文件，方便调试 -->
+      <EmbedAllSources>true</EmbedAllSources>
+      <!-- 输出符号文件 -->
+      <IncludeSymbols>true</IncludeSymbols>
+      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- 嵌入 README 文件 -->
+    <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" Visible="false"/>
+  </ItemGroup>
 </Project>
diff --git a/src/dotnetCampus.Configurations/Configuration.cs b/src/dotnetCampus.Configurations/Configuration.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using dotnetCampus.Configurations.Core;
@@ -271,5 +272,24 @@ protected void ClearValues()
         /// 获取用于管理应用程序字符串配置项的管理器。
         /// </summary>
         internal IConfigurationRepo? Repo { get; set; }
+
+        internal IAppConfigurator? AppConfigurator { get; set; }
+
+        /// <summary>
+        /// 尝试获取 <see cref="IAppConfigurator"/> 实例。只有配置框架内部创建的配置，才能获取到 <see cref="IAppConfigurator"/> 实例。
+        /// </summary>
+        /// <param name="appConfigurator"></param>
+        /// <returns></returns>
+        public bool TryGetAppConfigurator
+            (
+#if NETCOREAPP3_0_OR_GREATER
+                [NotNullWhen(true)]
+#endif
+                out IAppConfigurator? appConfigurator
+            )
+        {
+            appConfigurator = AppConfigurator;
+            return appConfigurator != null;
+        }
     }
 }
diff --git a/src/dotnetCampus.Configurations/Core/ConcurrentAppConfigurator.cs b/src/dotnetCampus.Configurations/Core/ConcurrentAppConfigurator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 
 namespace dotnetCampus.Configurations.Core
@@ -17,12 +18,10 @@ internal ConcurrentAppConfigurator(IConfigurationRepo repo)
             _repo = repo ?? throw new ArgumentNullException(nameof(repo));
         }
 
-        private readonly object _locker = new object();
-
         private readonly IConfigurationRepo _repo;
 
-        private readonly Dictionary<Type, Configuration> _configurationDictionary
-            = new Dictionary<Type, Configuration>();
+        private readonly ConcurrentDictionary<Type, Configuration> _configurationDictionary
+            = new ConcurrentDictionary<Type, Configuration>();
 
         /// <summary>
         /// 获取 <typeparamref name="TConfiguration"/> 类型的配置项组。
@@ -31,25 +30,14 @@ private readonly Dictionary<Type, Configuration> _configurationDictionary
         /// <returns>配置项组。</returns>
         public TConfiguration Of<TConfiguration>() where TConfiguration : Configuration, new()
         {
-            if (_configurationDictionary.TryGetValue(typeof(TConfiguration), out var configuration))
-            {
-                return (TConfiguration) configuration;
-            }
-
-            lock (_locker)
+            return (TConfiguration) _configurationDictionary.GetOrAdd(typeof(TConfiguration), _ =>
             {
-                if (_configurationDictionary.TryGetValue(typeof(TConfiguration), out var lockedConfiguration))
-                {
-                    return (TConfiguration) lockedConfiguration;
-                }
-
-                configuration = new TConfiguration
+                return new TConfiguration
                 {
-                    Repo = _repo
+                    Repo = _repo,
+                    AppConfigurator = this,
                 };
-                _configurationDictionary[typeof(TConfiguration)] = configuration;
-                return (TConfiguration)configuration;
-            }
+            });
         }
 
         /// <summary>

diff --git a/...iguration.Tests/dotnetCampus.Configurations.MicrosoftExtensionsConfiguration.Tests.csproj b/...iguration.Tests/dotnetCampus.Configurations.MicrosoftExtensionsConfiguration.Tests.csproj
@@ -5,6 +5,7 @@
 
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/dotnetCampus.Configurations.Tests/dotnetCampus.Configurations.Tests.csproj b/tests/dotnetCampus.Configurations.Tests/dotnetCampus.Configurations.Tests.csproj
@@ -5,6 +5,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>