Skip to content

Commit 98ffeb3

Browse files
csmircsmir
committed
Clean up assertions, remove internals exposed to
1 parent 6d27acf commit 98ffeb3

16 files changed

Lines changed: 162 additions & 269 deletions

File tree

‎src/Commands.Hosting/Commands.Hosting/Components/KeyedDependencyResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ internal sealed class KeyedDependencyResolver(IServiceProvider provider) : IDepe
44
{
55
public object? GetService(DependencyParameter dependency)
66
{
7-
if (provider is IKeyedServiceProvider keyedProvider && dependency.Attributes.FirstOrDefault<FromKeyedServicesAttribute>() is { Key: var key })
7+
if (provider is IKeyedServiceProvider keyedProvider && dependency.Attributes.OfType<FromKeyedServicesAttribute>().FirstOrDefault() is { Key: var key })
88
return keyedProvider.GetKeyedService(dependency.Type, key);
99

1010
return provider.GetService(dependency.Type);

‎src/Commands.Hosting/Commands.Hosting/Execution/CommandExecutionFactory.cs‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,31 @@ public CommandExecutionFactory(IComponentProvider execProvider, IServiceProvider
6262
break;
6363
}
6464

65-
Logger?.LogInformation("Execution succeeded for request: {Request}.", context);
65+
if (Logger?.IsEnabled(LogLevel.Information) == true)
66+
Logger.LogInformation("Execution succeeded for request: {Request}.", context);
6667

6768
services.GetService<IExecutionScope>()?.Dispose();
6869
};
6970

70-
Logger?.LogInformation("Consuming {ExecutionProvider}, with {HandlerCount} result handler{MoreOrOne}.", Provider.GetType().FullName, handlers.Length, handlers.Length != 1 ? "(s)" : "");
71+
if (Logger?.IsEnabled(LogLevel.Information) == true)
72+
Logger.LogInformation("Consuming {ExecutionProvider}, with {HandlerCount} result handler{MoreOrOne}.", Provider.GetType().FullName, handlers.Length, handlers.Length != 1 ? "(s)" : "");
7173

7274
var commands = execProvider.Components.GetCommands().ToArray();
7375

7476
foreach (var command in commands)
75-
Logger?.LogDebug("Registered {Command} as \"{Name}\".", command.ToString(), command.GetFullName());
77+
if (Logger?.IsEnabled(LogLevel.Debug) == true)
78+
Logger.LogDebug("Registered {Command} as \"{Name}\".", command.ToString(), command.GetFullName());
7679

7780
if (commands.Length == 0)
78-
Logger?.LogWarning("No commands discovered. The factory will not handle inbound requests.");
81+
{
82+
if (Logger?.IsEnabled(LogLevel.Warning) == true)
83+
Logger.LogWarning("No commands discovered. The factory will not handle inbound requests.");
84+
}
7985
else
80-
Logger?.LogInformation("Discovered {CommandCount} command{MoreOrOne}.", commands.Length, commands.Length > 1 ? "s" : "");
86+
{
87+
if (Logger?.IsEnabled(LogLevel.Information) == true)
88+
Logger.LogInformation("Discovered {CommandCount} command{MoreOrOne}.", commands.Length, commands.Length > 1 ? "s" : "");
89+
}
8190
}
8291

8392
/// <summary>
@@ -92,17 +101,20 @@ public CommandExecutionFactory(IComponentProvider execProvider, IServiceProvider
92101
/// <exception cref="NotSupportedException">Thrown when the <see cref="IServiceProvider"/> cannot resolve the scoped <see cref="IExecutionScope"/> as its internal implementation. When customizing the <see cref="IExecutionScope"/> implementation, the factory must be overridden to support it.</exception>
93102
public virtual async Task ExecuteScope(IExecutionScope scope, ExecutionOptions? options = null)
94103
{
95-
Assert.NotNull(scope, nameof(scope));
104+
ArgumentNullException.ThrowIfNull(scope);
96105

97106
if (scope?.Context is null)
98107
throw new InvalidOperationException($"{nameof(IExecutionScope)} must have a context set before executing it. Use {nameof(CreateScope)} with a provided context or assign the scope before it enters {nameof(ExecuteScope)}.");
99108

100109
options ??= ExecutionOptions.Default;
101110

102-
Logger?.LogDebug(
103-
"Starting execution for request: {Request}",
104-
scope.Context
105-
);
111+
if (Logger?.IsEnabled(LogLevel.Debug) == true)
112+
{
113+
Logger.LogDebug(
114+
"Starting execution for request: {Request}",
115+
scope.Context
116+
);
117+
}
106118

107119
await Provider.Execute(scope.Context, options);
108120
}
@@ -121,10 +133,13 @@ public virtual IExecutionScope CreateScope(IContext? context = null)
121133
executionScope.Scope = scope;
122134
executionScope.Context = context!;
123135

124-
Logger?.LogDebug(
125-
"Created execution scope of type {ExecutionScopeType}.",
126-
executionScope.GetType().Name
127-
);
136+
if (Logger?.IsEnabled(LogLevel.Debug) == true)
137+
{
138+
Logger.LogDebug(
139+
"Created execution scope of type {ExecutionScopeType}.",
140+
executionScope.GetType().Name
141+
);
142+
}
128143

129144
return executionScope;
130145
}

‎src/Commands.Http/Commands.Http/Execution/HttpCommandContext.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public HttpCommandContext(HttpListenerContext httpContext, IServiceProvider serv
5252

5353
_services = services;
5454

55-
var arguments = Array.Empty<string>();
55+
var arguments = new List<string>();
5656
var rootPath = Request.Url!.AbsolutePath[1..];
5757

5858
while (true)
@@ -61,12 +61,12 @@ public HttpCommandContext(HttpListenerContext httpContext, IServiceProvider serv
6161

6262
if (indexOf == -1)
6363
{
64-
Commands.Utilities.CopyTo(ref arguments, rootPath);
64+
arguments.Add(rootPath);
6565
break;
6666
}
6767
else
6868
{
69-
Commands.Utilities.CopyTo(ref arguments, rootPath[..indexOf]);
69+
arguments.Add(rootPath[..indexOf]);
7070

7171
rootPath = rootPath[(indexOf + 1)..];
7272

@@ -78,13 +78,13 @@ public HttpCommandContext(HttpListenerContext httpContext, IServiceProvider serv
7878
// Make this a variable as the getter of QueryString doesn't store the produced value.
7979
var queryString = Request.QueryString;
8080

81-
var arg = new KeyValuePair<string, object?>[arguments.Length + queryString.Count];
81+
var arg = new KeyValuePair<string, object?>[arguments.Count + queryString.Count];
8282

83-
for (var i = 0; i < arguments.Length; i++)
83+
for (var i = 0; i < arguments.Count; i++)
8484
arg[i] = new(arguments[i], null);
8585

8686
for (var i = 0; i < queryString.Count; i++)
87-
arg[arguments.Length + i] = new(queryString.GetKey(i)!, queryString.Get(i));
87+
arg[arguments.Count + i] = new(queryString.GetKey(i)!, queryString.Get(i));
8888

8989
Arguments = new(arg);
9090
Elements = new Dictionary<string, object?>();
@@ -105,7 +105,7 @@ public virtual void Respond(IHttpResult result)
105105
if (_closed)
106106
throw new InvalidOperationException("The HTTP response has already been sent.");
107107

108-
Assert.NotNull(result, nameof(result));
108+
ArgumentNullException.ThrowIfNull(result);
109109

110110
Response.StatusCode = (int)result.StatusCode;
111111
Response.StatusDescription = result.StatusCode.ToString();

‎src/Commands.Http/Commands.Http/Execution/HttpCommandExecutionFactory.cs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public Task StartAsync(CancellationToken cancellationToken = default)
3232
// Configure remaining prefixes if any were provided in configuration.
3333
foreach (var prefix in configuration.GetSection("Commands:Http:Prefixes").GetChildren())
3434
{
35-
Logger?.LogDebug("Configuring HTTP prefix: {Prefix}", prefix.Value);
35+
if (Logger?.IsEnabled(LogLevel.Debug) == true)
36+
Logger.LogDebug("Configuring HTTP prefix: {Prefix}", prefix.Value);
3637

3738
if (!string.IsNullOrWhiteSpace(prefix.Value) && !httpListener.Prefixes.Contains(prefix.Value))
3839
httpListener.Prefixes.Add(prefix.Value);
@@ -42,14 +43,18 @@ public Task StartAsync(CancellationToken cancellationToken = default)
4243
httpListener.Start();
4344

4445
foreach (var prefix in httpListener.Prefixes)
45-
Logger?.LogInformation("Listening on {Prefix}", prefix);
46+
{
47+
if (Logger?.IsEnabled(LogLevel.Information) == true)
48+
Logger.LogInformation("Listening on {Prefix}", prefix);
49+
}
4650

4751
_linkedTokenSrc = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
4852
_runningTask = Task.Run(() => StartListening(_linkedTokenSrc.Token), _linkedTokenSrc.Token);
4953
}
5054
catch (HttpListenerException ex)
5155
{
52-
Logger?.LogError(ex, "Failed to start HTTP listener. Ensure that the application has permission to use the specified prefixes, or specify permissions in case none are set.");
56+
if (Logger?.IsEnabled(LogLevel.Error) == true)
57+
Logger.LogError(ex, "Failed to start HTTP listener. Ensure that the application has permission to use the specified prefixes, or specify permissions in case none are set.");
5358

5459
throw;
5560
}
@@ -67,7 +72,8 @@ public async Task StopAsync(CancellationToken cancellationToken = default)
6772
if (_runningTask is null)
6873
return;
6974

70-
Logger?.LogInformation("Stopping {FactoryType}...", nameof(HttpCommandExecutionFactory));
75+
if (Logger?.IsEnabled(LogLevel.Information) == true)
76+
Logger.LogInformation("Stopping {FactoryType}...", nameof(HttpCommandExecutionFactory));
7177

7278
try
7379
{
@@ -82,7 +88,8 @@ await _runningTask.WaitAsync(cancellationToken)
8288
.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
8389
}
8490

85-
Logger?.LogInformation("{FactoryType} stopped.", nameof(HttpCommandExecutionFactory));
91+
if (Logger?.IsEnabled(LogLevel.Information) == true)
92+
Logger.LogInformation("{FactoryType} stopped.", nameof(HttpCommandExecutionFactory));
8693
}
8794

8895
/// <summary>
@@ -102,7 +109,8 @@ protected virtual async Task Listened(Task<HttpListenerContext> contextTask, Can
102109

103110
scope.Context = new HttpCommandContext(requestContext, scope.Scope.ServiceProvider);
104111

105-
Logger?.LogInformation("Received inbound request: {Request}", scope.Context);
112+
if (Logger?.IsEnabled(LogLevel.Information) == true)
113+
Logger.LogInformation("Received inbound request: {Request}", scope.Context);
106114

107115
await ExecuteScope(scope, new()
108116
{

0 commit comments

Comments
 (0)