Tweaks to assembly scan for asp.net core

OuterlimitsTech · Mar 10, 2024 · 4d8baeb · 4d8baeb
1 parent 9f49918
commit 4d8baeb
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/src/OLT.AspNetCore/Extensions/OltServiceCollectionAspnetCoreExtensions.cs b/src/OLT.AspNetCore/Extensions/OltServiceCollectionAspnetCoreExtensions.cs
@@ -2,11 +2,22 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualBasic;
 
 namespace OLT.Core
 {
     public static class OltServiceCollectionAspnetCoreExtensions
     {
+        /// <summary>
+        /// Build Default AspNetCore Service and configures Dependency Injection
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="action">Invoked after initialized</param>
+        /// <returns></returns>
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, Action<IMvcBuilder>? action = null)
+        {
+            return AddOltAspNetCore(services, new OltInjectionAssemblyFilter(), action);
+        }
 
         /// <summary>
         /// Build Default AspNetCore Service and configures Dependency Injection
@@ -15,9 +26,21 @@ public static class OltServiceCollectionAspnetCoreExtensions
         /// <param name="action">Invoked after initialized</param>
         /// <param name="filter">Assembly Filter</param>
         /// <returns></returns>
-        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, Action<IMvcBuilder>? action = null, OltInjectionAssemblyFilter? filter = null)
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, OltInjectionAssemblyFilter filter, Action<IMvcBuilder>? action = null)
+        {
+            return AddOltAspNetCore(services, new List<Assembly>(), filter, action);
+        }
+
+        /// <summary>
+        /// Build Default AspNetCore Service and configures Dependency Injection
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="baseAssembly">Assembly to include in scan for interfaces</param>
+        /// <param name="action">Invoked after initialized</param>
+        /// <returns></returns>
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, Assembly baseAssembly, Action<IMvcBuilder>? action = null)
         {
-            return AddOltAspNetCore(services, new List<Assembly>(), action, filter);
+            return AddOltAspNetCore(services, baseAssembly, null, action);
         }
 
         /// <summary>
@@ -28,15 +51,28 @@ public static IServiceCollection AddOltAspNetCore(this IServiceCollection servic
         /// <param name="action">Invoked after initialized</param>
         /// <param name="filter">Assembly Filter</param>
         /// <returns></returns>
-        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, Assembly baseAssembly, Action<IMvcBuilder>? action = null, OltInjectionAssemblyFilter? filter = null)
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, Assembly baseAssembly, OltInjectionAssemblyFilter filter, Action<IMvcBuilder>? action = null)
         {
             if (baseAssembly == null)
             {
                 throw new ArgumentNullException(nameof(baseAssembly));
             }
-            return AddOltAspNetCore(services, new List<Assembly>() { baseAssembly }, action, filter);
+            return AddOltAspNetCore(services, new List<Assembly>() { baseAssembly }, filter, action);
+        }
+
+        /// <summary>
+        /// Build Default AspNetCore Service and configures Dependency Injection
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="baseAssemblies">List of assemblies to include in scan for interfaces</param>
+        /// <param name="action">Invoked after initialized</param>
+        /// <returns></returns>
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, List<Assembly> baseAssemblies, Action<IMvcBuilder>? action = null)
+        {
+            return AddOltAspNetCore(services, baseAssemblies, new OltInjectionAssemblyFilter(), action);
         }
 
+
         /// <summary>
         /// Build Default AspNetCore Service and configures Dependency Injection
         /// </summary>
@@ -45,7 +81,7 @@ public static IServiceCollection AddOltAspNetCore(this IServiceCollection servic
         /// <param name="action">Invoked after initialized</param>
         /// <param name="filter">Assembly Filter</param>
         /// <returns></returns>
-        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, List<Assembly> baseAssemblies, Action<IMvcBuilder>? action = null, OltInjectionAssemblyFilter? filter = null)
+        public static IServiceCollection AddOltAspNetCore(this IServiceCollection services, List<Assembly> baseAssemblies, OltInjectionAssemblyFilter filter, Action<IMvcBuilder>? action = null)
         {
 
             if (services == null)
@@ -78,9 +114,6 @@ public static IServiceCollection AddOltAspNetCore(this IServiceCollection servic
 
             return services;
         }
-
-
-
 
     }
 }
diff --git a/src/OLT.Extensions.General/OltSystemReflectionExtensions.cs b/src/OLT.Extensions.General/OltSystemReflectionExtensions.cs
@@ -261,7 +261,7 @@ public static IEnumerable<T> GetAllImplements<T>(this Assembly assembly)
         /// <returns>Returns an instance for all objects</returns>
         public static IEnumerable<T> GetAllImplements<T>(this Assembly[] assemblies)
         {
-            return GetAllImplements<T>(assemblies.ToList());
+            return GetAllImplements<T>(assemblies.AsEnumerable());
         }