Merge pull request #397 from DataObjects-NET/7.1-ioptions-config-loading

Ability to load configurations from IConfigurationSection/IConfigurationRoot
DataObjects-NET · Oct 18, 2024 · 4444ada · 4444ada
2 parents 8a03ac0 + b261028
commit 4444ada
Show file tree

Hide file tree

Showing 89 changed files with 12,469 additions and 221 deletions.
diff --git a/ChangeLog/7.1.2_dev.txt b/ChangeLog/7.1.2_dev.txt
@@ -1 +1,9 @@
-[main] Addressed issue when cycles in Entity dependency graph were not detected
+[main] Addressed issue when cycles in Entity dependency graph were not detected
+[main] Intoduced DomainConfuguration.ExtensionConfigurations as unified configuration storage for extensions' configurations
+[main] DomainConfiguration.Load() method now has overloads which gets abstractions from Microsoft.Extensions.Configuration API
+[localization] LocalizationConfiguration.Load() method now has overloads which gets abstractions from Microsoft.Extensions.Configuration API
+[localization] ConfigureLocalizationExtension() extensions for DomainConfiguration are added, check ReadMe/documentation for examples of usage
+[reprocessing] ReprocessingConfiguration.Load() method now has overloads which gets abstractions from Microsoft.Extensions.Configuration API
+[reprocessing] ConfigureReprocessingExtension() extensions for DomainConfiguration are added, check ReadMe/documentation for examples of usage
+[security] SecurityConfiguration.Load() method now has overloads which gets abstractions from Microsoft.Extensions.Configuration API
+[security] ConfigureSecurityExtension() extensions for DomainConfiguration are added, check ReadMe/documentation for examples of usage
diff --git a/Extensions/TestCommon/ModernConfigurationTestBase.cs b/Extensions/TestCommon/ModernConfigurationTestBase.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using NUnit.Framework;
+
+namespace TestCommon
+{
+  public abstract class MicrosoftConfigurationTestBase
+  {
+    protected enum ConfigTypes
+    {
+      Json,
+      Xml,
+    }
+
+    protected IConfigurationRoot configurationRoot;
+
+    protected abstract ConfigTypes ConfigFormat { get; }
+
+    protected abstract void AddConfigurationFile(IConfigurationBuilder configurationBuilder);
+
+    [OneTimeSetUp]
+    public virtual void BeforeAllTestsSetUp()
+    {
+      var configurationBuilder = new ConfigurationBuilder();
+      configurationBuilder.SetBasePath(Directory.GetCurrentDirectory());
+      AddConfigurationFile(configurationBuilder);
+      configurationRoot = (ConfigurationRoot) configurationBuilder.Build();
+    }
+
+    protected void IgnoreIfXml()
+    {
+      if (ConfigFormat == ConfigTypes.Xml)
+        throw new IgnoreException("Not valid for Xml format");
+    }
+    protected void IgnoreIfJson()
+    {
+      if (ConfigFormat == ConfigTypes.Json)
+        throw new IgnoreException("Not valid for JSON format");
+    }
+
+    protected IConfigurationSection GetAndCheckConfigurationSection(string sectionName)
+    {
+      var section = configurationRoot.GetSection(sectionName);
+      Assert.That(section, Is.Not.Null);
+      return section;
+    }
+  }
+}
diff --git a/Extensions/TestCommon/TestCommon.csproj b/Extensions/TestCommon/TestCommon.csproj
@@ -8,16 +8,13 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

diff --git a/Extensions/Xtensive.Orm.BulkOperations/NugetContent/ReadMe.md b/Extensions/Xtensive.Orm.BulkOperations/NugetContent/ReadMe.md
@@ -8,7 +8,7 @@ to server-side UPDATE or DELETE commands.
 
 Prerequisites
 -------------
-DataObjects.Net 7.0.x (http://dataobjects.net)
+DataObjects.Net 7.1.x (http://dataobjects.net)
 
 
 Examples of usage

diff --git a/Extensions/Xtensive.Orm.Localization.Tests/LocalizationSettings.config b/Extensions/Xtensive.Orm.Localization.Tests/LocalizationSettings.config
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <!-- No elements, all names should be default-->
+  <Xtensive.Orm.Localization.Xml.Empty>
+  </Xtensive.Orm.Localization.Xml.Empty>
+
+  <!--Names are empty, all names should be default-->
+  <Xtensive.Orm.Localization.Xml.NameEmpty>
+    <DefaultCulture></DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameEmpty>
+
+  <Xtensive.Orm.Localization.Xml.NameDefined>
+    <DefaultCulture>es-ES</DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameDefined>
+
+  <Xtensive.Orm.Localization.Xml.FaultyValue>
+    <DefaultCulture>ololo</DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.FaultyValue>
+
+  <!-- Different namings schemes of elements -->
+  <!-- LC - lower case -->
+  <!-- UC - upper case -->
+  <!-- CC - camel case -->
+  <!-- PC - pascal case-->
+  <Xtensive.Orm.Localization.Xml.Naming.LC>
+    <defaultculture>es-ES</defaultculture>
+  </Xtensive.Orm.Localization.Xml.Naming.LC>
+
+  <Xtensive.Orm.Localization.Xml.Naming.UC>
+    <DEFAULTCULTURE>es-ES</DEFAULTCULTURE>
+  </Xtensive.Orm.Localization.Xml.Naming.UC>
+
+  <Xtensive.Orm.Localization.Xml.Naming.CC>
+    <defaultCulture>es-ES</defaultCulture>
+  </Xtensive.Orm.Localization.Xml.Naming.CC>
+
+  <Xtensive.Orm.Localization.Xml.Naming.PC>
+    <DefaultCulture>es-ES</DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.Naming.PC>
+
+  <!-- Cases of mistyping of element names -->
+  <!-- LC - lower case -->
+  <!-- UC - upper case -->
+  <!-- CC - camel case -->
+  <!-- PC - pascal case-->
+  <Xtensive.Orm.Localization.Xml.Mistype.LC>
+    <defailtculture>es-ES</defailtculture>
+  </Xtensive.Orm.Localization.Xml.Mistype.LC>
+
+  <Xtensive.Orm.Localization.Xml.Mistype.UC>
+    <DEFAILTCULTURE>es-ES</DEFAILTCULTURE>
+  </Xtensive.Orm.Localization.Xml.Mistype.UC>
+
+  <Xtensive.Orm.Localization.Xml.Mistype.CC>
+    <defailtCulture>es-ES</defailtCulture>
+  </Xtensive.Orm.Localization.Xml.Mistype.CC>
+
+  <Xtensive.Orm.Localization.Xml.Mistype.PC>
+    <DefailtCulture>es-ES</DefailtCulture>
+  </Xtensive.Orm.Localization.Xml.Mistype.PC>
+
+  <!-- Cases of configuration when service name is represented by Name child node -->
+  <Xtensive.Orm.Localization.Xml.NameNode.NameEmpty>
+    <DefaultCulture>
+      <Name></Name>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.NameEmpty>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.Espaniol>
+    <DefaultCulture>
+      <Name>es-ES</Name>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.Espaniol>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.FaultyValue>
+    <DefaultCulture>
+      <Name>ololo</Name>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.FaultyValue>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.Naming.LC>
+    <DefaultCulture>
+      <name>es-ES</name>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.Naming.LC>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.Naming.UC>
+    <DefaultCulture>
+      <NAME>es-ES</NAME>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.Naming.UC>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.Naming.CC>
+    <DefaultCulture>
+      <naMe>es-ES</naMe>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.Naming.CC>
+
+  <Xtensive.Orm.Localization.Xml.NameNode.Naming.PC>
+    <DefaultCulture>
+      <NaMe>es-ES</NaMe>
+    </DefaultCulture>
+  </Xtensive.Orm.Localization.Xml.NameNode.Naming.PC>
+
+
+  <!-- combinations of Xml-specifit cases, mostly old-fashion attributes -->
+  <Xtensive.Orm.Localization.NameAttribute.NameEmpty>
+    <defaultCulture name="" />
+  </Xtensive.Orm.Localization.NameAttribute.NameEmpty>
+
+  <Xtensive.Orm.Localization.NameAttribute.None>
+    <defaultCulture />
+  </Xtensive.Orm.Localization.NameAttribute.None>
+
+  <Xtensive.Orm.Localization.NameAttribute.Defined>
+    <defaultCulture name="es-ES" />
+  </Xtensive.Orm.Localization.NameAttribute.Defined>
+
+  <Xtensive.Orm.Localization.NameAttribute.FaultyValue>
+    <defaultCulture name="ololo" />
+  </Xtensive.Orm.Localization.NameAttribute.FaultyValue>
+
+  <Xtensive.Orm.Localization.NameAttribute.LC>
+    <defaultculture name="es-ES" />
+  </Xtensive.Orm.Localization.NameAttribute.LC>
+
+  <Xtensive.Orm.Localization.NameAttribute.UC>
+    <DEFAULTCULTURE name="es-ES" />
+  </Xtensive.Orm.Localization.NameAttribute.UC>
+
+  <Xtensive.Orm.Localization.NameAttribute.PC>
+    <DefaultCulture name="es-ES" />
+  </Xtensive.Orm.Localization.NameAttribute.PC>
+
+</configuration>