Renamed variables and types to be consistent with JSON:API spec, where the vocabulary is 'RelationshipsObject' with its members being a 'Relationship'.

maurei · maurei · commit 6160ad05c59e · 2021-11-23T11:37:48.000+01:00
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs
@@ -1,6 +1,6 @@
 using System;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
@@ -10,8 +10,8 @@ internal sealed class NonPrimaryDocumentTypeFactory
         private static readonly DocumentOpenTypes SecondaryResponseDocumentOpenTypes = new(typeof(ResourceCollectionResponseDocument<>),
             typeof(NullableSecondaryResourceResponseDocument<>), typeof(SecondaryResourceResponseDocument<>));
 
-        private static readonly DocumentOpenTypes RelationshipRequestDocumentOpenTypes = new(typeof(ToManyRelationshipRequestData<>),
-            typeof(NullableToOneRelationshipRequestData<>), typeof(ToOneRelationshipRequestData<>));
+        private static readonly DocumentOpenTypes RelationshipRequestDocumentOpenTypes = new(typeof(ToManyRelationshipInRequest<>),
+            typeof(NullableToOneRelationshipInRequest<>), typeof(ToOneRelationshipInRequest<>));
 
         private static readonly DocumentOpenTypes RelationshipResponseDocumentOpenTypes = new(typeof(ResourceIdentifierCollectionResponseDocument<>),
             typeof(NullableResourceIdentifierResponseDocument<>), typeof(ResourceIdentifierResponseDocument<>));
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs
@@ -1,14 +1,14 @@
 using System;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
 {
-    internal sealed class RelationshipDataTypeFactory
+    internal sealed class RelationshipTypeFactory
     {
-        public static RelationshipDataTypeFactory Instance { get; } = new();
+        public static RelationshipTypeFactory Instance { get; } = new();
 
-        private RelationshipDataTypeFactory()
+        private RelationshipTypeFactory()
         {
         }
 
@@ -26,10 +26,10 @@ public Type GetForResponse(RelationshipAttribute relationship)
             // @formatter:nested_ternary_style expanded
 
             Type relationshipDataOpenType = relationship is HasManyAttribute
-                ? typeof(ToManyRelationshipResponseData<>)
+                ? typeof(ToManyRelationshipInResponse<>)
                 : relationship.IsNullable()
-                    ? typeof(NullableToOneRelationshipResponseData<>)
-                    : typeof(ToOneRelationshipResponseData<>);
+                    ? typeof(NullableToOneRelationshipInResponse<>)
+                    : typeof(ToOneRelationshipInResponse<>);
 
             // @formatter:nested_ternary_style restore
 
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
@@ -2,10 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableToOneRelationshipRequestData<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
+    internal sealed class NullableToOneRelationshipInRequest<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
     }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
@@ -5,10 +5,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableToOneRelationshipResponseData<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
+    internal sealed class NullableToOneRelationshipInResponse<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
         [Required]
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
@@ -2,10 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToManyRelationshipRequestData<TResource> : ManyData<ResourceIdentifierObject<TResource>>
+    internal sealed class ToManyRelationshipInRequest<TResource> : ManyData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
     }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
@@ -5,10 +5,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToManyRelationshipResponseData<TResource> : ManyData<ResourceIdentifierObject<TResource>>
+    internal sealed class ToManyRelationshipInResponse<TResource> : ManyData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
         [Required]
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
@@ -2,10 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToOneRelationshipRequestData<TResource> : SingleData<ResourceIdentifierObject<TResource>>
+    internal sealed class ToOneRelationshipInRequest<TResource> : SingleData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
     }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
@@ -5,10 +5,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToOneRelationshipResponseData<TResource> : SingleData<ResourceIdentifierObject<TResource>>
+    internal sealed class ToOneRelationshipInResponse<TResource> : SingleData<ResourceIdentifierObject<TResource>>
         where TResource : IIdentifiable
     {
         [Required]
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs
@@ -6,7 +6,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
@@ -32,9 +32,9 @@ internal sealed class JsonApiOperationIdSelector
             [typeof(ResourceIdentifierCollectionResponseDocument<>)] = RelationshipOperationIdTemplate,
             [typeof(ResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
             [typeof(NullableResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
-            [typeof(ToOneRelationshipRequestData<>)] = RelationshipOperationIdTemplate,
-            [typeof(NullableToOneRelationshipRequestData<>)] = RelationshipOperationIdTemplate,
-            [typeof(ToManyRelationshipRequestData<>)] = RelationshipOperationIdTemplate
+            [typeof(ToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
+            [typeof(NullableToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
+            [typeof(ToManyRelationshipInRequest<>)] = RelationshipOperationIdTemplate
         };
 
         private readonly IControllerResourceMapping _controllerResourceMapping;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
@@ -15,9 +15,9 @@ internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IA
     {
         private static readonly Type[] JsonApiRequestObjectOpenType =
         {
-            typeof(ToManyRelationshipRequestData<>),
-            typeof(ToOneRelationshipRequestData<>),
-            typeof(NullableToOneRelationshipRequestData<>),
+            typeof(ToManyRelationshipInRequest<>),
+            typeof(ToOneRelationshipInRequest<>),
+            typeof(NullableToOneRelationshipInRequest<>),
             typeof(ResourcePostRequestDocument<>),
             typeof(ResourcePatchRequestDocument<>)
         };
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
@@ -4,7 +4,7 @@
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 
 namespace JsonApiDotNetCore.OpenApi
@@ -17,19 +17,19 @@ internal sealed class JsonApiSchemaIdSelector
             [typeof(ResourcePatchRequestDocument<>)] = "###-patch-request-document",
             [typeof(ResourcePostRequestObject<>)] = "###-data-in-post-request",
             [typeof(ResourcePatchRequestObject<>)] = "###-data-in-patch-request",
-            [typeof(ToOneRelationshipRequestData<>)] = "to-one-###-request-data",
-            [typeof(NullableToOneRelationshipRequestData<>)] = "nullable-to-one-###-request-data",
-            [typeof(ToManyRelationshipRequestData<>)] = "to-many-###-request-data",
+            [typeof(ToOneRelationshipInRequest<>)] = "to-one-###-data-in-request",
+            [typeof(NullableToOneRelationshipInRequest<>)] = "nullable-to-one-###-data-in-request",
+            [typeof(ToManyRelationshipInRequest<>)] = "to-many-###-data-in-request",
             [typeof(PrimaryResourceResponseDocument<>)] = "###-primary-response-document",
             [typeof(SecondaryResourceResponseDocument<>)] = "###-secondary-response-document",
             [typeof(NullableSecondaryResourceResponseDocument<>)] = "nullable-###-secondary-response-document",
             [typeof(ResourceCollectionResponseDocument<>)] = "###-collection-response-document",
             [typeof(ResourceIdentifierResponseDocument<>)] = "###-identifier-response-document",
             [typeof(NullableResourceIdentifierResponseDocument<>)] = "nullable-###-identifier-response-document",
             [typeof(ResourceIdentifierCollectionResponseDocument<>)] = "###-identifier-collection-response-document",
-            [typeof(ToOneRelationshipResponseData<>)] = "to-one-###-response-data",
-            [typeof(NullableToOneRelationshipResponseData<>)] = "nullable-to-one-###-response-data",
-            [typeof(ToManyRelationshipResponseData<>)] = "to-many-###-response-data",
+            [typeof(ToOneRelationshipInResponse<>)] = "to-one-###-data-in-response",
+            [typeof(NullableToOneRelationshipInResponse<>)] = "nullable-to-one-###-data-in-response",
+            [typeof(ToManyRelationshipInResponse<>)] = "to-many-###-data-in-response",
             [typeof(ResourceResponseObject<>)] = "###-data-in-response",
             [typeof(ResourceIdentifierObject<>)] = "###-identifier"
         };
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs
@@ -4,7 +4,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
@@ -23,9 +23,9 @@ internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
             typeof(ResourceIdentifierCollectionResponseDocument<>),
             typeof(ResourceIdentifierResponseDocument<>),
             typeof(NullableResourceIdentifierResponseDocument<>),
-            typeof(ToManyRelationshipRequestData<>),
-            typeof(ToOneRelationshipRequestData<>),
-            typeof(NullableToOneRelationshipRequestData<>)
+            typeof(ToManyRelationshipInRequest<>),
+            typeof(ToOneRelationshipInRequest<>),
+            typeof(NullableToOneRelationshipInRequest<>)
         };
 
         private readonly ISchemaGenerator _defaultSchemaGenerator;
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.OpenApi.Models;
@@ -16,11 +16,11 @@ internal sealed class ResourceFieldObjectSchemaBuilder
     {
         private static readonly SchemaRepository ResourceSchemaRepository = new();
 
-        private static readonly Type[] RelationshipResponseDataOpenTypes =
+        private static readonly Type[] RelationshipInResponseOpenTypes =
         {
-            typeof(ToOneRelationshipResponseData<>),
-            typeof(ToManyRelationshipResponseData<>),
-            typeof(NullableToOneRelationshipResponseData<>)
+            typeof(ToOneRelationshipInResponse<>),
+            typeof(ToManyRelationshipInResponse<>),
+            typeof(NullableToOneRelationshipInResponse<>)
         };
 
         private readonly ResourceTypeInfo _resourceTypeInfo;
@@ -180,7 +180,7 @@ private void SetMembersOfRelationshipsObject(OpenApiSchema fullSchemaForRelation
                 if (matchingRelationship != null)
                 {
                     EnsureResourceIdentifierObjectSchemaExists(matchingRelationship);
-                    AddRelationshipDataSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);
+                    AddRelationshipSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);
                 }
             }
         }
@@ -212,59 +212,58 @@ private void GenerateResourceIdentifierObjectSchema(Type resourceIdentifierObjec
             fullSchemaForResourceIdentifierObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);
         }
 
-        private void AddRelationshipDataSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipObject)
+        private void AddRelationshipSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipsObject)
         {
-            Type relationshipDataType = GetRelationshipDataType(relationship, _resourceTypeInfo.ResourceObjectOpenType);
+            Type relationshipSchemaType = GetRelationshipSchemaType(relationship, _resourceTypeInfo.ResourceObjectOpenType);
 
-            OpenApiSchema relationshipDataSchema = GetReferenceSchemaForRelationshipData(relationshipDataType) ??
-                CreateRelationshipDataObjectSchema(relationshipDataType);
+            OpenApiSchema relationshipSchema = GetReferenceSchemaForRelationship(relationshipSchemaType) ?? CreateRelationshipSchema(relationshipSchemaType);
 
-            fullSchemaForRelationshipObject.Properties.Add(relationship.PublicName, relationshipDataSchema);
+            fullSchemaForRelationshipsObject.Properties.Add(relationship.PublicName, relationshipSchema);
 
             if (IsFieldRequired(relationship))
             {
-                fullSchemaForRelationshipObject.Required.Add(relationship.PublicName);
+                fullSchemaForRelationshipsObject.Required.Add(relationship.PublicName);
             }
         }
 
-        private static Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)
+        private static Type GetRelationshipSchemaType(RelationshipAttribute relationship, Type resourceObjectType)
         {
             return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceResponseObject<>))
-                ? RelationshipDataTypeFactory.Instance.GetForResponse(relationship)
-                : RelationshipDataTypeFactory.Instance.GetForRequest(relationship);
+                ? RelationshipTypeFactory.Instance.GetForResponse(relationship)
+                : RelationshipTypeFactory.Instance.GetForRequest(relationship);
         }
 
-        private OpenApiSchema? GetReferenceSchemaForRelationshipData(Type relationshipDataType)
+        private OpenApiSchema? GetReferenceSchemaForRelationship(Type relationshipSchemaType)
         {
-            _schemaRepositoryAccessor.Current.TryLookupByType(relationshipDataType, out OpenApiSchema? referenceSchemaForRelationshipData);
-            return referenceSchemaForRelationshipData;
+            _schemaRepositoryAccessor.Current.TryLookupByType(relationshipSchemaType, out OpenApiSchema? referenceSchema);
+            return referenceSchema;
         }
 
-        private OpenApiSchema CreateRelationshipDataObjectSchema(Type relationshipDataType)
+        private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)
         {
-            OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipDataType, _schemaRepositoryAccessor.Current);
+            OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipSchemaType, _schemaRepositoryAccessor.Current);
 
             OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
 
-            if (IsDataPropertyNullable(relationshipDataType))
+            if (IsDataPropertyNullable(relationshipSchemaType))
             {
                 fullSchema.Properties[JsonApiObjectPropertyName.Data] =
                     _nullableReferenceSchemaGenerator.GenerateSchema(fullSchema.Properties[JsonApiObjectPropertyName.Data]);
             }
 
-            Type relationshipDataOpenType = relationshipDataType.GetGenericTypeDefinition();
-
-            if (IsRelationshipDataPropertyInResponse(relationshipDataOpenType))
+            if (IsRelationshipInResponseType(relationshipSchemaType))
             {
                 fullSchema.Required.Remove(JsonApiObjectPropertyName.Data);
             }
 
             return referenceSchema;
         }
 
-        private static bool IsRelationshipDataPropertyInResponse(Type relationshipDataOpenType)
+        private static bool IsRelationshipInResponseType(Type relationshipSchemaType)
         {
-            return RelationshipResponseDataOpenTypes.Contains(relationshipDataOpenType);
+            Type relationshipSchemaOpenType = relationshipSchemaType.GetGenericTypeDefinition();
+
+            return RelationshipInResponseOpenTypes.Contains(relationshipSchemaOpenType);
         }
 
         private static bool IsDataPropertyNullable(Type type)
diff --git a/test/OpenApiClientTests/LegacyClient/RequestTests.cs b/test/OpenApiClientTests/LegacyClient/RequestTests.cs
diff --git a/test/OpenApiClientTests/LegacyClient/ResponseTests.cs b/test/OpenApiClientTests/LegacyClient/ResponseTests.cs
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json b/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;`
`3`	`3`	`using JsonApiDotNetCore.Resources;`
`4`	`4`
`5`		`-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData`
	`5`	`+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships`
`6`	`6`	`{`
`7`	`7`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`8`		`- internal sealed class NullableToOneRelationshipRequestData<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>`
	`8`	`+ internal sealed class NullableToOneRelationshipInRequest<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>`
`9`	`9`	`where TResource : IIdentifiable`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;`
`6`	`6`	`using JsonApiDotNetCore.Resources;`
`7`	`7`
`8`		`-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData`
	`8`	`+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships`
`9`	`9`	`{`
`10`	`10`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`11`		`- internal sealed class NullableToOneRelationshipResponseData<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>`
	`11`	`+ internal sealed class NullableToOneRelationshipInResponse<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>`
`12`	`12`	`where TResource : IIdentifiable`
`13`	`13`	`{`
`14`	`14`	`[Required]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using JsonApiDotNetCore.OpenApi.JsonApiObjects;`
`7`		`-using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;`
	`7`	`+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;`
`8`	`8`	`using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;`
`9`	`9`	`using JsonApiDotNetCore.Resources.Annotations;`
`10`	`10`	`using Microsoft.OpenApi.Models;`
`@@ -16,11 +16,11 @@ internal sealed class ResourceFieldObjectSchemaBuilder`
`16`	`16`	`{`
`17`	`17`	`private static readonly SchemaRepository ResourceSchemaRepository = new();`
`18`	`18`
`19`		`- private static readonly Type[] RelationshipResponseDataOpenTypes =`
	`19`	`+ private static readonly Type[] RelationshipInResponseOpenTypes =`
`20`	`20`	`{`
`21`		`- typeof(ToOneRelationshipResponseData<>),`
`22`		`- typeof(ToManyRelationshipResponseData<>),`
`23`		`- typeof(NullableToOneRelationshipResponseData<>)`
	`21`	`+ typeof(ToOneRelationshipInResponse<>),`
	`22`	`+ typeof(ToManyRelationshipInResponse<>),`
	`23`	`+ typeof(NullableToOneRelationshipInResponse<>)`
`24`	`24`	`};`
`25`	`25`
`26`	`26`	`private readonly ResourceTypeInfo _resourceTypeInfo;`
`@@ -180,7 +180,7 @@ private void SetMembersOfRelationshipsObject(OpenApiSchema fullSchemaForRelation`
`180`	`180`	`if (matchingRelationship != null)`
`181`	`181`	`{`
`182`	`182`	`EnsureResourceIdentifierObjectSchemaExists(matchingRelationship);`
`183`		`- AddRelationshipDataSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);`
	`183`	`+ AddRelationshipSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`	`}`
`@@ -212,59 +212,58 @@ private void GenerateResourceIdentifierObjectSchema(Type resourceIdentifierObjec`
`212`	`212`	`fullSchemaForResourceIdentifierObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);`
`213`	`213`	`}`
`214`	`214`
`215`		`- private void AddRelationshipDataSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipObject)`
	`215`	`+ private void AddRelationshipSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipsObject)`
`216`	`216`	`{`
`217`		`- Type relationshipDataType = GetRelationshipDataType(relationship, _resourceTypeInfo.ResourceObjectOpenType);`
	`217`	`+ Type relationshipSchemaType = GetRelationshipSchemaType(relationship, _resourceTypeInfo.ResourceObjectOpenType);`
`218`	`218`
`219`		`- OpenApiSchema relationshipDataSchema = GetReferenceSchemaForRelationshipData(relationshipDataType) ??`
`220`		`- CreateRelationshipDataObjectSchema(relationshipDataType);`
	`219`	`+ OpenApiSchema relationshipSchema = GetReferenceSchemaForRelationship(relationshipSchemaType) ?? CreateRelationshipSchema(relationshipSchemaType);`
`221`	`220`
`222`		`- fullSchemaForRelationshipObject.Properties.Add(relationship.PublicName, relationshipDataSchema);`
	`221`	`+ fullSchemaForRelationshipsObject.Properties.Add(relationship.PublicName, relationshipSchema);`
`223`	`222`
`224`	`223`	`if (IsFieldRequired(relationship))`
`225`	`224`	`{`
`226`		`- fullSchemaForRelationshipObject.Required.Add(relationship.PublicName);`
	`225`	`+ fullSchemaForRelationshipsObject.Required.Add(relationship.PublicName);`
`227`	`226`	`}`
`228`	`227`	`}`
`229`	`228`
`230`		`- private static Type GetRelationshipDataType(RelationshipAttribute relationship, Type resourceObjectType)`
	`229`	`+ private static Type GetRelationshipSchemaType(RelationshipAttribute relationship, Type resourceObjectType)`
`231`	`230`	`{`
`232`	`231`	`return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceResponseObject<>))`
`233`		`- ? RelationshipDataTypeFactory.Instance.GetForResponse(relationship)`
`234`		`- : RelationshipDataTypeFactory.Instance.GetForRequest(relationship);`
	`232`	`+ ? RelationshipTypeFactory.Instance.GetForResponse(relationship)`
	`233`	`+ : RelationshipTypeFactory.Instance.GetForRequest(relationship);`
`235`	`234`	`}`
`236`	`235`
`237`		`- private OpenApiSchema? GetReferenceSchemaForRelationshipData(Type relationshipDataType)`
	`236`	`+ private OpenApiSchema? GetReferenceSchemaForRelationship(Type relationshipSchemaType)`
`238`	`237`	`{`
`239`		`- _schemaRepositoryAccessor.Current.TryLookupByType(relationshipDataType, out OpenApiSchema? referenceSchemaForRelationshipData);`
`240`		`- return referenceSchemaForRelationshipData;`
	`238`	`+ _schemaRepositoryAccessor.Current.TryLookupByType(relationshipSchemaType, out OpenApiSchema? referenceSchema);`
	`239`	`+ return referenceSchema;`
`241`	`240`	`}`
`242`	`241`
`243`		`- private OpenApiSchema CreateRelationshipDataObjectSchema(Type relationshipDataType)`
	`242`	`+ private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)`
`244`	`243`	`{`
`245`		`- OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipDataType, _schemaRepositoryAccessor.Current);`
	`244`	`+ OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipSchemaType, _schemaRepositoryAccessor.Current);`
`246`	`245`
`247`	`246`	`OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];`
`248`	`247`
`249`		`- if (IsDataPropertyNullable(relationshipDataType))`
	`248`	`+ if (IsDataPropertyNullable(relationshipSchemaType))`
`250`	`249`	`{`
`251`	`250`	`fullSchema.Properties[JsonApiObjectPropertyName.Data] =`
`252`	`251`	`_nullableReferenceSchemaGenerator.GenerateSchema(fullSchema.Properties[JsonApiObjectPropertyName.Data]);`
`253`	`252`	`}`
`254`	`253`
`255`		`- Type relationshipDataOpenType = relationshipDataType.GetGenericTypeDefinition();`
`256`		`-`
`257`		`- if (IsRelationshipDataPropertyInResponse(relationshipDataOpenType))`
	`254`	`+ if (IsRelationshipInResponseType(relationshipSchemaType))`
`258`	`255`	`{`
`259`	`256`	`fullSchema.Required.Remove(JsonApiObjectPropertyName.Data);`
`260`	`257`	`}`
`261`	`258`
`262`	`259`	`return referenceSchema;`
`263`	`260`	`}`
`264`	`261`
`265`		`- private static bool IsRelationshipDataPropertyInResponse(Type relationshipDataOpenType)`
	`262`	`+ private static bool IsRelationshipInResponseType(Type relationshipSchemaType)`
`266`	`263`	`{`
`267`		`- return RelationshipResponseDataOpenTypes.Contains(relationshipDataOpenType);`
	`264`	`+ Type relationshipSchemaOpenType = relationshipSchemaType.GetGenericTypeDefinition();`
	`265`	`+`
	`266`	`+ return RelationshipInResponseOpenTypes.Contains(relationshipSchemaOpenType);`
`268`	`267`	`}`
`269`	`268`
`270`	`269`	`private static bool IsDataPropertyNullable(Type type)`