Remove ArrayFactory.Create

json-api-dotnet · Nov 21, 2023 · af66d71 · af66d71
1 parent 6beb3d9
commit af66d71
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 27 deletions.
diff --git a/benchmarks/QueryString/QueryStringParserBenchmarks.cs b/benchmarks/QueryString/QueryStringParserBenchmarks.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.Design;
 using BenchmarkDotNet.Attributes;
 using Benchmarks.Tools;
-using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries.Parsing;
@@ -55,8 +54,14 @@ public QueryStringParserBenchmarks()
         var paginationParser = new PaginationParser();
         var paginationReader = new PaginationQueryStringParameterReader(paginationParser, request, resourceGraph, options);
 
-        IQueryStringParameterReader[] readers = ArrayFactory.Create<IQueryStringParameterReader>(includeReader, filterReader, sortReader,
-            sparseFieldSetReader, paginationReader);
+        IQueryStringParameterReader[] readers =
+        [
+            includeReader,
+            filterReader,
+            sortReader,
+            sparseFieldSetReader,
+            paginationReader
+        ];
 
         _queryStringReader = new QueryStringReader(options, _queryStringAccessor, readers, NullLoggerFactory.Instance);
     }

diff --git a/src/JsonApiDotNetCore/ArrayFactory.cs b/src/JsonApiDotNetCore/ArrayFactory.cs
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs b/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
@@ -152,9 +152,11 @@ private void AddResourceDefinitions(Assembly assembly, ResourceDescriptor resour
 
     private void RegisterImplementations(Assembly assembly, Type interfaceType, ResourceDescriptor resourceDescriptor)
     {
-        Type[] typeArguments = interfaceType.GetTypeInfo().GenericTypeParameters.Length == 2
-            ? ArrayFactory.Create(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType)
-            : ArrayFactory.Create(resourceDescriptor.ResourceClrType);
+        Type[] typeArguments =
+        [
+            resourceDescriptor.ResourceClrType,
+            resourceDescriptor.IdClrType
+        ];
 
         (Type implementationType, Type serviceInterface)? result = _typeLocator.GetContainerRegistrationFromAssembly(assembly, interfaceType, typeArguments);
 

diff --git a/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs b/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
@@ -207,7 +207,12 @@ private abstract class ModelStateKeySegment
         private const char Dot = '.';
         private const char BracketOpen = '[';
         private const char BracketClose = ']';
-        private static readonly char[] KeySegmentStartTokens = ArrayFactory.Create(Dot, BracketOpen);
+
+        private static readonly char[] KeySegmentStartTokens =
+        [
+            Dot,
+            BracketOpen
+        ];
 
         // The right part of the full key, which nested segments are produced from.
         private readonly string _nextKey;

diff --git a/src/JsonApiDotNetCore/Queries/QueryableBuilding/OrderClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/QueryableBuilding/OrderClauseBuilder.cs
@@ -57,7 +57,12 @@ private static string GetOperationName(bool isAscending, QueryClauseBuilderConte
     private static Expression ExtensionMethodCall(Expression source, string operationName, Type keyType, LambdaExpression keySelector,
         QueryClauseBuilderContext context)
     {
-        Type[] typeArguments = ArrayFactory.Create(context.LambdaScope.Parameter.Type, keyType);
+        Type[] typeArguments =
+        [
+            context.LambdaScope.Parameter.Type,
+            keyType
+        ];
+
         return Expression.Call(context.ExtensionType, operationName, typeArguments, source, keySelector);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/QueryableBuilding/SelectClauseBuilder.cs
@@ -247,7 +247,12 @@ private static Expression CopyCollectionExtensionMethodCall(Expression source, s
 
     private static Expression SelectExtensionMethodCall(Type extensionType, Expression source, Type elementType, Expression selectBody)
     {
-        Type[] typeArguments = ArrayFactory.Create(elementType, elementType);
+        Type[] typeArguments =
+        [
+            elementType,
+            elementType
+        ];
+
         return Expression.Call(extensionType, "Select", typeArguments, source, selectBody);
     }
 

diff --git a/src/JsonApiDotNetCore/Resources/ResourceFactory.cs b/src/JsonApiDotNetCore/Resources/ResourceFactory.cs
@@ -50,7 +50,7 @@ private static IIdentifiable CreateWrapperForAbstractType(Type resourceClrType)
         Type wrapperClrType = typeof(AbstractResourceWrapper<>).MakeGenericType(descriptor.IdClrType);
         ConstructorInfo constructor = wrapperClrType.GetConstructors().Single();
 
-        object resource = constructor.Invoke(ArrayFactory.Create<object>(resourceClrType));
+        object resource = constructor.Invoke([resourceClrType]);
         return (IIdentifiable)resource;
     }
 

diff --git a/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs
@@ -17,7 +17,13 @@ public ETagGenerator(IFingerprintGenerator fingerprintGenerator)
     /// <inheritdoc />
     public EntityTagHeaderValue Generate(string requestUrl, string responseBody)
     {
-        string fingerprint = _fingerprintGenerator.Generate(ArrayFactory.Create(requestUrl, responseBody));
+        string[] elements =
+        [
+            requestUrl,
+            responseBody
+        ];
+
+        string fingerprint = _fingerprintGenerator.Generate(elements);
         string eTagValue = $"\"{fingerprint}\"";
 
         return EntityTagHeaderValue.Parse(eTagValue);

diff --git a/...Tests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs b/...Tests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using FluentAssertions;
-using JsonApiDotNetCore;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
@@ -880,7 +879,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             dbContext.WorkItems.Add(existingWorkItem);
             await dbContext.SaveChangesAsync();
 
-            existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
+            existingWorkItem.RelatedFrom = [existingWorkItem];
             await dbContext.SaveChangesAsync();
         });
 

diff --git a/...CoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/...CoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
@@ -965,7 +965,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             dbContext.WorkItems.Add(existingWorkItem);
             await dbContext.SaveChangesAsync();
 
-            existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
+            existingWorkItem.RelatedFrom = [existingWorkItem];
             await dbContext.SaveChangesAsync();
         });
 

diff --git a/...piDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCapturingDefinition.cs b/...piDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCapturingDefinition.cs
@@ -82,7 +82,7 @@ public override Task OnWriteSucceededAsync(TResource resource, WriteOperationKin
 
     private void EnsureSnapshot(TResource leftType, IIdentifiable? rightResourceId = null)
     {
-        IIdentifiable[] rightResourceIds = rightResourceId != null ? ArrayFactory.Create(rightResourceId) : Array.Empty<IIdentifiable>();
+        IIdentifiable[] rightResourceIds = rightResourceId != null ? [rightResourceId] : Array.Empty<IIdentifiable>();
 
         EnsureSnapshot(leftType, rightResourceIds);
     }