Namespace cleanup

Particular · Mar 6, 2024 · ef429eb · ef429eb
1 parent 77e6ff5
commit ef429eb
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 35 deletions.
diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs b/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs
@@ -3,11 +3,11 @@
     using System;
     using System.Threading.Tasks;
     using AcceptanceTesting.EndpointTemplates;
+    using Hosting.Commands;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting.Support;
     using NServiceBus.Features;
     using Particular.ServiceControl;
-    using Particular.ServiceControl.Commands;
 
     public class DefaultServer : IEndpointSetupTemplate
     {

diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -6,6 +6,7 @@
     using System.Text.Json;
     using System.Threading.Tasks;
     using AcceptanceTesting;
+    using Hosting.Commands;
     using Infrastructure.DomainEvents;
     using Infrastructure.WebApi;
     using Microsoft.AspNetCore.Builder;
@@ -19,7 +20,6 @@
     using NServiceBus.AcceptanceTesting.Support;
     using NServiceBus.Configuration.AdvancedExtensibility;
     using Particular.ServiceControl;
-    using Particular.ServiceControl.Commands;
     using Particular.ServiceControl.Hosting;
     using RavenDB.Shared;
     using ServiceBus.Management.Infrastructure.Settings;

diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/CommandRunner.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/CommandRunner.cs
@@ -4,13 +4,8 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
 
-    class CommandRunner
+    class CommandRunner(List<Type> commands)
     {
-        public CommandRunner(List<Type> commands)
-        {
-            this.commands = commands;
-        }
-
         public async Task Execute(HostArguments args, Settings.Settings settings)
         {
             foreach (var commandType in commands)
@@ -19,7 +14,5 @@ public async Task Execute(HostArguments args, Settings.Settings settings)
                 await command.Execute(args, settings);
             }
         }
-
-        readonly List<Type> commands;
     }
 }
diff --git a/src/ServiceControl.Monitoring/Hosting/Commands/SetupCommand.cs b/src/ServiceControl.Monitoring/Hosting/Commands/SetupCommand.cs
@@ -1,7 +1,6 @@
 namespace ServiceControl.Monitoring
 {
     using System.Threading.Tasks;
-    using Infrastructure;
     using LicenseManagement;
     using NServiceBus.Logging;
     using Transports;

diff --git a/src/ServiceControl/Hosting/Commands/AbstractCommand.cs b/src/ServiceControl/Hosting/Commands/AbstractCommand.cs
@@ -1,7 +1,7 @@
-namespace Particular.ServiceControl.Commands
+namespace ServiceControl.Hosting.Commands
 {
     using System.Threading.Tasks;
-    using Hosting;
+    using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
 
     abstract class AbstractCommand

diff --git a/src/ServiceControl/Hosting/Commands/CommandRunner.cs b/src/ServiceControl/Hosting/Commands/CommandRunner.cs
@@ -1,18 +1,13 @@
-namespace Particular.ServiceControl.Commands
+namespace ServiceControl.Hosting.Commands
 {
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using Hosting;
+    using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
 
-    class CommandRunner
+    class CommandRunner(List<Type> commands)
     {
-        public CommandRunner(List<Type> commands)
-        {
-            this.commands = commands;
-        }
-
         public async Task Execute(HostArguments args, Settings settings)
         {
             foreach (var commandType in commands)
@@ -21,7 +16,5 @@ public async Task Execute(HostArguments args, Settings settings)
                 await command.Execute(args, settings);
             }
         }
-
-        readonly List<Type> commands;
     }
 }
diff --git a/src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs b/src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs
@@ -9,7 +9,6 @@
     using NServiceBus;
     using Operations;
     using Particular.ServiceControl;
-    using Particular.ServiceControl.Commands;
     using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
 

diff --git a/src/ServiceControl/Hosting/Commands/MaintenanceModeCommand.cs b/src/ServiceControl/Hosting/Commands/MaintenanceModeCommand.cs
@@ -5,7 +5,6 @@
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Hosting.WindowsServices;
     using Particular.ServiceControl;
-    using Particular.ServiceControl.Commands;
     using Particular.ServiceControl.Hosting;
     using Persistence;
     using ServiceBus.Management.Infrastructure.Settings;

diff --git a/src/ServiceControl/Hosting/Commands/RunCommand.cs b/src/ServiceControl/Hosting/Commands/RunCommand.cs
@@ -1,12 +1,13 @@
-namespace Particular.ServiceControl.Commands
+namespace ServiceControl.Hosting.Commands
 {
     using System.Threading.Tasks;
-    using global::ServiceControl;
-    using Hosting;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.Extensions.Hosting;
     using NServiceBus;
+    using Particular.ServiceControl;
+    using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
+    using ServiceControl;
 
     class RunCommand : AbstractCommand
     {

diff --git a/src/ServiceControl/Hosting/Commands/SetupCommand.cs b/src/ServiceControl/Hosting/Commands/SetupCommand.cs
@@ -1,14 +1,15 @@
-namespace Particular.ServiceControl.Commands
+namespace ServiceControl.Hosting.Commands
 {
     using System.Runtime.InteropServices;
     using System.Threading.Tasks;
-    using global::ServiceControl.LicenseManagement;
-    using global::ServiceControl.Persistence;
-    using global::ServiceControl.Transports;
-    using Hosting;
     using NServiceBus.Logging;
+    using Particular.ServiceControl;
+    using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Installers;
     using ServiceBus.Management.Infrastructure.Settings;
+    using LicenseManagement;
+    using Persistence;
+    using Transports;
 
     class SetupCommand : AbstractCommand
     {

diff --git a/src/ServiceControl/Hosting/HostArguments.cs b/src/ServiceControl/Hosting/HostArguments.cs
@@ -5,7 +5,6 @@ namespace Particular.ServiceControl.Hosting
     using System.IO;
     using System.Linq;
     using System.Reflection;
-    using Commands;
     using global::ServiceControl.Configuration;
     using global::ServiceControl.Hosting.Commands;
     using ServiceBus.Management.Infrastructure.Settings;

diff --git a/src/ServiceControl/Program.cs b/src/ServiceControl/Program.cs
@@ -5,8 +5,8 @@
     using System.Reflection;
     using System.Runtime.Loader;
     using System.Threading.Tasks;
-    using Commands;
     using global::ServiceControl.Configuration;
+    using global::ServiceControl.Hosting.Commands;
     using global::ServiceControl.Persistence;
     using global::ServiceControl.Transports;
     using Hosting;