Merge master v5.2.0 into openapi

src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs

@@ -1,8 +1,10 @@
+using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.Client;
 using Newtonsoft.Json;
 
 namespace JsonApiDotNetCoreExampleClient;
 
+[UsedImplicitly(ImplicitUseTargetFlags.Itself)]
 public partial class ExampleApiClient : JsonApiClient
 {
     partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)

src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs

@@ -122,9 +122,8 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
 
             if (value != null)
             {
-                if (_alwaysIncludedAttributesPerRequestDocumentInstance.ContainsKey(value))
+                if (_alwaysIncludedAttributesPerRequestDocumentInstance.TryGetValue(value, out AttributeNamesContainer? attributeNamesContainer))
                 {
-                    AttributeNamesContainer attributeNamesContainer = _alwaysIncludedAttributesPerRequestDocumentInstance[value];
                     serializer.ContractResolver = new JsonApiDocumentContractResolver(attributeNamesContainer);
                 }
 

src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs

@@ -75,8 +75,8 @@ private IReadOnlyCollection<RelationshipAttribute> GetRelationshipsOfPrimaryReso
 
     private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoint endpoint)
     {
-        return endpoint is JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship or JsonApiEndpoint.PostRelationship
-            or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship;
+        return endpoint is JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship or JsonApiEndpoint.PostRelationship or
+            JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship;
     }
 
     private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint)
@@ -160,7 +160,7 @@ private static void SetRequestMetadata(ActionModel action, JsonApiEndpoint endpo
 
     private static bool RequiresRequestBody(JsonApiEndpoint endpoint)
     {
-        return endpoint is JsonApiEndpoint.Post or JsonApiEndpoint.Patch or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship
-            or JsonApiEndpoint.DeleteRelationship;
+        return endpoint is JsonApiEndpoint.Post or JsonApiEndpoint.Patch or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or
+            JsonApiEndpoint.DeleteRelationship;
     }
 }

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

@@ -132,9 +132,9 @@ private static void ReorderMembers(OpenApiSchema fullSchemaForResourceObject, IE
 
         foreach (string member in orderedMembers)
         {
-            if (fullSchemaForResourceObject.Properties.ContainsKey(member))
+            if (fullSchemaForResourceObject.Properties.TryGetValue(member, out OpenApiSchema? schema))
             {
-                reorderedMembers[member] = fullSchemaForResourceObject.Properties[member];
+                reorderedMembers[member] = schema;
             }
         }