Add FromTypes methods to match other assembly selector naming convention, obsolete existing ones

Author: khellang

src/Scrutor/ITypeSelector.cs

@@ -10,12 +10,28 @@ public interface ITypeSelector : IFluentInterface
     /// </summary>
     /// <param name="types">The types in which assemblies that should be scanned.</param>
     /// <exception cref="ArgumentNullException">If the <paramref name="types"/> argument is <c>null</c>.</exception>
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
     IServiceTypeSelector AddTypes(params Type[] types);
 
     /// <summary>
     /// Will scan the types <see cref="Type"/> in <paramref name="types"/>.
     /// </summary>
     /// <param name="types">The types in which assemblies that should be scanned.</param>
     /// <exception cref="ArgumentNullException">If the <paramref name="types"/> argument is <c>null</c>.</exception>
+    IServiceTypeSelector FromTypes(params Type[] types);
+
+    /// <summary>
+    /// Will scan the types <see cref="Type"/> in <paramref name="types"/>.
+    /// </summary>
+    /// <param name="types">The types in which assemblies that should be scanned.</param>
+    /// <exception cref="ArgumentNullException">If the <paramref name="types"/> argument is <c>null</c>.</exception>
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
     IServiceTypeSelector AddTypes(IEnumerable<Type> types);
-}
+
+    /// <summary>
+    /// Will scan the types <see cref="Type"/> in <paramref name="types"/>.
+    /// </summary>
+    /// <param name="types">The types in which assemblies that should be scanned.</param>
+    /// <exception cref="ArgumentNullException">If the <paramref name="types"/> argument is <c>null</c>.</exception>
+    IServiceTypeSelector FromTypes(IEnumerable<Type> types);
+}

src/Scrutor/TypeSelectorExtensions.cs

@@ -1,28 +1,38 @@
+using System;
 using JetBrains.Annotations;
 
 namespace Scrutor;
 
 [PublicAPI]
 public static class TypeSelectorExtensions
 {
-    public static IServiceTypeSelector AddType<T>(this ITypeSelector selector)
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
+    public static IServiceTypeSelector AddType<T>(this ITypeSelector selector) => selector.FromType<T>();
+
+    public static IServiceTypeSelector FromType<T>(this ITypeSelector selector)
     {
         Preconditions.NotNull(selector, nameof(selector));
 
-        return selector.AddTypes(typeof(T));
+        return selector.FromTypes(typeof(T));
     }
 
-    public static IServiceTypeSelector AddTypes<T1, T2>(this ITypeSelector selector)
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
+    public static IServiceTypeSelector AddTypes<T1, T2>(this ITypeSelector selector) => selector.FromTypes<T1, T2>();
+
+    public static IServiceTypeSelector FromTypes<T1, T2>(this ITypeSelector selector)
     {
         Preconditions.NotNull(selector, nameof(selector));
 
-        return selector.AddTypes(typeof(T1), typeof(T2));
+        return selector.FromTypes(typeof(T1), typeof(T2));
     }
 
-    public static IServiceTypeSelector AddTypes<T1, T2, T3>(this ITypeSelector selector)
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
+    public static IServiceTypeSelector AddTypes<T1, T2, T3>(this ITypeSelector selector) => selector.FromTypes<T1, T2, T3>();
+
+    public static IServiceTypeSelector FromTypes<T1, T2, T3>(this ITypeSelector selector)
     {
         Preconditions.NotNull(selector, nameof(selector));
 
-        return selector.AddTypes(typeof(T1), typeof(T2), typeof(T3));
+        return selector.FromTypes(typeof(T1), typeof(T2), typeof(T3));
     }
 }

src/Scrutor/TypeSourceSelector.cs

@@ -120,18 +120,15 @@ public IImplementationTypeSelector FromAssemblies(IEnumerable<Assembly> assembli
         return InternalFromAssemblies(assemblies);
     }
 
-    public IServiceTypeSelector AddTypes(params Type[] types)
-    {
-        Preconditions.NotNull(types, nameof(types));
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
+    public IServiceTypeSelector AddTypes(params Type[] types) => FromTypes(types);
 
-        var selector = new ImplementationTypeSelector(this, types);
+    [Obsolete("This method has been marked obsolete and will be removed in the next major version. Use " + nameof(FromTypes) + " instead.")]
+    public IServiceTypeSelector AddTypes(IEnumerable<Type> types) => FromTypes(types);
 
-        Selectors.Add(selector);
-
-        return selector.AddClasses();
-    }
+    public IServiceTypeSelector FromTypes(params Type[] types) => FromTypes(types.AsEnumerable());
 
-    public IServiceTypeSelector AddTypes(IEnumerable<Type> types)
+    public IServiceTypeSelector FromTypes(IEnumerable<Type> types)
     {
         Preconditions.NotNull(types, nameof(types));
 
@@ -188,4 +185,4 @@ private IImplementationTypeSelector AddSelector(IEnumerable<Type> types)
 
         return selector;
     }
-}
+}

test/Scrutor.Tests/ScanningTests.cs

@@ -17,7 +17,7 @@ public class ScanningTests : TestBase
         public void Scan_TheseTypes()
         {
             Collection.Scan(scan => scan
-                .AddTypes<TransientService1, TransientService2>()
+                .FromTypes<TransientService1, TransientService2>()
                     .AsImplementedInterfaces(x => x != typeof(IOtherInheritance))
                     .WithSingletonLifetime());
 
@@ -383,7 +383,7 @@ public void ShouldRegisterOpenGenericTypes()
             };
 
             Collection.Scan(scan => scan
-                .AddTypes(genericTypes)
+                .FromTypes(genericTypes)
                     .AddClasses()
                     .AsImplementedInterfaces());
 
@@ -402,7 +402,7 @@ public void ShouldRegisterOpenGenericTypes()
         [Fact]
         public void ShouldNotIncludeCompilerGeneratedTypes()
         {
-            Assert.Empty(Collection.Scan(scan => scan.AddType<CompilerGenerated>()));
+            Assert.Empty(Collection.Scan(scan => scan.FromType<CompilerGenerated>()));
         }
 
         [Fact]

test/Scrutor.Tests/Scrutor.Tests.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"  PrivateAssets="All"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="All" />
   </ItemGroup>