Cleanup

Systemorph · Jan 13, 2025 · 3c3468e · 3c3468e
1 parent c5fbd2d
commit 3c3468e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 47 deletions.
diff --git a/test/MeshWeaver.Import.Test/ImportMappingTest.cs b/test/MeshWeaver.Import.Test/ImportMappingTest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -30,14 +28,9 @@ MessageHubConfiguration configuration
                 )
             );
 
-    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration conf, Dictionary<string, Type> types)
+    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration conf)
     {
-        return base.ConfigureRouter(conf, new Dictionary<string, Type>()
-            {
-                { new ClientAddress().Type, typeof(ClientAddress) },
-                { new HostAddress().Type, typeof(HostAddress) },
-                { new RouterAddress().Type, typeof(RouterAddress) }
-            })
+        return base.ConfigureRouter(conf)
             .WithHostedHub(
                 new TestDomain.ImportAddress(),
                 config =>

diff --git a/test/MeshWeaver.Import.Test/ImportTest.cs b/test/MeshWeaver.Import.Test/ImportTest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Text.Json;
 using System.Threading;
@@ -23,14 +21,9 @@ namespace MeshWeaver.Import.Test;
 public class ImportTest(ITestOutputHelper output) : HubTestBase(output)
 {
     protected override MessageHubConfiguration ConfigureRouter(
-        MessageHubConfiguration configuration, Dictionary<string, Type> types)
+        MessageHubConfiguration configuration)
     {
-        return base.ConfigureRouter(configuration, new Dictionary<string, Type>()
-            {
-                { new ClientAddress().Type, typeof(ClientAddress) },
-                { new HostAddress().Type, typeof(HostAddress) },
-                { new RouterAddress().Type, typeof(RouterAddress) }
-            })
+        return base.ConfigureRouter(configuration)
             .WithRoutes(forward =>
                 forward
                     .RouteAddressToHostedHub<ReferenceDataAddress>(c => c.ConfigureReferenceDataModel())

diff --git a/test/MeshWeaver.Import.Test/ImportValidationTest.cs b/test/MeshWeaver.Import.Test/ImportValidationTest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
+using System.Reactive.Linq;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -33,14 +31,9 @@ protected override MessageHubConfiguration ConfigureHost(MessageHubConfiguration
             );
     }
 
-    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration conf, Dictionary<string, Type> types)
+    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration conf)
     {
-        return base.ConfigureRouter(conf, new Dictionary<string, Type>()
-        {
-            { new ClientAddress().Type, typeof(ClientAddress) },
-            { new HostAddress().Type, typeof(HostAddress) },
-            { new RouterAddress().Type, typeof(RouterAddress) }
-        }).WithHostedHub(
+        return base.ConfigureRouter(conf).WithHostedHub(
                 new TestDomain.ImportAddress(),
                 config =>
                     config

diff --git a/test/MeshWeaver.Import.Test/SnapshotImportTest.cs b/test/MeshWeaver.Import.Test/SnapshotImportTest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -28,14 +26,9 @@ MessageHubConfiguration configuration
                 )
             );
 
-    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration configuration, Dictionary<string, Type> types)
+    protected override MessageHubConfiguration ConfigureRouter(MessageHubConfiguration configuration)
     {
-        return base.ConfigureRouter(configuration, new Dictionary<string, Type>()
-            {
-                { new ClientAddress().Type, typeof(ClientAddress) },
-                { new HostAddress().Type, typeof(HostAddress) },
-                { new RouterAddress().Type, typeof(RouterAddress) }
-            })
+        return base.ConfigureRouter(configuration)
             .WithHostedHub(
                 new TestDomain.ImportAddress(),
                 config =>

diff --git a/test/MeshWeaver.Northwind.Test/NorthwindTest.cs b/test/MeshWeaver.Northwind.Test/NorthwindTest.cs
@@ -28,14 +28,9 @@ namespace MeshWeaver.Northwind.Test;
 public class NorthwindTest(ITestOutputHelper output) : HubTestBase(output)
 {
     protected override MessageHubConfiguration ConfigureRouter(
-        MessageHubConfiguration configuration, Dictionary<string, Type> types)
+        MessageHubConfiguration configuration)
     {
-        return base.ConfigureRouter(configuration, new Dictionary<string, Type>()
-            {
-                { new ClientAddress().Type, typeof(ClientAddress) },
-                { new HostAddress().Type, typeof(HostAddress) },
-                { new RouterAddress().Type, typeof(RouterAddress) }
-            })
+        return base.ConfigureRouter(configuration)
             .WithRoutes(forward =>
                 forward
                     .RouteAddressToHostedHub<ReferenceDataAddress>(c =>