Add AsImplementedInterfaces overload with predicate

khellang · Mar 2, 2022 · 937b19e · 937b19e
1 parent 5afe1a7
commit 937b19e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/Scrutor/IServiceTypeSelector.cs b/src/Scrutor/IServiceTypeSelector.cs
@@ -35,6 +35,12 @@ public interface IServiceTypeSelector : IImplementationTypeSelector
         /// </summary>
         ILifetimeSelector AsImplementedInterfaces();
 
+        /// <summary>
+        /// Registers each matching concrete type as all of its implemented interfaces.
+        /// </summary>
+        /// <param name="predicate">A predicate to filter which interfaces to register.</param>
+        ILifetimeSelector AsImplementedInterfaces(Func<Type, bool> predicate);
+
         /// <summary>
         /// Registers each matching concrete type as all of its implemented interfaces, by returning an instance of the main type
         /// </summary>

diff --git a/src/Scrutor/LifetimeSelector.cs b/src/Scrutor/LifetimeSelector.cs
@@ -159,6 +159,11 @@ public ILifetimeSelector AsImplementedInterfaces()
             return Inner.AsImplementedInterfaces();
         }
 
+        public ILifetimeSelector AsImplementedInterfaces(Func<Type, bool> predicate)
+        {
+            return Inner.AsImplementedInterfaces(predicate);
+        }
+
         public ILifetimeSelector AsSelfWithInterfaces()
         {
             return Inner.AsSelfWithInterfaces();

diff --git a/src/Scrutor/ServiceTypeSelector.cs b/src/Scrutor/ServiceTypeSelector.cs
@@ -49,9 +49,17 @@ public ILifetimeSelector As(IEnumerable<Type> types)
 
         public ILifetimeSelector AsImplementedInterfaces()
         {
+            return AsImplementedInterfaces(_ => true);
+        }
+
+        public ILifetimeSelector AsImplementedInterfaces(Func<Type, bool> predicate)
+        {
+            Preconditions.NotNull(predicate, nameof(predicate));
+
             return As(t => t.GetInterfaces()
                 .Where(x => x.HasMatchingGenericArity(t))
-                .Select(x => x.GetRegistrationType(t)));
+                .Select(x => x.GetRegistrationType(t))
+                .Where(predicate));
         }
 
         public ILifetimeSelector AsSelfWithInterfaces()

diff --git a/test/Scrutor.Tests/ScanningTests.cs b/test/Scrutor.Tests/ScanningTests.cs
@@ -18,7 +18,7 @@ public void Scan_TheseTypes()
         {
             Collection.Scan(scan => scan
                 .AddTypes<TransientService1, TransientService2>()
-                    .AsImplementedInterfaces()
+                    .AsImplementedInterfaces(x => x != typeof(IOtherInheritance))
                     .WithSingletonLifetime());
 
             Assert.Equal(2, Collection.Count);
@@ -116,7 +116,7 @@ public void UsingRegistrationStrategy_ReplaceImplementationTypes()
 
             var services = Collection.GetDescriptors<ITransientService>();
 
-            Assert.Equal(4, services.Count(x => x.ServiceType == typeof(ITransientService)));
+            Assert.Equal(3, services.Count(x => x.ServiceType == typeof(ITransientService)));
         }
 
         [Fact]
@@ -140,7 +140,7 @@ public void CanFilterTypesToScan()
             Collection.Scan(scan => scan
                 .FromAssemblyOf<ITransientService>()
                     .AddClasses(classes => classes.AssignableTo<ITransientService>())
-                        .AsImplementedInterfaces()
+                        .AsImplementedInterfaces(x => x != typeof(IOtherInheritance))
                         .WithTransientLifetime());
 
             var services = Collection.GetDescriptors<ITransientService>();
@@ -510,7 +510,7 @@ public interface ITransientService { }
     [ServiceDescriptor(typeof(ITransientService))]
     public class TransientService1 : ITransientService { }
 
-    public class TransientService2 : ITransientService { }
+    public class TransientService2 : ITransientService, IOtherInheritance { }
 
     public class TransientService : ITransientService { }