Fix registration

shinyorg · May 16, 2024 · 38e8151 · 38e8151
1 parent 24d98d9
commit 38e8151
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 44 deletions.
diff --git a/src/Shiny.Extensions.WebHosting/Contracts/Address.cs b/src/Shiny.Extensions.WebHosting/Contracts/Address.cs
diff --git a/src/Shiny.Extensions.WebHosting/Contracts/ContactMethod.cs b/src/Shiny.Extensions.WebHosting/Contracts/ContactMethod.cs
diff --git a/src/Shiny.Extensions.WebHosting/Contracts/Geo.cs b/src/Shiny.Extensions.WebHosting/Contracts/Geo.cs
diff --git a/src/Shiny.Extensions.WebHosting/Contracts/Name.cs b/src/Shiny.Extensions.WebHosting/Contracts/Name.cs
diff --git a/src/Shiny.Extensions.WebHosting/Contracts/Ranges.cs b/src/Shiny.Extensions.WebHosting/Contracts/Ranges.cs
diff --git a/src/Shiny.Extensions.WebHosting/RegistrationExtensions.cs b/src/Shiny.Extensions.WebHosting/RegistrationExtensions.cs
@@ -29,11 +29,11 @@ public static WebApplicationBuilder AddInfrastructureForAppDomain(this WebApplic
             })
             .ToArray();
 
-        return builder.AddInfrastructure(assemblies);
+        return builder.AddInfrastructureWithAssemblies(assemblies);
     }
 
 
-    public static WebApplicationBuilder AddInfrastructure(this WebApplicationBuilder builder, params Assembly[] assemblies)
+    public static WebApplicationBuilder AddInfrastructureWithAssemblies(this WebApplicationBuilder builder, params Assembly[] assemblies)
     {
         if (assemblies.Length == 0)
             throw new InvalidOperationException("No assemblies passed to scan");
@@ -54,15 +54,15 @@ public static WebApplicationBuilder AddInfrastructure(this WebApplicationBuilder
             {
                 Console.WriteLine("Registering Infrastructure Module: " + moduleType.FullName);
                 var module = (IInfrastructureModule)Activator.CreateInstance(moduleType)!;
-                builder.AddInfrastructure(module);
+                builder.AddInfrastructureWithModules(module);
                 Console.WriteLine("Successfully Registered Infrastructure Module: " + moduleType.FullName);
             }
         }
         return builder;
     }
 
 
-    public static WebApplicationBuilder AddInfrastructure(this WebApplicationBuilder builder, params IInfrastructureModule[] modules)
+    public static WebApplicationBuilder AddInfrastructureWithModules(this WebApplicationBuilder builder, params IInfrastructureModule[] modules)
     {
         foreach (var module in modules)
         {

diff --git a/tests/Shiny.Extensions.WebHosting.Tests/RegistrationTests.cs b/tests/Shiny.Extensions.WebHosting.Tests/RegistrationTests.cs
@@ -27,7 +27,7 @@ public void DidRegisterAll_AppDomain()
     public void DidRegisterAll_SingleAssembly()
     {
         var builder = WebApplication.CreateBuilder();
-        builder.AddInfrastructure(Assembly.GetExecutingAssembly());
+        builder.AddInfrastructureWithAssemblies(Assembly.GetExecutingAssembly());
         this.FireAll(builder);
     }
 
@@ -36,7 +36,7 @@ public void DidRegisterAll_SingleAssembly()
     public void DidRegister_OnlyOneModule()
     {
         var builder = WebApplication.CreateBuilder();
-        builder.AddInfrastructure(new Module1());
+        builder.AddInfrastructureWithModules(new Module1());
 
         Module1.AddCalled.Should().BeTrue("Module1.Add should be true");
         Module1.UseCalled.Should().BeFalse("Module1.Use should not have been fired");