Encapsulate router

Author: Archivelit

src/Server/Infrastructure/Routing/src/LiteHttp/Routing/IRouter.cs

@@ -0,0 +1,6 @@
+namespace LiteHttp.Routing;
+
+public interface IRouter
+{
+    public Func<IActionResult>? GetAction(HttpContext context);
+}

src/Server/Infrastructure/Routing/src/LiteHttp/Routing/Router.cs

@@ -1,10 +1,10 @@
 namespace LiteHttp.Routing;
 
-public sealed class Router
+internal sealed class Router : IRouter
 {
     private IEndpointContext? _endpointContext;
 
-    public Func<IActionResult>? GetAction(in HttpContext context) =>
+    public Func<IActionResult>? GetAction(HttpContext context) =>
         _endpointContext?.EndpointProvider.GetEndpoint(context.Route, context.Method);
 
     public void SetContext(IEndpointContext endpointContext) =>

src/Server/Infrastructure/Routing/src/LiteHttp/Routing/RouterEventAdapter.cs

@@ -3,11 +3,9 @@
 #nullable disable
 public sealed class RouterEventAdapter
 {
-    private readonly Router _router;
+    private readonly IRouter _router;
 
-    public RouterEventAdapter() => _router = new();
-
-    public RouterEventAdapter(Router router) => _router = router;
+    public RouterEventAdapter(IRouter router) => _router = router;
 
     public void Handle(ConnectionContext connectionContext)
     {

src/Server/Infrastructure/Routing/src/LiteHttp/Routing/RouterFactory.cs

@@ -0,0 +1,13 @@
+namespace LiteHttp.Routing;
+
+public sealed class RouterFactory
+{
+    public static IRouter Build(IEndpointContext context)
+    {
+        var router = new Router();
+
+        router.SetContext(context);
+        
+        return router;
+    }
+}

src/Server/Infrastructure/Server/src/LiteHttp/Server/EventDriven/InternalServer.cs

@@ -32,8 +32,7 @@ public InternalServer(ILogger? logger, IPAddress address, int port)
 
         EndpointProviderConfiguration = new EndpointProviderConfiguration();
 
-        var router = new Router();
-        router.SetContext(EndpointProviderConfiguration.EndpointContext);
+        var router = RouterFactory.Build(EndpointProviderConfiguration.EndpointContext);
 
         RouterAdapter = new(router);
 

src/Server/Infrastructure/WorkerServices/src/LiteHttp/WorkerServices/RequestProcessor.cs

@@ -7,7 +7,7 @@
 /// </summary>
 internal sealed class RequestProcessor : IDisposable, IRequestProcessor
 {
-    private readonly Router _router = new();
+    private readonly IRouter _router;
     private readonly Parser _parser = Parser.Instance;
     private readonly ResponseBuilder _responseBuilder = new();
     private readonly ILogger<RequestProcessor> _logger;
@@ -21,7 +21,7 @@ internal sealed class RequestProcessor : IDisposable, IRequestProcessor
     /// <param name="logger">Logger used by whole app.</param>
     public RequestProcessor(IEndpointContext endpointContext, string address, int port, ILogger logger)
     {
-        _router.SetContext(endpointContext);
+        _router = RouterFactory.Build(endpointContext);
         _logger = logger.ForContext<RequestProcessor>();
 
         _responseBuilder.Address = address;

src/Server/Infrastructure/WorkerServices/src/LiteHttp/WorkerServices/ServerWorker.cs

@@ -4,16 +4,21 @@
 public sealed class ServerWorker : IServerWorker, IDisposable
 {
     private readonly Responder _responder = Responder.Instance;
-    private readonly Router _router = new();
+    private readonly IRouter _router;
     private readonly Parser _parser = Parser.Instance;
     private readonly Receiver _receiver = Receiver.Instance;
     private readonly ResponseBuilder _responseBuilder = new();
-
-    private ILogger<ServerWorker> _logger = NullLogger<ServerWorker>.Instance;
+    private readonly ILogger<ServerWorker> _logger;
     // TODO: refactor to handle large requests and prevent unexpected errors
 
-    public ServerWorker(IEndpointContext endpointContext, string address, int port, ILogger logger) =>
-        Initialize(endpointContext: endpointContext, logger: logger, port: port, address: address);
+    public ServerWorker(IEndpointContext endpointContext, string address, int port, ILogger logger)
+    {
+        _router = RouterFactory.Build(endpointContext);
+        _logger = logger.ForContext<ServerWorker>();
+
+        _responseBuilder.Address = address;
+        _responseBuilder.Port = port;
+    }
 
     public void SetHostPort(int port) =>
         _responseBuilder.Port = port;
@@ -83,13 +88,4 @@ private async ValueTask SendResponseAndDisposeConnection(Socket connection, Read
         connection.Close();
         connection.Dispose();
     }
-
-    private void Initialize(IEndpointContext endpointContext, ILogger logger, int port, string address)
-    {
-        _router.SetContext(endpointContext);
-        _logger = logger.ForContext<ServerWorker>();
-
-        _responseBuilder.Address = address;
-        _responseBuilder.Port = port;
-    }
 }