Reformat codebase

Author: Bart Koelman

benchmarks/Query/QueryParserBenchmarks.cs

@@ -20,8 +20,8 @@ namespace Benchmarks.Query
     [MemoryDiagnoser]
     public class QueryParserBenchmarks
     {
-        private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
-        private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new FakeRequestQueryStringAccessor();
+        private readonly DependencyFactory _dependencyFactory = new();
+        private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new();
         private readonly QueryStringReader _queryStringReaderForSort;
         private readonly QueryStringReader _queryStringReaderForAll;
 

benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

@@ -29,7 +29,7 @@ public class JsonApiDeserializerBenchmarks
             }
         });
 
-        private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
+        private readonly DependencyFactory _dependencyFactory = new();
         private readonly IJsonApiDeserializer _jsonApiDeserializer;
 
         public JsonApiDeserializerBenchmarks()

benchmarks/Serialization/JsonApiSerializerBenchmarks.cs

@@ -15,13 +15,13 @@ namespace Benchmarks.Serialization
     [MarkdownExporter]
     public class JsonApiSerializerBenchmarks
     {
-        private static readonly BenchmarkResource Content = new BenchmarkResource
+        private static readonly BenchmarkResource Content = new()
         {
             Id = 123,
             Name = Guid.NewGuid().ToString()
         };
 
-        private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
+        private readonly DependencyFactory _dependencyFactory = new();
         private readonly IJsonApiSerializer _jsonApiSerializer;
 
         public JsonApiSerializerBenchmarks()

src/Examples/ReportsExample/Services/ReportService.cs

@@ -31,7 +31,7 @@ private IReadOnlyCollection<Report> GetReports()
         {
             return new List<Report>
             {
-                new Report
+                new()
                 {
                     Title = "Status Report",
                     Statistics = new ReportStatistics

src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs

@@ -14,7 +14,7 @@ namespace JsonApiDotNetCore.AtomicOperations.Processors
     public class SetRelationshipProcessor<TResource, TId> : ISetRelationshipProcessor<TResource, TId>
         where TResource : class, IIdentifiable<TId>
     {
-        private readonly CollectionConverter _collectionConverter = new CollectionConverter();
+        private readonly CollectionConverter _collectionConverter = new();
         private readonly ISetRelationshipService<TResource, TId> _service;
 
         public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)

src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

@@ -30,7 +30,7 @@ namespace JsonApiDotNetCore.Configuration
     /// </summary>
     internal sealed class JsonApiApplicationBuilder : IJsonApiApplicationBuilder, IDisposable
     {
-        private readonly JsonApiOptions _options = new JsonApiOptions();
+        private readonly JsonApiOptions _options = new();
         private readonly IServiceCollection _services;
         private readonly IMvcCoreBuilder _mvcBuilder;
         private readonly ResourceGraphBuilder _resourceGraphBuilder;

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -44,7 +44,7 @@ public sealed class JsonApiOptions : IJsonApiOptions
         public bool IncludeTotalResourceCount { get; set; }
 
         /// <inheritdoc />
-        public PageSize DefaultPageSize { get; set; } = new PageSize(10);
+        public PageSize DefaultPageSize { get; set; } = new(10);
 
         /// <inheritdoc />
         public PageSize MaximumPageSize { get; set; }
@@ -80,7 +80,7 @@ public sealed class JsonApiOptions : IJsonApiOptions
         public IsolationLevel? TransactionIsolationLevel { get; set; }
 
         /// <inheritdoc />
-        public JsonSerializerSettings SerializerSettings { get; } = new JsonSerializerSettings
+        public JsonSerializerSettings SerializerSettings { get; } = new()
         {
             ContractResolver = new DefaultContractResolver
             {

src/JsonApiDotNetCore/Configuration/PageNumber.cs

@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Configuration
     [PublicAPI]
     public sealed class PageNumber : IEquatable<PageNumber>
     {
-        public static readonly PageNumber ValueOne = new PageNumber(1);
+        public static readonly PageNumber ValueOne = new(1);
 
         public int OneBasedValue { get; }
 

src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs

@@ -10,10 +10,8 @@ namespace JsonApiDotNetCore.Configuration
     /// </summary>
     internal sealed class ResourceDescriptorAssemblyCache
     {
-        private readonly TypeLocator _typeLocator = new TypeLocator();
-
-        private readonly Dictionary<Assembly, IReadOnlyCollection<ResourceDescriptor>> _resourceDescriptorsPerAssembly =
-            new Dictionary<Assembly, IReadOnlyCollection<ResourceDescriptor>>();
+        private readonly TypeLocator _typeLocator = new();
+        private readonly Dictionary<Assembly, IReadOnlyCollection<ResourceDescriptor>> _resourceDescriptorsPerAssembly = new();
 
         public void RegisterAssembly(Assembly assembly)
         {

src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs

@@ -18,8 +18,8 @@ public class ResourceGraphBuilder
     {
         private readonly IJsonApiOptions _options;
         private readonly ILogger<ResourceGraphBuilder> _logger;
-        private readonly List<ResourceContext> _resources = new List<ResourceContext>();
-        private readonly TypeLocator _typeLocator = new TypeLocator();
+        private readonly List<ResourceContext> _resources = new();
+        private readonly TypeLocator _typeLocator = new();
 
         public ResourceGraphBuilder(IJsonApiOptions options, ILoggerFactory loggerFactory)
         {
@@ -126,7 +126,7 @@ public ResourceGraphBuilder Add(Type resourceType, Type idType = null, string pu
 
         private ResourceContext CreateResourceContext(string publicName, Type resourceType, Type idType)
         {
-            return new ResourceContext
+            return new()
             {
                 PublicName = publicName,
                 ResourceType = resourceType,

src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs

@@ -17,7 +17,7 @@ namespace JsonApiDotNetCore.Configuration
     [PublicAPI]
     public static class ServiceCollectionExtensions
     {
-        private static readonly TypeLocator TypeLocator = new TypeLocator();
+        private static readonly TypeLocator TypeLocator = new();
 
         /// <summary>
         /// Configures JsonApiDotNetCore by registering resources manually.

src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs

@@ -17,7 +17,7 @@ namespace JsonApiDotNetCore.Configuration
     [PublicAPI]
     public class ServiceDiscoveryFacade
     {
-        internal static readonly HashSet<Type> ServiceInterfaces = new HashSet<Type>
+        internal static readonly HashSet<Type> ServiceInterfaces = new()
         {
             typeof(IResourceService<>),
             typeof(IResourceService<,>),
@@ -47,7 +47,7 @@ public class ServiceDiscoveryFacade
             typeof(IRemoveFromRelationshipService<,>)
         };
 
-        internal static readonly HashSet<Type> RepositoryInterfaces = new HashSet<Type>
+        internal static readonly HashSet<Type> RepositoryInterfaces = new()
         {
             typeof(IResourceRepository<>),
             typeof(IResourceRepository<,>),
@@ -57,7 +57,7 @@ public class ServiceDiscoveryFacade
             typeof(IResourceReadRepository<,>)
         };
 
-        internal static readonly HashSet<Type> ResourceDefinitionInterfaces = new HashSet<Type>
+        internal static readonly HashSet<Type> ResourceDefinitionInterfaces = new()
         {
             typeof(IResourceDefinition<>),
             typeof(IResourceDefinition<,>)
@@ -67,8 +67,8 @@ public class ServiceDiscoveryFacade
         private readonly IServiceCollection _services;
         private readonly ResourceGraphBuilder _resourceGraphBuilder;
         private readonly IJsonApiOptions _options;
-        private readonly ResourceDescriptorAssemblyCache _assemblyCache = new ResourceDescriptorAssemblyCache();
-        private readonly TypeLocator _typeLocator = new TypeLocator();
+        private readonly ResourceDescriptorAssemblyCache _assemblyCache = new();
+        private readonly TypeLocator _typeLocator = new();
 
         public ServiceDiscoveryFacade(IServiceCollection services, ResourceGraphBuilder resourceGraphBuilder, IJsonApiOptions options,
             ILoggerFactory loggerFactory)

src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs

@@ -21,7 +21,7 @@ namespace JsonApiDotNetCore.Controllers.Annotations
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
     public sealed class DisableQueryStringAttribute : Attribute
     {
-        public static readonly DisableQueryStringAttribute Empty = new DisableQueryStringAttribute(StandardQueryStringParameters.None);
+        public static readonly DisableQueryStringAttribute Empty = new(StandardQueryStringParameters.None);
         public IReadOnlyCollection<string> ParameterNames { get; }
 
         /// <summary>

src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs

@@ -271,7 +271,7 @@ public virtual async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource
             }
 
             TResource updated = await _update.UpdateAsync(id, resource, cancellationToken);
-            return updated == null ? (IActionResult)NoContent() : Ok(updated);
+            return updated == null ? NoContent() : Ok(updated);
         }
 
         /// <summary>

src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs

@@ -121,7 +121,7 @@ public virtual async Task<IActionResult> PostOperationsAsync([FromBody] IList<Op
             }
 
             IList<OperationContainer> results = await _processor.ProcessAsync(operations, cancellationToken);
-            return results.Any(result => result != null) ? (IActionResult)Ok(results) : NoContent();
+            return results.Any(result => result != null) ? Ok(results) : NoContent();
         }
 
         protected virtual void ValidateClientGeneratedIds(IEnumerable<OperationContainer> operations)

src/JsonApiDotNetCore/Errors/JsonApiException.cs

@@ -13,7 +13,7 @@ namespace JsonApiDotNetCore.Errors
     [PublicAPI]
     public class JsonApiException : Exception
     {
-        private static readonly JsonSerializerSettings ErrorSerializerSettings = new JsonSerializerSettings
+        private static readonly JsonSerializerSettings ErrorSerializerSettings = new()
         {
             NullValueHandling = NullValueHandling.Ignore,
             Formatting = Formatting.Indented

src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs

@@ -19,7 +19,7 @@ public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRe
 
         private static Error CreateError(MissingResourceInRelationship missingResourceInRelationship)
         {
-            return new Error(HttpStatusCode.NotFound)
+            return new(HttpStatusCode.NotFound)
             {
                 Title = "A related resource does not exist.",
                 Detail = $"Related resource of type '{missingResourceInRelationship.ResourceType}' with ID '{missingResourceInRelationship.ResourceId}' " +

src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs

@@ -33,9 +33,9 @@ public class JsonApiRoutingConvention : IJsonApiRoutingConvention
     {
         private readonly IJsonApiOptions _options;
         private readonly IResourceContextProvider _resourceContextProvider;
-        private readonly Dictionary<string, string> _registeredControllerNameByTemplate = new Dictionary<string, string>();
-        private readonly Dictionary<Type, ResourceContext> _resourceContextPerControllerTypeMap = new Dictionary<Type, ResourceContext>();
-        private readonly Dictionary<ResourceContext, ControllerModel> _controllerPerResourceContextMap = new Dictionary<ResourceContext, ControllerModel>();
+        private readonly Dictionary<string, string> _registeredControllerNameByTemplate = new();
+        private readonly Dictionary<Type, ResourceContext> _resourceContextPerControllerTypeMap = new();
+        private readonly Dictionary<ResourceContext, ControllerModel> _controllerPerResourceContextMap = new();
 
         public JsonApiRoutingConvention(IJsonApiOptions options, IResourceContextProvider resourceContextProvider)
         {

src/JsonApiDotNetCore/ObjectExtensions.cs

@@ -21,7 +21,7 @@ public static T[] AsArray<T>(this T element)
 
         public static List<T> AsList<T>(this T element)
         {
-            return new List<T>
+            return new()
             {
                 element
             };

src/JsonApiDotNetCore/Queries/Expressions/IncludeChainConverter.cs

@@ -100,9 +100,9 @@ private static void ConvertChainToElement(ResourceFieldChainExpression chain, Mu
 
         private sealed class IncludeToChainsConverter : QueryExpressionVisitor<object, object>
         {
-            private readonly Stack<RelationshipAttribute> _parentRelationshipStack = new Stack<RelationshipAttribute>();
+            private readonly Stack<RelationshipAttribute> _parentRelationshipStack = new();
 
-            public List<ResourceFieldChainExpression> Chains { get; } = new List<ResourceFieldChainExpression>();
+            public List<ResourceFieldChainExpression> Chains { get; } = new();
 
             public override object VisitInclude(IncludeExpression expression, object argument)
             {

src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs

@@ -11,9 +11,9 @@ namespace JsonApiDotNetCore.Queries.Expressions
     [PublicAPI]
     public class IncludeExpression : QueryExpression
     {
-        private static readonly IncludeChainConverter IncludeChainConverter = new IncludeChainConverter();
+        private static readonly IncludeChainConverter IncludeChainConverter = new();
 
-        public static readonly IncludeExpression Empty = new IncludeExpression();
+        public static readonly IncludeExpression Empty = new();
 
         public IReadOnlyCollection<IncludeElementExpression> Elements { get; }
 

src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs

@@ -11,7 +11,7 @@ namespace JsonApiDotNetCore.Queries.Internal.Parsing
     [PublicAPI]
     public class IncludeParser : QueryExpressionParser
     {
-        private static readonly IncludeChainConverter IncludeChainConverter = new IncludeChainConverter();
+        private static readonly IncludeChainConverter IncludeChainConverter = new();
 
         private readonly Action<RelationshipAttribute, ResourceContext, string> _validateSingleRelationshipCallback;
         private ResourceContext _resourceContextInScope;

src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs

@@ -21,7 +21,7 @@ public sealed class QueryTokenizer
             });
 
         private readonly string _source;
-        private readonly StringBuilder _textBuffer = new StringBuilder();
+        private readonly StringBuilder _textBuffer = new();
         private int _offset;
         private bool _isInQuotedSection;
 
@@ -119,12 +119,12 @@ private bool IsMinusInsideText(TokenKind kind)
 
         private char? PeekChar()
         {
-            return _offset + 1 < _source.Length ? (char?)_source[_offset + 1] : null;
+            return _offset + 1 < _source.Length ? _source[_offset + 1] : null;
         }
 
         private static TokenKind? TryGetSingleCharacterTokenKind(char ch)
         {
-            return SingleCharacterToTokenKinds.ContainsKey(ch) ? (TokenKind?)SingleCharacterToTokenKinds[ch] : null;
+            return SingleCharacterToTokenKinds.ContainsKey(ch) ? SingleCharacterToTokenKinds[ch] : null;
         }
 
         private Token ProduceTokenFromTextBuffer(bool isQuotedText)

src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs

@@ -13,7 +13,7 @@ namespace JsonApiDotNetCore.Queries.Internal
     [PublicAPI]
     public class QueryLayerComposer : IQueryLayerComposer
     {
-        private readonly CollectionConverter _collectionConverter = new CollectionConverter();
+        private readonly CollectionConverter _collectionConverter = new();
         private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
         private readonly IResourceContextProvider _resourceContextProvider;
         private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
@@ -409,7 +409,7 @@ public QueryLayer ComposeForHasMany<TId>(HasManyAttribute hasManyRelationship, T
                 Filter = leftFilter,
                 Projection = new Dictionary<ResourceFieldAttribute, QueryLayer>
                 {
-                    [hasManyRelationship] = new QueryLayer(rightResourceContext)
+                    [hasManyRelationship] = new(rightResourceContext)
                     {
                         Filter = rightFilter,
                         Projection = new Dictionary<ResourceFieldAttribute, QueryLayer>

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/IncludeClauseBuilder.cs

@@ -15,7 +15,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public class IncludeClauseBuilder : QueryClauseBuilder<object>
     {
-        private static readonly IncludeChainConverter IncludeChainConverter = new IncludeChainConverter();
+        private static readonly IncludeChainConverter IncludeChainConverter = new();
 
         private readonly Expression _source;
         private readonly ResourceContext _resourceContext;

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameFactory.cs

@@ -10,7 +10,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public sealed class LambdaParameterNameFactory
     {
-        private readonly HashSet<string> _namesInScope = new HashSet<string>();
+        private readonly HashSet<string> _namesInScope = new();
 
         public LambdaParameterNameScope Create(string typeName)
         {

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs

@@ -21,7 +21,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public class SelectClauseBuilder : QueryClauseBuilder<object>
     {
-        private static readonly CollectionConverter CollectionConverter = new CollectionConverter();
+        private static readonly CollectionConverter CollectionConverter = new();
         private static readonly ConstantExpression NullConstant = Expression.Constant(null);
 
         private readonly Expression _source;

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs

@@ -18,7 +18,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     [PublicAPI]
     public class WhereClauseBuilder : QueryClauseBuilder<Type>
     {
-        private static readonly CollectionConverter CollectionConverter = new CollectionConverter();
+        private static readonly CollectionConverter CollectionConverter = new();
         private static readonly ConstantExpression NullConstant = Expression.Constant(null);
 
         private readonly Expression _source;

src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs

@@ -18,16 +18,13 @@ namespace JsonApiDotNetCore.QueryStrings.Internal
     [PublicAPI]
     public class FilterQueryStringParameterReader : QueryStringParameterReader, IFilterQueryStringParameterReader
     {
-        private static readonly LegacyFilterNotationConverter LegacyConverter = new LegacyFilterNotationConverter();
+        private static readonly LegacyFilterNotationConverter LegacyConverter = new();
 
         private readonly IJsonApiOptions _options;
         private readonly QueryStringParameterScopeParser _scopeParser;
         private readonly FilterParser _filterParser;
-
-        private readonly List<FilterExpression> _filtersInGlobalScope = new List<FilterExpression>();
-
-        private readonly Dictionary<ResourceFieldChainExpression, List<FilterExpression>> _filtersPerScope =
-            new Dictionary<ResourceFieldChainExpression, List<FilterExpression>>();
+        private readonly List<FilterExpression> _filtersInGlobalScope = new();
+        private readonly Dictionary<ResourceFieldChainExpression, List<FilterExpression>> _filtersPerScope = new();
 
         private string _lastParameterName;
 

src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs

@@ -17,7 +17,7 @@ public sealed class LegacyFilterNotationConverter
         private const string InPrefix = "in:";
         private const string NotInPrefix = "nin:";
 
-        private static readonly Dictionary<string, string> PrefixConversionTable = new Dictionary<string, string>
+        private static readonly Dictionary<string, string> PrefixConversionTable = new()
         {
             ["eq:"] = Keywords.Equals,
             ["lt:"] = Keywords.LessThan,

src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs

@@ -144,10 +144,8 @@ public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
 
         private sealed class PaginationContext
         {
-            private readonly MutablePaginationEntry _globalScope = new MutablePaginationEntry();
-
-            private readonly Dictionary<ResourceFieldChainExpression, MutablePaginationEntry> _nestedScopes =
-                new Dictionary<ResourceFieldChainExpression, MutablePaginationEntry>();
+            private readonly MutablePaginationEntry _globalScope = new();
+            private readonly Dictionary<ResourceFieldChainExpression, MutablePaginationEntry> _nestedScopes = new();
 
             public MutablePaginationEntry ResolveEntryInScope(ResourceFieldChainExpression scope)
             {