Fix CA1859: Use concrete types when possible for improved performance

bkoelman · bkoelman · commit af0414f49922 · 2024-10-01T12:20:31.000+02:00
diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiClient.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiClient.cs
@@ -29,7 +29,7 @@ public IDisposable WithPartialAttributeSerialization<TRequestDocument, TAttribut
     {
         ArgumentGuard.NotNull(requestDocument);
 
-        var attributeNames = new HashSet<string>();
+        HashSet<string> attributeNames = [];
 
         foreach (Expression<Func<TAttributesObject, object?>> selector in alwaysIncludedAttributeSelectors)
         {
@@ -96,10 +96,10 @@ public void Dispose()
     /// </summary>
     private sealed class AlwaysIncludedAttributes
     {
-        private readonly ISet<string> _propertyNames;
+        private readonly HashSet<string> _propertyNames;
         private readonly Type _attributesObjectType;
 
-        public AlwaysIncludedAttributes(ISet<string> propertyNames, Type attributesObjectType)
+        public AlwaysIncludedAttributes(HashSet<string> propertyNames, Type attributesObjectType)
         {
             ArgumentGuard.NotNull(propertyNames);
             ArgumentGuard.NotNull(attributesObjectType);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
@@ -63,7 +63,7 @@ public void Configure(SwaggerGenOptions options)
         options.DocumentFilter<UnusedComponentSchemaCleaner>();
     }
 
-    private IEnumerable<Type> SelectDerivedTypes(Type baseType)
+    private List<Type> SelectDerivedTypes(Type baseType)
     {
         if (baseType == typeof(ResourceData))
         {
@@ -103,7 +103,7 @@ private List<Type> GetConstructedTypesForAtomicOperation()
         return derivedTypes;
     }
 
-    private static IList<string> GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)
+    private static List<string> GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)
     {
         MethodInfo actionMethod = description.ActionDescriptor.GetActionMethod();
         ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs
@@ -12,7 +12,7 @@ public IReadOnlySet<ResourceType> GetReachableRelatedTypes(ResourceType resource
     {
         ArgumentGuard.NotNull(resourceType);
 
-        var resourceTypesFound = new HashSet<ResourceType>();
+        HashSet<ResourceType> resourceTypesFound = [];
         AddTypesFromRelationships(resourceType.Relationships, resourceTypesFound);
         return resourceTypesFound;
     }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
@@ -39,7 +39,7 @@ public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProv
     private ActionDescriptorCollection GetActionDescriptors()
     {
         List<ActionDescriptor> newDescriptors = _defaultProvider.ActionDescriptors.Items.ToList();
-        List<ActionDescriptor> endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToList();
+        ActionDescriptor[] endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToArray();
 
         foreach (ActionDescriptor endpoint in endpoints)
         {
@@ -69,7 +69,7 @@ internal static bool IsVisibleJsonApiEndpoint(ActionDescriptor descriptor)
         return descriptor is ControllerActionDescriptor controllerAction && controllerAction.Properties.ContainsKey(typeof(ApiDescriptionActionData));
     }
 
-    private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)
+    private static List<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)
     {
         switch (jsonApiEndpointMetadata)
         {
@@ -133,10 +133,10 @@ private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)
             contentType is HeaderConstants.MediaType or HeaderConstants.AtomicOperationsMediaType or HeaderConstants.RelaxedAtomicOperationsMediaType);
     }
 
-    private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
+    private static List<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
         Action<ActionDescriptor, Type, string> expansionCallback)
     {
-        var expansion = new List<ActionDescriptor>();
+        List<ActionDescriptor> expansion = [];
 
         foreach ((string relationshipName, Type documentType) in metadata.DocumentTypesByRelationshipName)
         {
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs
@@ -27,7 +27,7 @@ internal sealed class JsonApiSchemaIdSelector
     private const string RelationshipIdentifierSchemaIdTemplate = "[ResourceName] [RelationshipName] Relationship Identifier";
     private const string RelationshipNameSchemaIdTemplate = "[ResourceName] [RelationshipName] Relationship Name";
 
-    private static readonly IDictionary<Type, string> SchemaTypeToTemplateMap = new Dictionary<Type, string>
+    private static readonly Dictionary<Type, string> SchemaTypeToTemplateMap = new()
     {
         [typeof(CreateResourceRequestDocument<>)] = "Create [ResourceName] Request Document",
         [typeof(UpdateResourceRequestDocument<>)] = "Update [ResourceName] Request Document",
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
@@ -144,7 +144,7 @@ private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint, R
         }
     }
 
-    private static IEnumerable<HttpStatusCode> GetSuccessStatusCodesForEndpoint(JsonApiEndpoint endpoint)
+    private static HttpStatusCode[] GetSuccessStatusCodesForEndpoint(JsonApiEndpoint endpoint)
     {
         return endpoint switch
         {
@@ -176,7 +176,7 @@ private static IEnumerable<HttpStatusCode> GetSuccessStatusCodesForEndpoint(Json
         };
     }
 
-    private IEnumerable<HttpStatusCode> GetErrorStatusCodesForEndpoint(JsonApiEndpoint endpoint, ResourceType? resourceType)
+    private HttpStatusCode[] GetErrorStatusCodesForEndpoint(JsonApiEndpoint endpoint, ResourceType? resourceType)
     {
         // Condition doesn't apply to atomic operations, because Forbidden is also used when an operation is not accessible.
         ClientIdGenerationMode clientIdGeneration = resourceType?.ClientIdGeneration ?? _options.ClientIdGeneration;
@@ -212,12 +212,12 @@ private IEnumerable<HttpStatusCode> GetErrorStatusCodesForEndpoint(JsonApiEndpoi
                 HttpStatusCode.UnprocessableEntity
             ],
             JsonApiEndpoint.DeleteResource => [HttpStatusCode.NotFound],
-            JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship => new[]
-            {
+            JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship =>
+            [
                 HttpStatusCode.BadRequest,
                 HttpStatusCode.NotFound,
                 HttpStatusCode.Conflict
-            },
+            ],
             JsonApiEndpoint.PostOperations =>
             [
                 HttpStatusCode.BadRequest,
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
@@ -19,7 +19,7 @@ internal sealed class OpenApiOperationIdSelector
     private const string RelationshipIdTemplate = $"{SecondaryResourceIdTemplate} Relationship";
     private const string AtomicOperationsIdTemplate = "[Method] Operations";
 
-    private static readonly IDictionary<Type, string> SchemaOpenTypeToOpenApiOperationIdTemplateMap = new Dictionary<Type, string>
+    private static readonly Dictionary<Type, string> SchemaOpenTypeToOpenApiOperationIdTemplateMap = new()
     {
         [typeof(ResourceCollectionResponseDocument<>)] = ResourceCollectionIdTemplate,
         [typeof(PrimaryResourceResponseDocument<>)] = ResourceIdTemplate,
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
@@ -11,15 +11,15 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;
 internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
 {
     private readonly ResourceIdSchemaGenerator _resourceIdSchemaGenerator;
-    private readonly ICollection<BodySchemaGenerator> _bodySchemaGenerators;
+    private readonly BodySchemaGenerator[] _bodySchemaGenerators;
 
     public JsonApiSchemaGenerator(ResourceIdSchemaGenerator resourceIdSchemaGenerator, IEnumerable<BodySchemaGenerator> bodySchemaGenerators)
     {
         ArgumentGuard.NotNull(resourceIdSchemaGenerator);
         ArgumentGuard.NotNull(bodySchemaGenerators);
 
         _resourceIdSchemaGenerator = resourceIdSchemaGenerator;
-        _bodySchemaGenerators = bodySchemaGenerators.ToArray();
+        _bodySchemaGenerators = bodySchemaGenerators as BodySchemaGenerator[] ?? bodySchemaGenerators.ToArray();
     }
 
     public OpenApiSchema GenerateSchema(Type modelType, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null,
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs
@@ -24,8 +24,8 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         ArgumentGuard.NotNull(swaggerDoc);
         ArgumentGuard.NotNull(context);
 
-        List<KeyValuePair<string, OpenApiPathItem>> endpointsInOrder = swaggerDoc.Paths.OrderBy(GetPrimaryResourcePublicName)
-            .ThenBy(GetRelationshipName).ThenBy(IsSecondaryEndpoint).ToList();
+        KeyValuePair<string, OpenApiPathItem>[] endpointsInOrder = swaggerDoc.Paths.OrderBy(GetPrimaryResourcePublicName)
+            .ThenBy(GetRelationshipName).ThenBy(IsSecondaryEndpoint).ToArray();
 
         swaggerDoc.Paths.Clear();
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs
@@ -81,10 +81,10 @@ private static DataContract OrderPropertiesInDataContract(DataContract dataContr
         return dataContract;
     }
 
-    private IList<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)
+    private List<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)
     {
         ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-        var dataProperties = new List<DataProperty>();
+        List<DataProperty> dataProperties = [];
 
         foreach (DataProperty property in dataContract.ObjectProperties)
         {
diff --git a/test/OpenApiNSwagClientTests/LegacyOpenApi/GeneratedCode/ILegacyClient.cs b/test/OpenApiNSwagClientTests/LegacyOpenApi/GeneratedCode/ILegacyClient.cs
diff --git a/test/OpenApiNSwagClientTests/LegacyOpenApi/PartialAttributeSerializationLifetimeTests.cs b/test/OpenApiNSwagClientTests/LegacyOpenApi/PartialAttributeSerializationLifetimeTests.cs
@@ -14,7 +14,7 @@ public async Task Disposed_registration_does_not_affect_request()
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId = "XUuiP";
 
@@ -58,7 +58,7 @@ public async Task Registration_can_be_used_for_multiple_requests()
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId = "XUuiP";
 
@@ -107,7 +107,7 @@ public async Task Request_is_unaffected_by_registration_for_different_document_o
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId1 = "XUuiP";
 
@@ -164,7 +164,7 @@ public async Task Attribute_values_can_be_changed_after_registration()
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId = "XUuiP";
 
@@ -209,7 +209,7 @@ public async Task Registration_is_unaffected_by_successive_registration_for_docu
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId1 = "XUuiP";
 
@@ -262,7 +262,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId1 = "XUuiP";
 
@@ -326,7 +326,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument1 = new CreateAirplaneRequestDocument
         {
@@ -390,7 +390,7 @@ public async Task Registration_is_unaffected_by_preceding_registration_for_diffe
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const string airplaneId1 = "XUuiP";
 
diff --git a/test/OpenApiNSwagClientTests/LegacyOpenApi/RequestTests.cs b/test/OpenApiNSwagClientTests/LegacyOpenApi/RequestTests.cs
@@ -20,7 +20,7 @@ public async Task Getting_resource_collection_produces_expected_request()
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCollectionAsync(null, null));
@@ -40,7 +40,7 @@ public async Task Getting_resource_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightAsync(flightId, null, null));
@@ -58,7 +58,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new CreateFlightRequestDocument
         {
@@ -127,7 +127,7 @@ public async Task Partial_posting_resource_produces_expected_request()
     {
         // Arrange
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         const char euroSign = '\x20AC';
         const char checkMark = '\x2713';
@@ -193,7 +193,7 @@ public async Task Partial_patching_resource_produces_expected_request()
         var lastServicedAt = 1.January(2021).At(15, 23, 5, 33).ToDateTimeOffset(4.Hours());
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new UpdateAirplaneRequestDocument
         {
@@ -247,7 +247,7 @@ public async Task Deleting_resource_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         await apiClient.DeleteFlightAsync(flightId);
@@ -266,7 +266,7 @@ public async Task Getting_secondary_resource_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserAsync(flightId, null, null));
@@ -286,7 +286,7 @@ public async Task Getting_secondary_resources_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersAsync(flightId, null, null));
@@ -306,7 +306,7 @@ public async Task Getting_ToOne_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserRelationshipAsync(flightId, null, null));
@@ -326,7 +326,7 @@ public async Task Patching_ToOne_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new ToOneFlightAttendantInRequest
         {
@@ -365,7 +365,7 @@ public async Task Getting_ToMany_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         // Act
         _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId, null, null));
@@ -385,7 +385,7 @@ public async Task Posting_ToMany_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new ToManyFlightAttendantInRequest
         {
@@ -438,7 +438,7 @@ public async Task Patching_ToMany_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new ToManyFlightAttendantInRequest
         {
@@ -491,7 +491,7 @@ public async Task Deleting_ToMany_relationship_produces_expected_request()
         const string flightId = "ZvuH1";
 
         using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-        ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
+        var apiClient = new LegacyClient(wrapper.HttpClient);
 
         var requestDocument = new ToManyFlightAttendantInRequest
         {
diff --git a/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs b/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs
diff --git a/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj b/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj
diff --git a/test/OpenApiTests/QueryStrings/IncludeTests.cs b/test/OpenApiTests/QueryStrings/IncludeTests.cs
diff --git a/test/OpenApiTests/RestrictedControllers/RestrictionFakers.cs b/test/OpenApiTests/RestrictedControllers/RestrictionFakers.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public IDisposable WithPartialAttributeSerialization<TRequestDocument, TAttribut`
`29`	`29`	`{`
`30`	`30`	`ArgumentGuard.NotNull(requestDocument);`
`31`	`31`
`32`		`- var attributeNames = new HashSet<string>();`
	`32`	`+ HashSet<string> attributeNames = [];`
`33`	`33`
`34`	`34`	`foreach (Expression<Func<TAttributesObject, object?>> selector in alwaysIncludedAttributeSelectors)`
`35`	`35`	`{`
`@@ -96,10 +96,10 @@ public void Dispose()`
`96`	`96`	`/// </summary>`
`97`	`97`	`private sealed class AlwaysIncludedAttributes`
`98`	`98`	`{`
`99`		`- private readonly ISet<string> _propertyNames;`
	`99`	`+ private readonly HashSet<string> _propertyNames;`
`100`	`100`	`private readonly Type _attributesObjectType;`
`101`	`101`
`102`		`- public AlwaysIncludedAttributes(ISet<string> propertyNames, Type attributesObjectType)`
	`102`	`+ public AlwaysIncludedAttributes(HashSet<string> propertyNames, Type attributesObjectType)`
`103`	`103`	`{`
`104`	`104`	`ArgumentGuard.NotNull(propertyNames);`
`105`	`105`	`ArgumentGuard.NotNull(attributesObjectType);`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void Configure(SwaggerGenOptions options)`
`63`	`63`	`options.DocumentFilter<UnusedComponentSchemaCleaner>();`
`64`	`64`	`}`
`65`	`65`
`66`		`- private IEnumerable<Type> SelectDerivedTypes(Type baseType)`
	`66`	`+ private List<Type> SelectDerivedTypes(Type baseType)`
`67`	`67`	`{`
`68`	`68`	`if (baseType == typeof(ResourceData))`
`69`	`69`	`{`
`@@ -103,7 +103,7 @@ private List<Type> GetConstructedTypesForAtomicOperation()`
`103`	`103`	`return derivedTypes;`
`104`	`104`	`}`
`105`	`105`
`106`		`- private static IList<string> GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)`
	`106`	`+ private static List<string> GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)`
`107`	`107`	`{`
`108`	`108`	`MethodInfo actionMethod = description.ActionDescriptor.GetActionMethod();`
`109`	`109`	`ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public IReadOnlySet<ResourceType> GetReachableRelatedTypes(ResourceType resource`
`12`	`12`	`{`
`13`	`13`	`ArgumentGuard.NotNull(resourceType);`
`14`	`14`
`15`		`- var resourceTypesFound = new HashSet<ResourceType>();`
	`15`	`+ HashSet<ResourceType> resourceTypesFound = [];`
`16`	`16`	`AddTypesFromRelationships(resourceType.Relationships, resourceTypesFound);`
`17`	`17`	`return resourceTypesFound;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProv`
`39`	`39`	`private ActionDescriptorCollection GetActionDescriptors()`
`40`	`40`	`{`
`41`	`41`	`List<ActionDescriptor> newDescriptors = _defaultProvider.ActionDescriptors.Items.ToList();`
`42`		`- List<ActionDescriptor> endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToList();`
	`42`	`+ ActionDescriptor[] endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToArray();`
`43`	`43`
`44`	`44`	`foreach (ActionDescriptor endpoint in endpoints)`
`45`	`45`	`{`
`@@ -69,7 +69,7 @@ internal static bool IsVisibleJsonApiEndpoint(ActionDescriptor descriptor)`
`69`	`69`	`return descriptor is ControllerActionDescriptor controllerAction && controllerAction.Properties.ContainsKey(typeof(ApiDescriptionActionData));`
`70`	`70`	`}`
`71`	`71`
`72`		`- private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)`
	`72`	`+ private static List<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)`
`73`	`73`	`{`
`74`	`74`	`switch (jsonApiEndpointMetadata)`
`75`	`75`	`{`
`@@ -133,10 +133,10 @@ private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)`
`133`	`133`	`contentType is HeaderConstants.MediaType or HeaderConstants.AtomicOperationsMediaType or HeaderConstants.RelaxedAtomicOperationsMediaType);`
`134`	`134`	`}`
`135`	`135`
`136`		`- private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,`
	`136`	`+ private static List<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,`
`137`	`137`	`Action<ActionDescriptor, Type, string> expansionCallback)`
`138`	`138`	`{`
`139`		`- var expansion = new List<ActionDescriptor>();`
	`139`	`+ List<ActionDescriptor> expansion = [];`
`140`	`140`
`141`	`141`	`foreach ((string relationshipName, Type documentType) in metadata.DocumentTypesByRelationshipName)`
`142`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ internal sealed class JsonApiSchemaIdSelector`
`27`	`27`	`private const string RelationshipIdentifierSchemaIdTemplate = "[ResourceName] [RelationshipName] Relationship Identifier";`
`28`	`28`	`private const string RelationshipNameSchemaIdTemplate = "[ResourceName] [RelationshipName] Relationship Name";`
`29`	`29`
`30`		`- private static readonly IDictionary<Type, string> SchemaTypeToTemplateMap = new Dictionary<Type, string>`
	`30`	`+ private static readonly Dictionary<Type, string> SchemaTypeToTemplateMap = new()`
`31`	`31`	`{`
`32`	`32`	`[typeof(CreateResourceRequestDocument<>)] = "Create [ResourceName] Request Document",`
`33`	`33`	`[typeof(UpdateResourceRequestDocument<>)] = "Update [ResourceName] Request Document",`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint, R`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- private static IEnumerable<HttpStatusCode> GetSuccessStatusCodesForEndpoint(JsonApiEndpoint endpoint)`
	`147`	`+ private static HttpStatusCode[] GetSuccessStatusCodesForEndpoint(JsonApiEndpoint endpoint)`
`148`	`148`	`{`
`149`	`149`	`return endpoint switch`
`150`	`150`	`{`
`@@ -176,7 +176,7 @@ private static IEnumerable<HttpStatusCode> GetSuccessStatusCodesForEndpoint(Json`
`176`	`176`	`};`
`177`	`177`	`}`
`178`	`178`
`179`		`- private IEnumerable<HttpStatusCode> GetErrorStatusCodesForEndpoint(JsonApiEndpoint endpoint, ResourceType? resourceType)`
	`179`	`+ private HttpStatusCode[] GetErrorStatusCodesForEndpoint(JsonApiEndpoint endpoint, ResourceType? resourceType)`
`180`	`180`	`{`
`181`	`181`	`// Condition doesn't apply to atomic operations, because Forbidden is also used when an operation is not accessible.`
`182`	`182`	`ClientIdGenerationMode clientIdGeneration = resourceType?.ClientIdGeneration ?? _options.ClientIdGeneration;`
`@@ -212,12 +212,12 @@ private IEnumerable<HttpStatusCode> GetErrorStatusCodesForEndpoint(JsonApiEndpoi`
`212`	`212`	`HttpStatusCode.UnprocessableEntity`
`213`	`213`	`],`
`214`	`214`	`JsonApiEndpoint.DeleteResource => [HttpStatusCode.NotFound],`
`215`		`- JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship => new[]`
`216`		`- {`
	`215`	`+ JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship =>`
	`216`	`+ [`
`217`	`217`	`HttpStatusCode.BadRequest,`
`218`	`218`	`HttpStatusCode.NotFound,`
`219`	`219`	`HttpStatusCode.Conflict`
`220`		`- },`
	`220`	`+ ],`
`221`	`221`	`JsonApiEndpoint.PostOperations =>`
`222`	`222`	`[`
`223`	`223`	`HttpStatusCode.BadRequest,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal sealed class OpenApiOperationIdSelector`
`19`	`19`	`private const string RelationshipIdTemplate = $"{SecondaryResourceIdTemplate} Relationship";`
`20`	`20`	`private const string AtomicOperationsIdTemplate = "[Method] Operations";`
`21`	`21`
`22`		`- private static readonly IDictionary<Type, string> SchemaOpenTypeToOpenApiOperationIdTemplateMap = new Dictionary<Type, string>`
	`22`	`+ private static readonly Dictionary<Type, string> SchemaOpenTypeToOpenApiOperationIdTemplateMap = new()`
`23`	`23`	`{`
`24`	`24`	`[typeof(ResourceCollectionResponseDocument<>)] = ResourceCollectionIdTemplate,`
`25`	`25`	`[typeof(PrimaryResourceResponseDocument<>)] = ResourceIdTemplate,`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;`
`11`	`11`	`internal sealed class JsonApiSchemaGenerator : ISchemaGenerator`
`12`	`12`	`{`
`13`	`13`	`private readonly ResourceIdSchemaGenerator _resourceIdSchemaGenerator;`
`14`		`- private readonly ICollection<BodySchemaGenerator> _bodySchemaGenerators;`
	`14`	`+ private readonly BodySchemaGenerator[] _bodySchemaGenerators;`
`15`	`15`
`16`	`16`	`public JsonApiSchemaGenerator(ResourceIdSchemaGenerator resourceIdSchemaGenerator, IEnumerable<BodySchemaGenerator> bodySchemaGenerators)`
`17`	`17`	`{`
`18`	`18`	`ArgumentGuard.NotNull(resourceIdSchemaGenerator);`
`19`	`19`	`ArgumentGuard.NotNull(bodySchemaGenerators);`
`20`	`20`
`21`	`21`	`_resourceIdSchemaGenerator = resourceIdSchemaGenerator;`
`22`		`- _bodySchemaGenerators = bodySchemaGenerators.ToArray();`
	`22`	`+ _bodySchemaGenerators = bodySchemaGenerators as BodySchemaGenerator[] ?? bodySchemaGenerators.ToArray();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public OpenApiSchema GenerateSchema(Type modelType, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null,`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ private static DataContract OrderPropertiesInDataContract(DataContract dataContr`
`81`	`81`	`return dataContract;`
`82`	`82`	`}`
`83`	`83`
`84`		`- private IList<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)`
	`84`	`+ private List<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)`
`85`	`85`	`{`
`86`	`86`	`ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);`
`87`		`- var dataProperties = new List<DataProperty>();`
	`87`	`+ List<DataProperty> dataProperties = [];`
`88`	`88`
`89`	`89`	`foreach (DataProperty property in dataContract.ObjectProperties)`
`90`	`90`	`{`