Lower the amout of public classes

Author: CapulusCodeNinja

nexus/Program.cs

@@ -7,6 +7,7 @@
 using Nexus.Config;
 using Nexus.External.Apis.FileSystem;
 using Nexus.External.Apis.ProcessManagement;
+using Nexus.External.Apis.ServiceManagement;
 using Nexus.Logging;
 using Nexus.Startup;
 
@@ -35,9 +36,10 @@ public static async Task<int> Main(string[] args)
             var settings = new Settings();
             var filesystem = new FileSystem();
             var processManager = new ProcessManager();
+            var serviceController = new ServiceControllerWrapper();
 
             // Use hosted service for ALL command types
-            var host = CreateHostBuilder(cmd, filesystem, processManager, settings).Build();
+            var host = CreateHostBuilder(cmd, filesystem, processManager, serviceController, settings).Build();
             await host.RunAsync();
 
             return 0;
@@ -59,10 +61,11 @@ public static async Task<int> Main(string[] args)
     /// <param name="cmd">Command line context.</param>
     /// <param name="fileSystem">The file system abstraction.</param>
     /// <param name="processManager">The process manager abstraction.</param>
+    /// <param name="serviceController">Service controller abstraction.</param>
     /// <param name="settings">The product settings.</param>
     /// <returns>Configured host builder.</returns>
     [SupportedOSPlatform("windows")]
-    internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
+    internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, IFileSystem fileSystem, IProcessManager processManager, IServiceController serviceController, ISettings settings)
     {
         var builder = Host.CreateDefaultBuilder(cmd.Args)
             .ConfigureLogging((context, logging) => logging.AddNexusLogging(
@@ -75,7 +78,7 @@ internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, IFileSyst
 
                 // Register ONLY the main hosted service (no others)
                 var ununsedHost = services.AddHostedService(sp =>
-                    new MainHostedService(cmd, fileSystem, processManager, settings));
+                    new MainHostedService(cmd, fileSystem, processManager, serviceController, settings));
                 });
 
         // Configure Windows Service support if in service mode

nexus/Startup/MainHostedService.cs

@@ -6,6 +6,7 @@
 using Nexus.Config;
 using Nexus.External.Apis.FileSystem;
 using Nexus.External.Apis.ProcessManagement;
+using Nexus.External.Apis.ServiceManagement;
 using Nexus.Protocol;
 using Nexus.Setup;
 
@@ -33,10 +34,11 @@ internal class MainHostedService : IHostedService
     /// <param name="commandLineContext">Command line context.</param>
     /// <param name="fileSystem">The file system abstraction.</param>
     /// <param name="processManager">The process manager abstraction.</param>
+    /// <param name="serviceController">Service controller abstraction.</param>
     /// <param name="settings">The product settings.</param>
     public MainHostedService(
-        CommandLineContext commandLineContext, IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
-        : this(commandLineContext, new ProtocolServer(fileSystem, processManager, settings), new ProductInstallation(settings), fileSystem, processManager, settings)
+        CommandLineContext commandLineContext, IFileSystem fileSystem, IProcessManager processManager, IServiceController serviceController, ISettings settings)
+        : this(commandLineContext, new ProtocolServer(fileSystem, processManager, settings), new ProductInstallation(fileSystem, processManager, serviceController, settings), fileSystem, processManager, settings)
     {
     }
 

nexus_engine/nexus_engine/DebugEngine.cs

@@ -139,7 +139,7 @@ public async Task<string> CreateSessionAsync(string dumpFilePath, string? symbol
 
         try
         {
-            var preprocessor = new CommandPreprocessor(m_FileSystem, m_Settings);
+            var preprocessor = new CommandPreprocessor(m_FileSystem, m_ProcessManager, m_Settings);
             var session = new DebugSession(sessionId, dumpFilePath, symbolPath, m_Settings, m_FileSystem, m_ProcessManager, m_BatchProcessor, preprocessor);
 
             // Subscribe to session events

nexus_engine/nexus_engine/Preprocessing/CommandPreprocessor.cs

@@ -3,6 +3,7 @@
 
 using Nexus.Config;
 using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 
 namespace Nexus.Engine.Preprocessing;
 
@@ -16,7 +17,7 @@ internal partial class CommandPreprocessor
     /// <summary>
     /// Path handler for WSL to Windows path conversion.
     /// </summary>
-    private readonly PathHandler m_PathHandler = new();
+    private readonly PathHandler m_PathHandler;
 
     /// <summary>
     /// File system abstraction for directory operations.
@@ -34,11 +35,13 @@ internal partial class CommandPreprocessor
     /// Initializes a new instance of the <see cref="CommandPreprocessor"/> class.
     /// </summary>
     /// <param name="fileSystem">The file system abstraction for directory operations.</param>
+    /// <param name="processManager">The process manager.</param>
     /// <param name="settings">The product settings.</param>
-    public CommandPreprocessor(IFileSystem fileSystem, ISettings settings)
+    public CommandPreprocessor(IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
     {
         m_FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
         m_Settings = settings;
+        m_PathHandler = new PathHandler(processManager);
     }
 
     /// <summary>

nexus_engine/nexus_engine/Preprocessing/PathHandler.cs

@@ -1,6 +1,8 @@
 using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
 
+using Nexus.External.Apis.ProcessManagement;
+
 namespace Nexus.Engine.Preprocessing;
 
 /// <summary>
@@ -19,9 +21,10 @@ internal partial class PathHandler
     /// <summary>
     /// Initializes a new instance of the <see cref="PathHandler"/> class.
     /// </summary>
-    public PathHandler()
+    /// <param name="processManager">The process manager.</param>
+    public PathHandler(IProcessManager processManager)
     {
-        m_WslConverter = new WslPathConverter();
+        m_WslConverter = new WslPathConverter(processManager);
     }
 
     /// <summary>

nexus_engine/nexus_engine/Preprocessing/WslPathConverter.cs

@@ -13,19 +13,11 @@ internal partial class WslPathConverter
     private const int WslHelperTimeoutMs = 2000;
     private readonly IProcessManager m_ProcessManager;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WslPathConverter"/> class.
-    /// </summary>
-    public WslPathConverter()
-        : this(new ProcessManager())
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="WslPathConverter"/> class.
     /// </summary>
     /// <param name="processManager">The process manager for executing wsl.exe.</param>
-    internal WslPathConverter(IProcessManager processManager)
+    public WslPathConverter(IProcessManager processManager)
     {
         m_ProcessManager = processManager ?? throw new ArgumentNullException(nameof(processManager));
     }

nexus_engine/nexus_engine_extensions/Core/Executor.cs

@@ -28,29 +28,14 @@ internal class Executor
     // Compiled regex to strip ANSI escape sequences from process output
     private static readonly Regex AnsiRegex = new("\x1B\\[[0-9;]*[A-Za-z]", RegexOptions.Compiled);
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Executor"/> class with default dependencies.
-    /// </summary>
-    /// <param name="manager">The extension manager.</param>
-    /// <param name="tokenValidator">The token validator.</param>
-    /// <param name="settings">The product settings.</param>
-    public Executor(Manager manager, TokenValidator tokenValidator, ISettings settings)
-        : this(
-        manager,
-        tokenValidator,
-        new ProcessManager(),
-        settings)
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="Executor"/> class with injected dependencies.
     /// </summary>
     /// <param name="manager">The extension manager.</param>
     /// <param name="tokenValidator">The token validator.</param>
     /// <param name="processManager">The process manager.</param>
     /// <param name="settings">The product settings.</param>
-    internal Executor(
+    public Executor(
         Manager manager,
         TokenValidator tokenValidator,
         IProcessManager processManager,

nexus_engine/nexus_engine_extensions/Core/Manager.cs

@@ -24,25 +24,14 @@ internal class Manager : IDisposable
     private int m_Version = 0;
     private bool m_Disposed;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Manager"/> class with default dependencies.
-    /// </summary>
-    /// <param name="settings">The product settings.</param>
-    /// <exception cref="ArgumentNullException">Thrown when logger is null.</exception>
-    /// <exception cref="ArgumentException">Thrown when extensionsPath is null or empty.</exception>
-    public Manager(ISettings settings)
-        : this(new FileSystem(), settings)
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="Manager"/> class with specified dependencies.
     /// </summary>
     /// <param name="fileSystem">The file system abstraction.</param>
     /// <param name="settings">The product settings.</param>
     /// <exception cref="ArgumentNullException">Thrown when fileSystem is null.</exception>
     /// <exception cref="ArgumentException">Thrown when extensionsPath is null or empty.</exception>
-    internal Manager(IFileSystem fileSystem, ISettings settings)
+    public Manager(IFileSystem fileSystem, ISettings settings)
     {
         m_FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
         m_Logger = LogManager.GetCurrentClassLogger();

nexus_setup/Core/ServiceInstaller.cs

@@ -22,21 +22,13 @@ internal class ServiceInstaller : IServiceInstaller
     private readonly IProcessManager m_ProcessManager;
     private readonly IServiceController m_ServiceController;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ServiceInstaller"/> class.
-    /// </summary>
-    public ServiceInstaller()
-        : this(new FileSystem(), new ProcessManager(), new ServiceControllerWrapper())
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="ServiceInstaller"/> class.
     /// </summary>
     /// <param name="fileSystem">File system abstraction.</param>
     /// <param name="processManager">Process manager abstraction.</param>
     /// <param name="serviceController">Service controller abstraction.</param>
-    internal ServiceInstaller(
+    public ServiceInstaller(
         IFileSystem fileSystem,
         IProcessManager processManager,
         IServiceController serviceController)

nexus_setup/Core/ServiceUpdater.cs

@@ -24,21 +24,13 @@ internal class ServiceUpdater
     private readonly IServiceController m_ServiceController;
     private readonly DirectoryCopyUtility m_DirectoryCopyUtility;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ServiceUpdater"/> class.
-    /// </summary>
-    public ServiceUpdater()
-        : this(new FileSystem(), new ProcessManager(), new ServiceControllerWrapper())
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="ServiceUpdater"/> class.
     /// </summary>
     /// <param name="fileSystem">File system abstraction.</param>
     /// <param name="processManager">Process manager abstraction.</param>
     /// <param name="serviceController">Service controller abstraction.</param>
-    internal ServiceUpdater(IFileSystem fileSystem, IProcessManager processManager, IServiceController serviceController)
+    public ServiceUpdater(IFileSystem fileSystem, IProcessManager processManager, IServiceController serviceController)
     {
         m_Logger = LogManager.GetCurrentClassLogger();