clean

Author: hlaueriksson

src/CommandQuery.Abstractions/ICommand.cs

@@ -3,15 +3,11 @@ namespace CommandQuery
     /// <summary>
     /// Marker interface to represent a command.
     /// </summary>
-    public interface ICommand
-    {
-    }
+    public interface ICommand;
 
     /// <summary>
     /// Marker interface to represent a command with result.
     /// </summary>
     /// <typeparam name="TResult">Result type.</typeparam>
-    public interface ICommand<TResult>
-    {
-    }
+    public interface ICommand<TResult>;
 }

src/CommandQuery.Abstractions/IQuery.cs

@@ -4,7 +4,5 @@ namespace CommandQuery
     /// Marker interface to represent a query.
     /// </summary>
     /// <typeparam name="TResult">Result type.</typeparam>
-    public interface IQuery<TResult>
-    {
-    }
+    public interface IQuery<TResult>;
 }

src/CommandQuery.AzureFunctions/Internal/HttpRequestExtensions.cs

@@ -17,7 +17,7 @@ internal static class HttpRequestExtensions
                 return null;
             }
 
-            using (var reader = new StreamReader(req.Body, bufferSize: 1024, detectEncodingFromByteOrderMarks: true, encoding: encoding ?? Encoding.UTF8, leaveOpen: true))
+            using (var reader = new StreamReader(req.Body, encoding: encoding ?? Encoding.UTF8, detectEncodingFromByteOrderMarks: true, bufferSize: 1024, leaveOpen: true))
             {
                 return await reader.ReadToEndAsync().ConfigureAwait(false);
             }

src/CommandQuery.Client/Internal/QueryExtensions.cs

@@ -35,7 +35,7 @@ private static string QueryString(this object query)
 
             Parameters(query, string.Empty);
 
-            return string.Join("&", result.ToArray());
+            return string.Join("&", [.. result]);
 
             void Parameters(object root, string prefix)
             {

src/CommandQuery.GoogleCloudFunctions/Internal/HttpExtensions.cs

@@ -18,7 +18,7 @@ internal static class HttpExtensions
                 return null;
             }
 
-            using (var reader = new StreamReader(req.Body, bufferSize: 1024, detectEncodingFromByteOrderMarks: true, encoding: encoding ?? Encoding.UTF8, leaveOpen: true))
+            using (var reader = new StreamReader(req.Body, encoding: encoding ?? Encoding.UTF8, detectEncodingFromByteOrderMarks: true, bufferSize: 1024, leaveOpen: true))
             {
                 return await reader.ReadToEndAsync().ConfigureAwait(false);
             }

src/CommandQuery/CommandTypeProvider.cs

@@ -12,7 +12,7 @@ public class CommandTypeProvider : TypeProvider, ICommandTypeProvider
         /// <param name="assemblies">The assemblies with commands to support.</param>
         /// <exception cref="CommandTypeException">Multiple commands with the same name was found.</exception>
         public CommandTypeProvider(params Assembly[] assemblies)
-            : base(new[] { typeof(ICommand), typeof(ICommand<>) }, assemblies)
+            : base([typeof(ICommand), typeof(ICommand<>)], assemblies)
         {
         }
 

src/CommandQuery/Internal/ExceptionExtensions.cs

@@ -37,8 +37,7 @@ internal static IError ToError(this QueryException exception)
         private static Dictionary<string, object>? GetDetails(Exception exception)
         {
             var properties = exception.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)
-                .Where(x => x.DeclaringType != typeof(Exception))
-                .Where(x => x.GetValue(exception) != null)
+                .Where(x => x.DeclaringType != typeof(Exception) && x.GetValue(exception) != null)
                 .ToList();
 
             return properties.Any() ? properties.ToDictionary(property => property.Name, property => property.GetValue(exception)) : null;

src/CommandQuery/Internal/ReflectionExtensions.cs

@@ -36,7 +36,7 @@ private static bool IsAssignableToGenericType(this Type type, Type genericType)
         {
             return type.GetInterfaces().Any(it => it.GetTypeInfo().IsGenericType && it.GetGenericTypeDefinition() == genericType)
                    || (type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == genericType)
-                   || (type.GetTypeInfo().BaseType != null && type.GetTypeInfo().BaseType.IsAssignableToGenericType(genericType));
+                   || (type.GetTypeInfo().BaseType?.IsAssignableToGenericType(genericType) == true);
         }
     }
 }

src/CommandQuery/Internal/ServiceProviderExtensions.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -28,15 +27,15 @@ internal static IEnumerable<Type> GetAllServiceTypes(this IServiceProvider provi
         {
             if (provider is not ServiceProvider serviceProvider)
             {
-                return Enumerable.Empty<Type>();
+                return [];
             }
 
             var callSiteFactory = GetPropertyValue(serviceProvider, "CallSiteFactory");
             var descriptors = GetPropertyValue(callSiteFactory, "Descriptors");
 
             if (descriptors is not ServiceDescriptor[] array)
             {
-                return Enumerable.Empty<Type>();
+                return [];
             }
 
             return array.Select(x => x.ServiceType).ToList();

src/CommandQuery/QueryTypeProvider.cs

@@ -12,7 +12,7 @@ public class QueryTypeProvider : TypeProvider, IQueryTypeProvider
         /// <param name="assemblies">The assemblies with queries to support.</param>
         /// <exception cref="QueryTypeException">Multiple queries with the same name was found.</exception>
         public QueryTypeProvider(params Assembly[] assemblies)
-            : base(new[] { typeof(IQuery<>) }, assemblies)
+            : base([typeof(IQuery<>)], assemblies)
         {
         }
 

src/CommandQuery/TypeProvider.cs

@@ -19,7 +19,7 @@ public abstract class TypeProvider
         protected TypeProvider(Type[] baseTypes, params Assembly[] assemblies)
         {
             _baseTypes = baseTypes;
-            _types = new Dictionary<string, Type>();
+            _types = [];
             LoadTypeCaches(assemblies);
         }
 

tests/CommandQuery.AWSLambda.Tests/Internal/APIGatewayProxyRequestExtensionsTests.cs

@@ -7,7 +7,7 @@ namespace CommandQuery.AWSLambda.Tests.Internal
 {
     public class APIGatewayProxyRequestExtensionsTests
     {
-        private readonly APIGatewayProxyRequest _request;
+        private readonly APIGatewayProxyRequest _request = null;
 
         [Test]
         public void Ok()

tests/CommandQuery.AspNetCore.Tests/CommandQueryControllerModelConventionTests.cs

@@ -17,35 +17,35 @@ public async Task when_Apply()
 
             void should_handle_CommandControllers_without_result()
             {
-                var result = new ControllerModel(typeof(CommandController<FakeCommand>).GetTypeInfo(), new List<object>());
+                var result = new ControllerModel(typeof(CommandController<FakeCommand>).GetTypeInfo(), []);
                 Subject.Apply(result);
                 result.ControllerName.Should().Be("FakeCommand");
             }
 
             void should_handle_CommandControllers_with_result()
             {
-                var result = new ControllerModel(typeof(CommandController<FakeResultCommand, FakeResult>).GetTypeInfo(), new List<object>());
+                var result = new ControllerModel(typeof(CommandController<FakeResultCommand, FakeResult>).GetTypeInfo(), []);
                 Subject.Apply(result);
                 result.ControllerName.Should().Be("FakeResultCommand");
             }
 
             void should_handle_QueryControllers()
             {
-                var result = new ControllerModel(typeof(QueryController<FakeQuery, FakeResult>).GetTypeInfo(), new List<object>());
+                var result = new ControllerModel(typeof(QueryController<FakeQuery, FakeResult>).GetTypeInfo(), []);
                 Subject.Apply(result);
                 result.ControllerName.Should().Be("FakeQuery");
             }
 
             void should_not_handle_non_generic_controllers()
             {
-                var result = new ControllerModel(typeof(ControllerBase).GetTypeInfo(), new List<object>());
+                var result = new ControllerModel(typeof(ControllerBase).GetTypeInfo(), []);
                 Subject.Apply(result);
                 result.ControllerName.Should().BeNull();
             }
 
             void should_not_handle_unknown_controllers()
             {
-                var result = new ControllerModel(typeof(FakeController<>).GetTypeInfo(), new List<object>());
+                var result = new ControllerModel(typeof(FakeController<>).GetTypeInfo(), []);
                 Subject.Apply(result);
                 result.ControllerName.Should().BeNull();
             }

tests/CommandQuery.AzureFunctions.Tests/FakeHttpData.cs

@@ -15,7 +15,7 @@ public FakeHttpRequestData(FunctionContext functionContext, string method = null
 
         public override Stream Body { get; } = new MemoryStream();
 
-        public override HttpHeadersCollection Headers { get; } = new();
+        public override HttpHeadersCollection Headers { get; } = [];
 
         public override IReadOnlyCollection<IHttpCookie> Cookies { get; }
 
@@ -38,7 +38,7 @@ public FakeHttpResponseData(FunctionContext functionContext) : base(functionCont
         }
 
         public override HttpStatusCode StatusCode { get; set; }
-        public override HttpHeadersCollection Headers { get; set; } = new();
+        public override HttpHeadersCollection Headers { get; set; } = [];
         public override Stream Body { get; set; } = new MemoryStream();
         public override HttpCookies Cookies { get; }
     }

tests/CommandQuery.Benchmark/JsonBenchmarks.cs

@@ -19,9 +19,9 @@ public void GlobalSetup()
                 DateTime = DateTime.Parse("2021-07-04 20:31:48"),
                 Guid = Guid.Parse("b665da2a-60fe-4f2b-baf1-9d766e2542d3"),
                 NullableDouble = 2.1,
-                Array = new[] { 1, 2 },
-                IEnumerable = new[] { 3, 4 },
-                List = new List<int> { 5, 6 }
+                Array = [1, 2],
+                IEnumerable = [3, 4],
+                List = [5, 6]
             };
 
             _systemTextJsonString = System.Text.Json.JsonSerializer.Serialize(_object);

tests/CommandQuery.Tests/Client/Integration/QueryClientIntegrationTests.cs

@@ -27,7 +27,7 @@ public async Task when_PostAsync()
         [Test]
         public async Task when_GetAsync()
         {
-            var result = await Subject.GetAsync(new QuxQuery { Ids = new[] { Guid.NewGuid(), Guid.NewGuid() } });
+            var result = await Subject.GetAsync(new QuxQuery { Ids = [Guid.NewGuid(), Guid.NewGuid()] });
             result.Should().NotBeNull();
 
             Func<Task> act = () => Subject.GetAsync(new FailQuery());

tests/CommandQuery.Tests/Internal/ExceptionExtensionsTests.cs

@@ -47,9 +47,9 @@ public void when_converting_CommandException_to_Error()
                 DateTime = DateTime.Parse("2018-07-06"),
                 Guid = Guid.Parse("3B10C34C-D423-4EC3-8811-DA2E0606E241"),
                 NullableDouble = 2.1,
-                Array = new[] { 1, 2 },
-                IEnumerable = new[] { 3, 4 },
-                List = new List<int> { 5, 6 },
+                Array = [1, 2],
+                IEnumerable = [3, 4],
+                List = [5, 6],
                 Enum = FakeEnum.Some
             };
 
@@ -85,9 +85,9 @@ public void when_converting_QueryException_to_Error()
                 DateTime = DateTime.Parse("2018-07-06"),
                 Guid = Guid.Parse("3B10C34C-D423-4EC3-8811-DA2E0606E241"),
                 NullableDouble = 2.1,
-                Array = new[] { 1, 2 },
-                IEnumerable = new[] { 3, 4 },
-                List = new List<int> { 5, 6 },
+                Array = [1, 2],
+                IEnumerable = [3, 4],
+                List = [5, 6],
                 Enum = FakeEnum.Some
             };