Merge pull request #62 from pfpack/feature/minor-refactor-resolver

feature/minor-refactor-resolver
pfpack · Dec 14, 2023 · 72bbd96 · 72bbd96
2 parents a8c239a + 5fb75ab
commit 72bbd96
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 29 deletions.
diff --git a/src/dependency-core/Core.Tests/Dependency.Core.Tests.csproj b/src/dependency-core/Core.Tests/Dependency.Core.Tests.csproj
@@ -19,10 +19,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Factory.Constructor.cs b/...-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Factory.Constructor.cs
@@ -7,15 +7,15 @@ partial class InternalDependencyResolver<TDependency>
     public InternalDependencyResolver(
         TDependency instance)
         =>
-        (this.instance, tag) = (instance, InternalDependencyResolverTag.Instance);
+        (this.instance, tag) = (instance, Tag.Instance);
 
     public InternalDependencyResolver(
         Func<TDependency> factory)
         =>
-        (this.factory, tag) = (factory, InternalDependencyResolverTag.Factory);
+        (this.factory, tag) = (factory, Tag.Factory);
 
     public InternalDependencyResolver(
         Func<IServiceProvider, TDependency> resolver)
         =>
-        (this.resolver, tag) = (resolver, InternalDependencyResolverTag.Resolver);
+        (this.resolver, tag) = (resolver, Tag.Resolver);
 }
diff --git a/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Invoke.cs b/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Invoke.cs
@@ -6,17 +6,11 @@ partial class InternalDependencyResolver<TDependency>
 {
     public TDependency Invoke(IServiceProvider serviceProvider) => tag switch
     {
-        InternalDependencyResolverTag.Instance
-        =>
-        instance!,
+        Tag.Instance => instance!,
 
-        InternalDependencyResolverTag.Factory
-        =>
-        factory!.Invoke(),
+        Tag.Factory => factory!.Invoke(),
 
-        InternalDependencyResolverTag.Resolver
-        =>
-        resolver!.Invoke(serviceProvider),
+        Tag.Resolver => resolver!.Invoke(serviceProvider),
 
         _ => throw new InvalidOperationException("An unexpected tag value.")
     };

diff --git a/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Tag.cs b/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.Tag.cs
@@ -0,0 +1,11 @@
+namespace PrimeFuncPack;
+
+partial class InternalDependencyResolver<TDependency>
+{
+    private enum Tag
+    {
+        Instance,
+        Factory,
+        Resolver
+    }
+}
diff --git a/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.cs b/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolver.T.cs
@@ -4,7 +4,7 @@ namespace PrimeFuncPack;
 
 internal sealed partial class InternalDependencyResolver<TDependency>
 {
-    private readonly InternalDependencyResolverTag tag;
+    private readonly Tag tag;
 
     private readonly TDependency? instance;
 

diff --git a/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolverTag.cs b/src/dependency-core/Core/InternalDependencyResolver/InternalDependencyResolverTag.cs
diff --git a/...rovider-extensions/ServiceProviderExtensions.Tests/ServiceProviderExtensions.Tests.csproj b/...rovider-extensions/ServiceProviderExtensions.Tests/ServiceProviderExtensions.Tests.csproj
@@ -19,10 +19,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>