Merge pull request #59 from NerosoftDev/develop

Automatic set validator factory.
NerosoftDev · Dec 12, 2023 · 77dc50f · 77dc50f
2 parents 8530e94 + 790aa25
commit 77dc50f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/Source/Euonia.Mapping.Automapper/AutomapperModule.cs b/Source/Euonia.Mapping.Automapper/AutomapperModule.cs
@@ -8,20 +8,22 @@ namespace Nerosoft.Euonia.Mapping;
 /// </summary>
 public class AutomapperModule : ModuleContextBase
 {
+	private const string SERVICE_INJECTION_KEY = "automapper";
+
 	/// <inheritdoc />
 	public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        context.Services.AddAutomapper();
-        context.Services.AddSingleton<ITypeAdapterFactory, AutomapperTypeAdapterFactory>();
-    }
+	{
+		context.Services.AddAutomapper();
+		context.Services.AddKeyedSingleton<ITypeAdapterFactory, AutomapperTypeAdapterFactory>(SERVICE_INJECTION_KEY);
+	}
 
 	/// <inheritdoc />
 	public override void OnApplicationInitialization(ApplicationInitializationContext context)
-    {
-        var factory = context.ServiceProvider.GetService<ITypeAdapterFactory>();
-        if (factory != null)
-        {
-            TypeAdapterFactory.SetCurrent(factory);
-        }
-    }
+	{
+		var factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+		if (factory != null)
+		{
+			TypeAdapterFactory.SetCurrent(factory);
+		}
+	}
 }
diff --git a/Source/Euonia.Mapping.Mapster/MapsterModule.cs b/Source/Euonia.Mapping.Mapster/MapsterModule.cs
@@ -8,20 +8,22 @@ namespace Nerosoft.Euonia.Mapping;
 /// </summary>
 public class MapsterModule : ModuleContextBase
 {
+	private const string SERVICE_INJECTION_KEY = "mapster";
+
 	/// <inheritdoc />
 	public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        context.Services.AddMapster();
-        context.Services.AddSingleton<ITypeAdapterFactory, MapsterTypeAdapterFactory>();
-    }
+	{
+		context.Services.AddMapster();
+		context.Services.AddKeyedSingleton<ITypeAdapterFactory, MapsterTypeAdapterFactory>(SERVICE_INJECTION_KEY);
+	}
 
 	/// <inheritdoc />
 	public override void OnApplicationInitialization(ApplicationInitializationContext context)
-    {
-        var factory = context.ServiceProvider.GetService<ITypeAdapterFactory>();
-        if (factory != null)
-        {
-            TypeAdapterFactory.SetCurrent(factory);
-        }
-    }
+	{
+		var factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+		if (factory != null)
+		{
+			TypeAdapterFactory.SetCurrent(factory);
+		}
+	}
 }
diff --git a/Source/Euonia.Validation/ValidationModule.cs b/Source/Euonia.Validation/ValidationModule.cs
@@ -16,4 +16,14 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 		context.Services.AddAutomaticRegistrar(new ValidationRegistrar());
 		context.Services.AddSingleton<IValidatorFactory, DefaultValidatorFactory>();
 	}
+
+	/// <inheritdoc/>
+	public override void OnApplicationInitialization(ApplicationInitializationContext context)
+	{
+		var factory = context.ServiceProvider.GetService<IValidatorFactory>();
+		if (factory != null)
+		{
+			ValidatorFactory.SetCurrent(factory);
+		}
+	}
 }
diff --git a/project.props b/project.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.8</Version>
+        <Version>8.1.9</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>