- Renamed ExpansibleEndpointMetadata to NonPrimaryEndpointMetadata

maurei · maurei · commit a6e11beb4841 · 2021-11-22T15:41:07.000+01:00
- Made constructors of document type factories private and exposed a static instance
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs b/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>();
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/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);
         }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs b/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));
 
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs b/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)
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs b/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)
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs b/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)
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs b/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)
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipDataTypeFactory.cs b/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)
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs b/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)

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,12 @@ private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDe`
`79`	`79`	`UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType);`
`80`	`80`	`return Array.Empty<ActionDescriptor>();`
`81`	`81`	`}`
`82`		`- case ExpansibleEndpointMetadata expansibleMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):`
	`82`	`+ case NonPrimaryEndpointMetadata expansibleMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):`
`83`	`83`	`{`
`84`	`84`	`return Expand(endpoint, expansibleMetadata,`
`85`	`85`	`(expandedEndpoint, documentType, _) => UpdateProducesResponseTypeAttribute(expandedEndpoint, documentType));`
`86`	`86`	`}`
`87`		`- case ExpansibleEndpointMetadata expansibleMetadata and RelationshipRequestMetadata:`
	`87`	`+ case NonPrimaryEndpointMetadata expansibleMetadata and RelationshipRequestMetadata:`
`88`	`88`	`{`
`89`	`89`	`return Expand(endpoint, expansibleMetadata, UpdateBodyParameterDescriptor);`
`90`	`90`	`}`
`@@ -118,7 +118,7 @@ private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)`
`118`	`118`	`return produces != null && produces.ContentTypes.Any(contentType => contentType == HeaderConstants.MediaType);`
`119`	`119`	`}`
`120`	`120`
`121`		`- private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, ExpansibleEndpointMetadata metadata,`
	`121`	`+ private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,`
`122`	`122`	`Action<ActionDescriptor, Type, string> expansionCallback)`
`123`	`123`	`{`
`124`	`124`	`var expansion = new List<ActionDescriptor>();`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ internal sealed class JsonApiEndpointMetadataProvider`
`18`	`18`	`{`
`19`	`19`	`private readonly IControllerResourceMapping _controllerResourceMapping;`
`20`	`20`	`private readonly EndpointResolver _endpointResolver = new();`
`21`		`- private readonly NonPrimaryDocumentTypeFactory _nonPrimaryDocumentTypeFactory = new();`
`22`	`21`
`23`	`22`	`public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping)`
`24`	`23`	`{`
`@@ -89,12 +88,13 @@ private static PrimaryRequestMetadata GetPatchRequestMetadata(Type resourceClrTy`
`89`	`88`	`return new PrimaryRequestMetadata(documentType);`
`90`	`89`	`}`
`91`	`90`
`92`		`- private RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships, bool ignoreHasOneRelationships)`
	`91`	`+ private static RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships,`
	`92`	`+ bool ignoreHasOneRelationships)`
`93`	`93`	`{`
`94`	`94`	`IEnumerable<RelationshipAttribute> relationshipsOfEndpoint = ignoreHasOneRelationships ? relationships.OfType<HasManyAttribute>() : relationships;`
`95`	`95`
`96`	`96`	`IDictionary<string, Type> requestDocumentTypesByRelationshipName = relationshipsOfEndpoint.ToDictionary(relationship => relationship.PublicName,`
`97`		`- _nonPrimaryDocumentTypeFactory.GetForRelationshipRequest);`
	`97`	`+ NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest);`
`98`	`98`
`99`	`99`	`return new RelationshipRequestMetadata(requestDocumentTypesByRelationshipName);`
`100`	`100`	`}`
`@@ -133,18 +133,18 @@ private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceC`
`133`	`133`	`return new PrimaryResponseMetadata(documentType);`
`134`	`134`	`}`
`135`	`135`
`136`		`- private SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)`
	`136`	`+ private static SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)`
`137`	`137`	`{`
`138`	`138`	`IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,`
`139`		`- _nonPrimaryDocumentTypeFactory.GetForSecondaryResponse);`
	`139`	`+ NonPrimaryDocumentTypeFactory.Instance.GetForSecondaryResponse);`
`140`	`140`
`141`	`141`	`return new SecondaryResponseMetadata(responseDocumentTypesByRelationshipName);`
`142`	`142`	`}`
`143`	`143`
`144`		`- private RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)`
	`144`	`+ private static RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)`
`145`	`145`	`{`
`146`	`146`	`IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,`
`147`		`- _nonPrimaryDocumentTypeFactory.GetForRelationshipResponse);`
	`147`	`+ NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipResponse);`
`148`	`148`
`149`	`149`	`return new RelationshipResponseMetadata(responseDocumentTypesByRelationshipName);`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`
`4`	`4`	`namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata`
`5`	`5`	`{`
`6`		`- internal abstract class ExpansibleEndpointMetadata`
	`6`	`+ internal abstract class NonPrimaryEndpointMetadata`
`7`	`7`	`{`
`8`	`8`	`public IDictionary<string, Type> DocumentTypesByRelationshipName { get; }`
`9`	`9`
`10`		`- protected ExpansibleEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)`
	`10`	`+ protected NonPrimaryEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)`
`11`	`11`	`{`
`12`	`12`	`ArgumentGuard.NotNull(documentTypesByRelationshipName, nameof(documentTypesByRelationshipName));`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata`
`5`	`5`	`{`
`6`		`- internal sealed class RelationshipRequestMetadata : ExpansibleEndpointMetadata, IJsonApiRequestMetadata`
	`6`	`+ internal sealed class RelationshipRequestMetadata : NonPrimaryEndpointMetadata, IJsonApiRequestMetadata`
`7`	`7`	`{`
`8`	`8`	`public RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)`
`9`	`9`	`: base(documentTypesByRelationshipName)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata`
`5`	`5`	`{`
`6`		`- internal sealed class RelationshipResponseMetadata : ExpansibleEndpointMetadata, IJsonApiResponseMetadata`
	`6`	`+ internal sealed class RelationshipResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata`
`7`	`7`	`{`
`8`	`8`	`public RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)`
`9`	`9`	`: base(documentTypesByRelationshipName)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata`
`5`	`5`	`{`
`6`		`- internal sealed class SecondaryResponseMetadata : ExpansibleEndpointMetadata, IJsonApiResponseMetadata`
	`6`	`+ internal sealed class SecondaryResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata`
`7`	`7`	`{`
`8`	`8`	`public SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)`
`9`	`9`	`: base(documentTypesByRelationshipName)`
Original file line number	Diff line number	Diff line change
`@@ -7,34 +7,40 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects`
`7`	`7`	`{`
`8`	`8`	`internal sealed class NonPrimaryDocumentTypeFactory`
`9`	`9`	`{`
`10`		`- private readonly DocumentOpenTypeOptions _secondaryResponseDocumentTypeOptions = new(typeof(ResourceCollectionResponseDocument<>),`
	`10`	`+ private static readonly DocumentOpenTypeOptions SecondaryResponseDocumentTypeOptions = new(typeof(ResourceCollectionResponseDocument<>),`
`11`	`11`	`typeof(NullableSecondaryResourceResponseDocument<>), typeof(SecondaryResourceResponseDocument<>));`
`12`	`12`
`13`		`- private readonly DocumentOpenTypeOptions _relationshipRequestDocumentTypeOptions = new(typeof(ToManyRelationshipRequestData<>),`
	`13`	`+ private static readonly DocumentOpenTypeOptions RelationshipRequestDocumentTypeOptions = new(typeof(ToManyRelationshipRequestData<>),`
`14`	`14`	`typeof(NullableToOneRelationshipRequestData<>), typeof(ToOneRelationshipRequestData<>));`
`15`	`15`
`16`		`- private readonly DocumentOpenTypeOptions _relationshipResponseDocumentTypeOptions = new(typeof(ResourceIdentifierCollectionResponseDocument<>),`
	`16`	`+ private static readonly DocumentOpenTypeOptions RelationshipResponseDocumentTypeOptions = new(typeof(ResourceIdentifierCollectionResponseDocument<>),`
`17`	`17`	`typeof(NullableResourceIdentifierResponseDocument<>), typeof(ResourceIdentifierResponseDocument<>));`
`18`	`18`
	`19`	`+ public static NonPrimaryDocumentTypeFactory Instance { get; } = new();`
	`20`	`+`
	`21`	`+ private NonPrimaryDocumentTypeFactory()`
	`22`	`+ {`
	`23`	`+ }`
	`24`	`+`
`19`	`25`	`public Type GetForSecondaryResponse(RelationshipAttribute relationship)`
`20`	`26`	`{`
`21`	`27`	`ArgumentGuard.NotNull(relationship, nameof(relationship));`
`22`	`28`
`23`		`- return Get(relationship, _secondaryResponseDocumentTypeOptions);`
	`29`	`+ return Get(relationship, SecondaryResponseDocumentTypeOptions);`
`24`	`30`	`}`
`25`	`31`
`26`	`32`	`public Type GetForRelationshipRequest(RelationshipAttribute relationship)`
`27`	`33`	`{`
`28`	`34`	`ArgumentGuard.NotNull(relationship, nameof(relationship));`
`29`	`35`
`30`		`- return Get(relationship, _relationshipRequestDocumentTypeOptions);`
	`36`	`+ return Get(relationship, RelationshipRequestDocumentTypeOptions);`
`31`	`37`	`}`
`32`	`38`
`33`	`39`	`public Type GetForRelationshipResponse(RelationshipAttribute relationship)`
`34`	`40`	`{`
`35`	`41`	`ArgumentGuard.NotNull(relationship, nameof(relationship));`
`36`	`42`
`37`		`- return Get(relationship, _relationshipResponseDocumentTypeOptions);`
	`43`	`+ return Get(relationship, RelationshipResponseDocumentTypeOptions);`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`private static Type Get(RelationshipAttribute relationship, DocumentOpenTypeOptions typeOptions)`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,17 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects`
`6`	`6`	`{`
`7`	`7`	`internal sealed class RelationshipDataTypeFactory`
`8`	`8`	`{`
`9`		`- private readonly NonPrimaryDocumentTypeFactory _nonPrimaryDocumentTypeFactory = new();`
	`9`	`+ public static RelationshipDataTypeFactory Instance { get; } = new();`
	`10`	`+`
	`11`	`+ private RelationshipDataTypeFactory()`
	`12`	`+ {`
	`13`	`+ }`
`10`	`14`
`11`	`15`	`public Type GetForRequest(RelationshipAttribute relationship)`
`12`	`16`	`{`
`13`	`17`	`ArgumentGuard.NotNull(relationship, nameof(relationship));`
`14`	`18`
`15`		`- return _nonPrimaryDocumentTypeFactory.GetForRelationshipRequest(relationship);`
	`19`	`+ return NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest(relationship);`
`16`	`20`	`}`
`17`	`21`
`18`	`22`	`public Type GetForResponse(RelationshipAttribute relationship)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ internal sealed class ResourceFieldObjectSchemaBuilder`
`30`	`30`	`private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;`
`31`	`31`	`private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;`
`32`	`32`	`private readonly IDictionary<string, OpenApiSchema> _schemasForResourceFields;`
`33`		`- private readonly RelationshipDataTypeFactory _relationshipDataTypeFactory = new();`
`34`	`33`
`35`	`34`	`public ResourceFieldObjectSchemaBuilder(ResourceTypeInfo resourceTypeInfo, ISchemaRepositoryAccessor schemaRepositoryAccessor,`
`36`	`35`	`SchemaGenerator defaultSchemaGenerator, JsonApiSchemaIdSelector jsonApiSchemaIdSelector, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)`
`@@ -228,11 +227,11 @@ private void AddRelationshipDataSchemaToResourceObject(RelationshipAttribute rel`
`228`	`227`	`}`
`229`	`228`	`}`
`230`	`229`
`231`		`- private Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)`
	`230`	`+ private static Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)`
`232`	`231`	`{`
`233`	`232`	`return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceResponseObject<>))`
`234`		`- ? _relationshipDataTypeFactory.GetForResponse(relationship)`
`235`		`- : _relationshipDataTypeFactory.GetForRequest(relationship);`
	`233`	`+ ? RelationshipDataTypeFactory.Instance.GetForResponse(relationship)`
	`234`	`+ : RelationshipDataTypeFactory.Instance.GetForRequest(relationship);`
`236`	`235`	`}`
`237`	`236`
`238`	`237`	`private OpenApiSchema? GetReferenceSchemaForRelationshipData(Type relationshipDataType)`