Update openapi branch

src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs

@@ -79,12 +79,12 @@ private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDe
                     UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType);
                     return Array.Empty<ActionDescriptor>();
                 }
-                case ExpansibleEndpointMetadata expansibleMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
+                case NonPrimaryEndpointMetadata expansibleMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
                 {
                     return Expand(endpoint, expansibleMetadata,
                         (expandedEndpoint, documentType, _) => UpdateProducesResponseTypeAttribute(expandedEndpoint, documentType));
                 }
-                case ExpansibleEndpointMetadata expansibleMetadata and RelationshipRequestMetadata:
+                case NonPrimaryEndpointMetadata expansibleMetadata and RelationshipRequestMetadata:
                 {
                     return Expand(endpoint, expansibleMetadata, UpdateBodyParameterDescriptor);
                 }
@@ -118,7 +118,7 @@ private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)
             return produces != null && produces.ContentTypes.Any(contentType => contentType == HeaderConstants.MediaType);
         }
 
-        private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, ExpansibleEndpointMetadata metadata,
+        private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
             Action<ActionDescriptor, Type, string> expansionCallback)
         {
             var expansion = new List<ActionDescriptor>();

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs

@@ -18,7 +18,6 @@ internal sealed class JsonApiEndpointMetadataProvider
     {
         private readonly IControllerResourceMapping _controllerResourceMapping;
         private readonly EndpointResolver _endpointResolver = new();
-        private readonly NonPrimaryDocumentTypeFactory _nonPrimaryDocumentTypeFactory = new();
 
         public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping)
         {
@@ -89,12 +88,13 @@ private static PrimaryRequestMetadata GetPatchRequestMetadata(Type resourceClrTy
             return new PrimaryRequestMetadata(documentType);
         }
 
-        private RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships, bool ignoreHasOneRelationships)
+        private static RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships,
+            bool ignoreHasOneRelationships)
         {
             IEnumerable<RelationshipAttribute> relationshipsOfEndpoint = ignoreHasOneRelationships ? relationships.OfType<HasManyAttribute>() : relationships;
 
             IDictionary<string, Type> requestDocumentTypesByRelationshipName = relationshipsOfEndpoint.ToDictionary(relationship => relationship.PublicName,
-                _nonPrimaryDocumentTypeFactory.GetForRelationshipRequest);
+                NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest);
 
             return new RelationshipRequestMetadata(requestDocumentTypesByRelationshipName);
         }
@@ -133,18 +133,18 @@ private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceC
             return new PrimaryResponseMetadata(documentType);
         }
 
-        private SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
+        private static SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
         {
             IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
-                _nonPrimaryDocumentTypeFactory.GetForSecondaryResponse);
+                NonPrimaryDocumentTypeFactory.Instance.GetForSecondaryResponse);
 
             return new SecondaryResponseMetadata(responseDocumentTypesByRelationshipName);
         }
 
-        private RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
+        private static RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
         {
             IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
-                _nonPrimaryDocumentTypeFactory.GetForRelationshipResponse);
+                NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipResponse);
 
             return new RelationshipResponseMetadata(responseDocumentTypesByRelationshipName);
         }

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/ExpansibleEndpointMetadata.cs → src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs

@@ -3,11 +3,11 @@
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
 {
-    internal abstract class ExpansibleEndpointMetadata
+    internal abstract class NonPrimaryEndpointMetadata
     {
         public IDictionary<string, Type> DocumentTypesByRelationshipName { get; }
 
-        protected ExpansibleEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+        protected NonPrimaryEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
         {
             ArgumentGuard.NotNull(documentTypesByRelationshipName, nameof(documentTypesByRelationshipName));
 

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs

@@ -3,7 +3,7 @@
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
 {
-    internal sealed class RelationshipRequestMetadata : ExpansibleEndpointMetadata, IJsonApiRequestMetadata
+    internal sealed class RelationshipRequestMetadata : NonPrimaryEndpointMetadata, IJsonApiRequestMetadata
     {
         public RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
             : base(documentTypesByRelationshipName)

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs

@@ -3,7 +3,7 @@
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
 {
-    internal sealed class RelationshipResponseMetadata : ExpansibleEndpointMetadata, IJsonApiResponseMetadata
+    internal sealed class RelationshipResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
     {
         public RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
             : base(documentTypesByRelationshipName)

src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs

@@ -3,7 +3,7 @@
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
 {
-    internal sealed class SecondaryResponseMetadata : ExpansibleEndpointMetadata, IJsonApiResponseMetadata
+    internal sealed class SecondaryResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
     {
         public SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
             : base(documentTypesByRelationshipName)

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs

@@ -7,34 +7,40 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
 {
     internal sealed class NonPrimaryDocumentTypeFactory
     {
-        private readonly DocumentOpenTypeOptions _secondaryResponseDocumentTypeOptions = new(typeof(ResourceCollectionResponseDocument<>),
+        private static readonly DocumentOpenTypeOptions SecondaryResponseDocumentTypeOptions = new(typeof(ResourceCollectionResponseDocument<>),
             typeof(NullableSecondaryResourceResponseDocument<>), typeof(SecondaryResourceResponseDocument<>));
 
-        private readonly DocumentOpenTypeOptions _relationshipRequestDocumentTypeOptions = new(typeof(ToManyRelationshipRequestData<>),
+        private static readonly DocumentOpenTypeOptions RelationshipRequestDocumentTypeOptions = new(typeof(ToManyRelationshipRequestData<>),
             typeof(NullableToOneRelationshipRequestData<>), typeof(ToOneRelationshipRequestData<>));
 
-        private readonly DocumentOpenTypeOptions _relationshipResponseDocumentTypeOptions = new(typeof(ResourceIdentifierCollectionResponseDocument<>),
+        private static readonly DocumentOpenTypeOptions RelationshipResponseDocumentTypeOptions = new(typeof(ResourceIdentifierCollectionResponseDocument<>),
             typeof(NullableResourceIdentifierResponseDocument<>), typeof(ResourceIdentifierResponseDocument<>));
 
+        public static NonPrimaryDocumentTypeFactory Instance { get; } = new();
+
+        private NonPrimaryDocumentTypeFactory()
+        {
+        }
+
         public Type GetForSecondaryResponse(RelationshipAttribute relationship)
         {
             ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, _secondaryResponseDocumentTypeOptions);
+            return Get(relationship, SecondaryResponseDocumentTypeOptions);
         }
 
         public Type GetForRelationshipRequest(RelationshipAttribute relationship)
         {
             ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, _relationshipRequestDocumentTypeOptions);
+            return Get(relationship, RelationshipRequestDocumentTypeOptions);
         }
 
         public Type GetForRelationshipResponse(RelationshipAttribute relationship)
         {
             ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, _relationshipResponseDocumentTypeOptions);
+            return Get(relationship, RelationshipResponseDocumentTypeOptions);
         }
 
         private static Type Get(RelationshipAttribute relationship, DocumentOpenTypeOptions typeOptions)

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipDataTypeFactory.cs

@@ -6,13 +6,17 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
 {
     internal sealed class RelationshipDataTypeFactory
     {
-        private readonly NonPrimaryDocumentTypeFactory _nonPrimaryDocumentTypeFactory = new();
+        public static RelationshipDataTypeFactory Instance { get; } = new();
+
+        private RelationshipDataTypeFactory()
+        {
+        }
 
         public Type GetForRequest(RelationshipAttribute relationship)
         {
             ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return _nonPrimaryDocumentTypeFactory.GetForRelationshipRequest(relationship);
+            return NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest(relationship);
         }
 
         public Type GetForResponse(RelationshipAttribute relationship)

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs

@@ -30,7 +30,6 @@ internal sealed class ResourceFieldObjectSchemaBuilder
         private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
         private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
         private readonly IDictionary<string, OpenApiSchema> _schemasForResourceFields;
-        private readonly RelationshipDataTypeFactory _relationshipDataTypeFactory = new();
 
         public ResourceFieldObjectSchemaBuilder(ResourceTypeInfo resourceTypeInfo, ISchemaRepositoryAccessor schemaRepositoryAccessor,
             SchemaGenerator defaultSchemaGenerator, JsonApiSchemaIdSelector jsonApiSchemaIdSelector, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)
@@ -228,11 +227,11 @@ private void AddRelationshipDataSchemaToResourceObject(RelationshipAttribute rel
             }
         }
 
-        private Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)
+        private static Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)
         {
             return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceResponseObject<>))
-                ? _relationshipDataTypeFactory.GetForResponse(relationship)
-                : _relationshipDataTypeFactory.GetForRequest(relationship);
+                ? RelationshipDataTypeFactory.Instance.GetForResponse(relationship)
+                : RelationshipDataTypeFactory.Instance.GetForRequest(relationship);
         }
 
         private OpenApiSchema? GetReferenceSchemaForRelationshipData(Type relationshipDataType)