Ability to configure the ServiceLifetime when doing service discovery…

… using Connect***** scanning. Bumps to 1.7
JasperFx · Jun 3, 2024 · 46fc2a3 · 46fc2a3
1 parent 2c74962
commit 46fc2a3
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 8 deletions.
diff --git a/src/JasperFx.Core.Tests/IoC/Conventions/type_scanning_end_to_end.cs b/src/JasperFx.Core.Tests/IoC/Conventions/type_scanning_end_to_end.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using JasperFx.Core.IoC;
+using JasperFx.Core.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Widgets1;
@@ -12,6 +13,7 @@ public class type_scanning_end_to_end
     public void can_configure_plugin_families_via_dsl()
     {
         var registry = new ServiceCollection();
+        registry.AddSingleton<IRanger, RedRanger>();
         registry.Scan(x =>
         {
             x.TheCallingAssembly();
@@ -31,6 +33,7 @@ public void can_configure_plugin_families_via_dsl()
     public void can_find_the_closed_finders()
     {
         var x = new ServiceCollection();
+        x.AddSingleton<IRanger, RedRanger>();
         x.Scan(o =>
         {
             o.TheCallingAssembly();
@@ -231,12 +234,38 @@ public void use_default_scanning_with_if_newer_and_a_match()
         container.GetServices<IRanger>().Single().ShouldBeOfType<Ranger>();
     }
 
+    [Fact]
+    public void connect_implementations_with_lifetime_rule()
+    {
+        var services = new ServiceCollection();
+        services.AddScoped<IRanger, Ranger>();
+        services.Scan(x =>
+        {
+            x.AssemblyContainingType<IRanger>();
+            x.ConnectImplementationsToTypesClosing(typeof(IFinder<>), type => type.HasConstructorsWithArguments()
+                ? ServiceLifetime.Scoped
+                : ServiceLifetime.Singleton);
+        });
+
+        var container = services.BuildServiceProvider();
+
+        var scope1 = container.CreateScope();
+
+        var scope2 = container.CreateScope();
+
+        scope1.ServiceProvider.GetServices<IFinder<int>>().ShouldBeSameAs(scope2.ServiceProvider.GetServices<IFinder<int>>());
+        scope1.ServiceProvider.GetServices<IFinder<string>>().ShouldNotBeSameAs(scope2.ServiceProvider.GetServices<IFinder<string>>());
+    }
+
     public interface IFinder<T>
     {
     }
 
     public class StringFinder : IFinder<string>
     {
+        public StringFinder(IRanger ranger)
+        {
+        }
     }
 
     public class IntFinder : IFinder<int>

diff --git a/src/JasperFx.Core/IoC/AssemblyScanner.cs b/src/JasperFx.Core/IoC/AssemblyScanner.cs
@@ -162,7 +162,13 @@ public void ConnectImplementationsToTypesClosing(Type openGenericType)
 
     public void ConnectImplementationsToTypesClosing(Type openGenericType, ServiceLifetime lifetime)
     {
-        var convention = new GenericConnectionScanner(openGenericType, lifetime);
+        var convention = new GenericConnectionScanner(openGenericType, t => lifetime);
+        With(convention);
+    }
+
+    public void ConnectImplementationsToTypesClosing(Type openGenericType, Func<Type, ServiceLifetime> lifetimeRule)
+    {
+        var convention = new GenericConnectionScanner(openGenericType, lifetimeRule);
         With(convention);
     }
 

diff --git a/src/JasperFx.Core/IoC/FindAllTypesFilter.cs b/src/JasperFx.Core/IoC/FindAllTypesFilter.cs
@@ -19,7 +19,7 @@ void IRegistrationConvention.ScanTypes(TypeSet types, IServiceCollection service
     {
         if (_serviceType.IsOpenGeneric())
         {
-            var scanner = new GenericConnectionScanner(_serviceType, _lifetime);
+            var scanner = new GenericConnectionScanner(_serviceType);
             scanner.ScanTypes(types, services);
         }
         else

diff --git a/src/JasperFx.Core/IoC/GenericConnectionScanner.cs b/src/JasperFx.Core/IoC/GenericConnectionScanner.cs
@@ -8,13 +8,14 @@ internal class GenericConnectionScanner : IRegistrationConvention
 {
     private readonly IList<Type> _concretions = new List<Type>();
     private readonly IList<Type> _interfaces = new List<Type>();
-    private readonly ServiceLifetime _lifetime;
     private readonly Type _openType;
+    private readonly Func<Type,ServiceLifetime> _lifetimeRule;
 
-    public GenericConnectionScanner(Type openType, ServiceLifetime lifetime = ServiceLifetime.Transient)
+    public GenericConnectionScanner(Type openType, Func<Type, ServiceLifetime>? lifetimeRule = null)
     {
         _openType = openType;
-        _lifetime = lifetime;
+        _lifetimeRule = lifetimeRule;
+        _lifetimeRule ??= _ => ServiceLifetime.Scoped;
 
         if (!_openType.IsOpenGeneric())
         {
@@ -45,7 +46,7 @@ public void ScanTypes(TypeSet types, IServiceCollection services)
         foreach (var @interface in _interfaces)
         {
             var exactMatches = _concretions.Where(x => x.CanBeCastTo(@interface)).ToArray();
-            foreach (var type in exactMatches) services.Add(new ServiceDescriptor(@interface, type, _lifetime));
+            foreach (var type in exactMatches) services.Add(new ServiceDescriptor(@interface, type, _lifetimeRule(type)));
 
             if (!@interface.IsOpenGeneric())
             {
@@ -70,8 +71,9 @@ private void addConcretionsThatCouldBeClosed(Type @interface, IServiceCollection
             {
                 try
                 {
+                    var concreteType = type.MakeGenericType(@interface.GetGenericArguments());
                     services.Add(new ServiceDescriptor(@interface,
-                        type.MakeGenericType(@interface.GetGenericArguments()), _lifetime));
+                        concreteType, _lifetimeRule(concreteType)));
                 }
                 catch (Exception)
                 {

diff --git a/src/JasperFx.Core/IoC/IAssemblyScanner.cs b/src/JasperFx.Core/IoC/IAssemblyScanner.cs
@@ -222,4 +222,10 @@ void AssembliesAndExecutablesFromPath(string path,
     void AssembliesFromPath(string path,
         Func<Assembly, bool> assemblyFilter);
 
+    /// <summary>
+    /// Scans for ServiceType's and Concrete Types that close the given open generic type
+    /// </summary>
+    /// <param name="openGenericType"></param>
+    /// <param name="lifetimeRule">Configurable rule about how the lifetime is determined</param>
+    void ConnectImplementationsToTypesClosing(Type openGenericType, Func<Type, ServiceLifetime> lifetimeRule);
 }
diff --git a/src/JasperFx.Core/JasperFx.Core.csproj b/src/JasperFx.Core/JasperFx.Core.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Common extension methods and reflection helpers used by JasperFx projects</Description>
-        <Version>1.6.0</Version>
+        <Version>1.7.0</Version>
         <Authors>Jeremy D. Miller</Authors>
         <AssemblyName>JasperFx.Core</AssemblyName>
         <PackageId>JasperFx.Core</PackageId>

diff --git a/src/JasperFx.Core/Reflection/ReflectionExtensions.cs b/src/JasperFx.Core/Reflection/ReflectionExtensions.cs
@@ -179,6 +179,17 @@ public static bool HasDefaultConstructor(this Type t)
             null, Type.EmptyTypes, null) != null;
     }
 
+    /// <summary>
+    /// Does this type have any constructors with arguments?
+    /// </summary>
+    /// <param name="t"></param>
+    /// <returns></returns>
+    public static bool HasConstructorsWithArguments(this Type t)
+    {
+        return t.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+            .Any(x => x.GetParameters().Any());
+    }
+
     // http://stackoverflow.com/a/15273117/426840
     /// <summary>
     ///     Is the object an anonymous type that is not within a .Net