From 568f5990b2c32f6a68d13f2c4c726b59d745f730 Mon Sep 17 00:00:00 2001 From: TekH Date: Wed, 1 Oct 2025 15:08:54 +0200 Subject: [PATCH] refactor: replace Static service accessor with Factory implementation - Replaced `Static` class with `Factory` class to unify service collection and provider handling. - Introduced `Factory.Shared` singleton for centralized access to `IServiceProvider`. - Updated generic repository access to use `Factory` instead of `Static`. - Simplified lazy initialization of the service provider. - Maintains compatibility with .NET Framework and .NET conditional compilation. --- .../Factory.cs | 49 +++++++++++++++++++ .../StaticProvider.cs | 37 -------------- ...talData.Core.Abstraction.Repository.csproj | 9 ++++ DigitalData.Core.sln | 7 +++ 4 files changed, 65 insertions(+), 37 deletions(-) create mode 100644 DigitalData.Core.Abstraction.Application/Factory.cs delete mode 100644 DigitalData.Core.Abstraction.Application/StaticProvider.cs create mode 100644 DigitalData.Core.Abstraction.Repository/DigitalData.Core.Abstraction.Repository.csproj diff --git a/DigitalData.Core.Abstraction.Application/Factory.cs b/DigitalData.Core.Abstraction.Application/Factory.cs new file mode 100644 index 0000000..73d36c1 --- /dev/null +++ b/DigitalData.Core.Abstraction.Application/Factory.cs @@ -0,0 +1,49 @@ +#if NETFRAMEWORK +using System; +#endif + +using DigitalData.Core.Abstraction.Application.Repository; +using Microsoft.Extensions.DependencyInjection; + +namespace DigitalData.Core.Abstraction.Application +#if NET + ; +#elif NETFRAMEWORK +{ +#endif + +public interface IFactory : IServiceCollection, IServiceProvider +{ +} + +public class Factory : ServiceCollection, IFactory, IServiceCollection, IServiceProvider +{ + private readonly Lazy _rootProvider; + + private Factory() + { + _rootProvider = new Lazy(this.BuildServiceProvider); + } + + public object +#if NET + ? +#endif + GetService(Type serviceType) + { + return _rootProvider.Value.GetService(serviceType); + } + + public IRepository Repository => _rootProvider.Value.GetRequiredService(); + + public static readonly IFactory Shared = new Factory(); +} + +public static class Factory +{ + public static IRepository Repository() => Factory.Shared.GetRequiredService>(); +} + +#if NETFRAMEWORK + } +#endif \ No newline at end of file diff --git a/DigitalData.Core.Abstraction.Application/StaticProvider.cs b/DigitalData.Core.Abstraction.Application/StaticProvider.cs deleted file mode 100644 index d497d29..0000000 --- a/DigitalData.Core.Abstraction.Application/StaticProvider.cs +++ /dev/null @@ -1,37 +0,0 @@ -#if NETFRAMEWORK -using System; -#endif - -using DigitalData.Core.Abstraction.Application.Repository; -using Microsoft.Extensions.DependencyInjection; - -namespace DigitalData.Core.Abstraction.Application -#if NET - ; -#elif NETFRAMEWORK -{ -#endif - -public static class Static -{ - private readonly static Lazy LazyServices = new Lazy(() => new ServiceCollection()); - - public static IServiceCollection Services => LazyProvider.IsValueCreated - ? LazyServices.Value - : throw new InvalidOperationException("Services cannot be accessed after the Provider has been created."); - - private static readonly Lazy LazyProvider = new Lazy(Services.BuildServiceProvider); - - public static IServiceProvider Provider => LazyProvider.Value; - - public static IRepository Repository => Provider.GetRequiredService(); -} - -public static class Static -{ - public static IRepository Repository() => Static.Provider.GetRequiredService>(); -} - -#if NETFRAMEWORK - } -#endif \ No newline at end of file diff --git a/DigitalData.Core.Abstraction.Repository/DigitalData.Core.Abstraction.Repository.csproj b/DigitalData.Core.Abstraction.Repository/DigitalData.Core.Abstraction.Repository.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/DigitalData.Core.Abstraction.Repository/DigitalData.Core.Abstraction.Repository.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/DigitalData.Core.sln b/DigitalData.Core.sln index 486ec7d..9030e13 100644 --- a/DigitalData.Core.sln +++ b/DigitalData.Core.sln @@ -55,6 +55,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Abstractio EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{E18417C2-D9F5-437A-9ED5-473DD6260066}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Abstraction.Repository", "DigitalData.Core.Abstraction.Repository\DigitalData.Core.Abstraction.Repository.csproj", "{07E36C52-C402-43D7-B8C5-0626D2B3E388}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -128,6 +130,10 @@ Global {420C35A7-0EDE-4E2E-8500-484B57B0367A}.Debug|Any CPU.Build.0 = Release|Any CPU {420C35A7-0EDE-4E2E-8500-484B57B0367A}.Release|Any CPU.ActiveCfg = Release|Any CPU {420C35A7-0EDE-4E2E-8500-484B57B0367A}.Release|Any CPU.Build.0 = Release|Any CPU + {07E36C52-C402-43D7-B8C5-0626D2B3E388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07E36C52-C402-43D7-B8C5-0626D2B3E388}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07E36C52-C402-43D7-B8C5-0626D2B3E388}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07E36C52-C402-43D7-B8C5-0626D2B3E388}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -154,6 +160,7 @@ Global {8C3AF25D-81D9-4651-90CA-BF0BD2A03EA7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {420C35A7-0EDE-4E2E-8500-484B57B0367A} = {E18417C2-D9F5-437A-9ED5-473DD6260066} {E18417C2-D9F5-437A-9ED5-473DD6260066} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {07E36C52-C402-43D7-B8C5-0626D2B3E388} = {41795B74-A757-4E93-B907-83BFF04EEE5C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8E2C3187-F848-493A-9E79-56D20DDCAC94}