Adjusted build script to create OpenApiClient artifact, added documentation, minor model adjustments

maurei · maurei · commit ec2ccafb1ab1 · 2021-09-10T00:00:07.000+02:00
diff --git a/Build.ps1 b/Build.ps1
@@ -86,10 +86,12 @@ function CreateNuGetPackage {
     if ([string]::IsNullOrWhitespace($versionSuffix)) {
         dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts
         dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts
+        dotnet pack .\src\JsonApiDotNetCore.OpenApiClient -c Release -o .\artifacts
     }
     else {
         dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$versionSuffix
         dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts --version-suffix=$versionSuffix
+        dotnet pack .\src\JsonApiDotNetCore.OpenApiClient -c Release -o .\artifacts --version-suffix=$versionSuffix
     }
 
     CheckLastExitCode
diff --git a/JsonApiDotNetCore.sln b/JsonApiDotNetCore.sln
@@ -48,8 +48,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiClient", "src\Examples\OpenApiClient\OpenApiClient.csproj", "{63C2C6C1-0967-4439-BB63-A55DA22869AB}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApiClient", "src\JsonApiDotNetCore.OpenApiClient\JsonApiDotNetCore.OpenApiClient.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
 EndProject
 Global
@@ -242,18 +240,6 @@ Global
 		{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x64.Build.0 = Release|Any CPU
 		{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x86.ActiveCfg = Release|Any CPU
 		{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x86.Build.0 = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|x64.Build.0 = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Debug|x86.Build.0 = Debug|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|x64.ActiveCfg = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|x64.Build.0 = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|x86.ActiveCfg = Release|Any CPU
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB}.Release|x86.Build.0 = Release|Any CPU
 		{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -286,7 +272,6 @@ Global
 		{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
 		{71287D6F-6C3B-44B4-9FCA-E78FE3F02289} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
 		{B693DE14-BB28-496F-AB39-B4E674ABCA80} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
-		{63C2C6C1-0967-4439-BB63-A55DA22869AB} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
 		{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/docs/usage/openapi/openapi.md b/docs/usage/openapi/openapi.md
@@ -39,8 +39,8 @@ public class Startup
         IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
         services.AddJsonApi<AppDbContext>(mvcBuilder: mvcBuilder);
 
-	    // Adds the Swashbuckle integration.
-	    services.AddOpenApi(mvcBuilder);
+        // Adds the Swashbuckle integration.
+        services.AddOpenApi(mvcBuilder);
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/docs/usage/openapi/openapiclient.md b/docs/usage/openapi/openapiclient.md
@@ -0,0 +1,79 @@
+# OpenAPI Generated Client
+
+Given an OpenAPI specification, you can generate a client library using [NSwag](http://stevetalkscode.co.uk/openapireference-commands). We provide additional methods to enrich the features of this client.
+
+## Installation
+
+You need to install the following NuGet packages:
+
+- `JsonApiDotNetCore.OpenApiClient`
+- `NSwag.ApiDescription.Client`
+- `Microsoft.Extensions.ApiDescription.Cient`
+- `NSwag.ApiDescription.Client`
+
+The following examples demonstrate how to install the `JsonApiDotNetCore.OpenApiClient` package.
+
+### CLI
+
+```
+dotnet add package JsonApiDotNetCore.OpenApiClient
+```
+
+### Visual Studio
+
+```powershell
+Install-Package JsonApiDotNetCore.OpenApiClient
+```
+
+### *.csproj
+
+```xml
+<ItemGroup>
+  <!-- Be sure to check NuGet for the latest version # -->
+  <PackageReference Include="JsonApiDotNetCore.OpenApiClient" Version="4.0.0" />
+</ItemGroup>
+```
+
+
+## OpenApiReference
+
+Add a reference to your OpenAPI specification in your project file as demonstrated below.
+
+```xml
+<ItemGroup>
+ <OpenApiReference Include="swagger.json">
+   <Namespace>YourApplication.GeneratedCode</Namespace>
+   <ClassName>OpenApiClient</ClassName>
+   <CodeGenerator>NSwagCSharp</CodeGenerator>
+   <Options>/UseBaseUrl:false /GenerateClientInterfaces:true</Options>
+ </OpenApiReference>
+</ItemGroup>
+```
+
+
+## Usage
+
+The NSwag tooling generates the OpenAPI client during a prebuild step. Once your application is built,
+you can instantiate it using the class name as indicated in the project file.
+
+```c#
+using System;
+using ApiConsumer.GeneratedCode;
+
+namespace ApiConsumer
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+        
+            using (HttpClient httpClient = new HttpClient())
+            {
+                OpenApiClient openApiClient = new OpenApiClient(httpClient);
+
+                // IntelliSense is now available on `openApiClient`!
+            }
+        }
+    }
+}
+```
diff --git a/docs/usage/toc.md b/docs/usage/toc.md
@@ -21,7 +21,10 @@
 # [Errors](errors.md)
 # [Metadata](meta.md)
 # [Caching](caching.md)
-# [OpenAPI](openapi.md)
+
+# OpenAPI
+## [Specification Generator](openapi/openapi.md))
+## [Generated Client](openapi/openapiclient.md))
 
 # Extensibility
 ## [Layer Overview](extensibility/layer-overview.md)
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
@@ -57,21 +57,6 @@ public DataContract GetDataContractForType(Type type)
             return dataContract;
         }
 
-        private static bool IsIdentifiableBaseType(Type type)
-        {
-            if (type.IsGenericType)
-            {
-                return type.GetGenericTypeDefinition() == typeof(Identifiable<>);
-            }
-
-            return type == typeof(Identifiable);
-        }
-
-        private static bool IsIdentity(DataProperty property)
-        {
-            return property.MemberInfo.Name == nameof(Identifiable.Id);
-        }
-
         private static DataContract ReplacePropertiesInDataContract(DataContract dataContract, IEnumerable<DataProperty> dataProperties)
         {
             return DataContract.ForObject(dataContract.UnderlyingType, dataProperties, dataContract.ObjectExtensionDataType,
diff --git a/src/JsonApiDotNetCore.OpenApiClient/JsonApiDotNetCore.OpenApiClient.csproj b/src/JsonApiDotNetCore.OpenApiClient/JsonApiDotNetCore.OpenApiClient.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;openapi;swagger;client;nswag</PackageTags>
-    <Description>TODO</Description>
+    <Description>Contains utility methods to enrich the usability of an OpenAPI gnerated client.</Description>
     <Authors>json-api-dotnet</Authors>
     <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/test/OpenApiTests/Airplane.cs b/test/OpenApiTests/Airplane.cs
@@ -10,7 +10,6 @@ namespace OpenApiTests
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     public sealed class Airplane : Identifiable<string>
     {
-
         [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
         [Required]
         [MaxLength(255)]
@@ -42,7 +41,3 @@ public sealed class Airplane : Identifiable<string>
         public ISet<Flight> Flights { get; set; }
     }
 }
-
-
-
-
diff --git a/test/OpenApiTests/ClientLibrary/ClientAttributeRegistrationLifeTimeTests.cs b/test/OpenApiTests/ClientLibrary/ClientAttributeRegistrationLifeTimeTests.cs
@@ -29,7 +29,7 @@ public async Task Disposed_attribute_registration_for_document_does_not_affect_r
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
+                    Attributes = new AirplaneAttributesInPatchRequest
                     {
                         ManufacturedAt = manufacturedAt
                     }
diff --git a/test/OpenApiTests/ClientLibrary/RequestTests.cs b/test/OpenApiTests/ClientLibrary/RequestTests.cs
@@ -181,7 +181,8 @@ public async Task Partial_patching_resource_produces_expected_request()
             };
 
             using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
-                airplane => airplane.ManufacturedAt, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
+                airplane => airplane.ManufacturedAt, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance,
+                airplane => airplane.AirtimeInHours))
             {
                 // Act
                 _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
@@ -293,9 +294,9 @@ public async Task Patching_ToOne_relationship_produces_expected_request()
             using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToOneAirplaneRequestData()
+            var requestDocument = new ToOneAirplaneRequestData
             {
-                Data = new AirplaneIdentifier()
+                Data = new AirplaneIdentifier
                 {
                     Id = "bBJHu",
                     Type = AirplanesResourceType.Airplanes
@@ -348,7 +349,7 @@ public async Task Posting_ToMany_relationship_produces_expected_request()
             using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantRequestData()
+            var requestDocument = new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
@@ -398,7 +399,7 @@ public async Task Patching_ToMany_relationship_produces_expected_request()
             using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantRequestData()
+            var requestDocument = new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
@@ -448,7 +449,7 @@ public async Task Deleting_ToMany_relationship_produces_expected_request()
             using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantRequestData()
+            var requestDocument = new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
diff --git a/test/OpenApiTests/ClientLibrary/ResponseTests.cs b/test/OpenApiTests/ClientLibrary/ResponseTests.cs
@@ -283,7 +283,7 @@ public async Task Posting_resource_translates_response()
                     Type = FlightsResourceType.Flights,
                     Relationships = new FlightRelationshipsInPostRequest
                     {
-                        OperatingAirplane = new ToOneAirplaneRequestData()
+                        OperatingAirplane = new ToOneAirplaneRequestData
                         {
                             Data = new AirplaneIdentifier
                             {
@@ -466,9 +466,9 @@ public async Task Patching_ToOne_relationship_translates_response()
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
             // Act
-            await apiClient.PatchFlightOperatingAirplaneRelationshipAsync(8712, new ToOneAirplaneRequestData()
+            await apiClient.PatchFlightOperatingAirplaneRelationshipAsync(8712, new ToOneAirplaneRequestData
             {
-                Data = new AirplaneIdentifier()
+                Data = new AirplaneIdentifier
                 {
                     Id = "Adk2a",
                     Type = AirplanesResourceType.Airplanes
@@ -504,7 +504,8 @@ public async Task Getting_ToMany_relationship_translates_response()
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
             // Act
-            FlightAttendantIdentifierCollectionResponseDocument document = await apiClient.GetFlightFlightAttendantsRelationshipAsync(Convert.ToInt32(flightId));
+            FlightAttendantIdentifierCollectionResponseDocument
+                document = await apiClient.GetFlightFlightAttendantsRelationshipAsync(Convert.ToInt32(flightId));
 
             // Assert
             document.Data.Should().HaveCount(2);
@@ -522,7 +523,7 @@ public async Task Posting_ToMany_relationship_produces_empty_response()
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
             // Act
-            Func<Task> action = async () => await apiClient.PostFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()
+            Func<Task> action = async () => await apiClient.PostFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
@@ -551,7 +552,7 @@ public async Task Patching_ToMany_relationship_produces_empty_response()
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
             // Act
-            Func<Task> action = async () => await apiClient.PatchFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()
+            Func<Task> action = async () => await apiClient.PatchFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
@@ -580,7 +581,7 @@ public async Task Deleting_ToMany_relationship_produces_empty_response()
             IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
             // Act
-            Func<Task> action = async () => await apiClient.DeleteFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()
+            Func<Task> action = async () => await apiClient.DeleteFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData
             {
                 Data = new List<FlightAttendantIdentifier>
                 {
diff --git a/test/OpenApiTests/Flight.cs b/test/OpenApiTests/Flight.cs
@@ -28,7 +28,6 @@
 // [MaxLength(2000)]
 // public string ExternalId { get; set; }
 
-
 namespace OpenApiTests
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
@@ -45,7 +44,7 @@ public sealed class Flight : Identifiable
         [Attr]
         public DateTime? ArrivesAt { get; set; }
 
-        [Attr(PublicName =  "operated-by", Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+        [Attr(PublicName = "operated-by", Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
         public Airline Airline { get; set; }
 
         [Attr]
diff --git a/test/OpenApiTests/FlightAttendant.cs b/test/OpenApiTests/FlightAttendant.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,12 @@ function CreateNuGetPackage {`
`86`	`86`	`if ([string]::IsNullOrWhitespace($versionSuffix)) {`
`87`	`87`	`dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts`
`88`	`88`	`dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts`
	`89`	`+ dotnet pack .\src\JsonApiDotNetCore.OpenApiClient -c Release -o .\artifacts`
`89`	`90`	`}`
`90`	`91`	`else {`
`91`	`92`	`dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$versionSuffix`
`92`	`93`	`dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts --version-suffix=$versionSuffix`
	`94`	`+ dotnet pack .\src\JsonApiDotNetCore.OpenApiClient -c Release -o .\artifacts --version-suffix=$versionSuffix`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`CheckLastExitCode`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ public class Startup`
`39`	`39`	`IMvcCoreBuilder mvcBuilder = services.AddMvcCore();`
`40`	`40`	`services.AddJsonApi<AppDbContext>(mvcBuilder: mvcBuilder);`
`41`	`41`
`42`		`- // Adds the Swashbuckle integration.`
`43`		`- services.AddOpenApi(mvcBuilder);`
	`42`	`+ // Adds the Swashbuckle integration.`
	`43`	`+ services.AddOpenApi(mvcBuilder);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace OpenApiTests`
`10`	`10`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`11`	`11`	`public sealed class Airplane : Identifiable<string>`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`[Attr(Capabilities = AttrCapabilities.AllowView \| AttrCapabilities.AllowCreate \| AttrCapabilities.AllowChange)]`
`15`	`14`	`[Required]`
`16`	`15`	`[MaxLength(255)]`
`@@ -42,7 +41,3 @@ public sealed class Airplane : Identifiable<string>`
`42`	`41`	`public ISet<Flight> Flights { get; set; }`
`43`	`42`	`}`
`44`	`43`	`}`
`45`		`-`
`46`		`-`
`47`		`-`
`48`		`-`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task Disposed_attribute_registration_for_document_does_not_affect_r`
`29`	`29`	`{`
`30`	`30`	`Id = airplaneId,`
`31`	`31`	`Type = AirplanesResourceType.Airplanes,`
`32`		`- Attributes = new AirplaneAttributesInPatchRequest()`
	`32`	`+ Attributes = new AirplaneAttributesInPatchRequest`
`33`	`33`	`{`
`34`	`34`	`ManufacturedAt = manufacturedAt`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,8 @@ public async Task Partial_patching_resource_produces_expected_request()`
`181`	`181`	`};`
`182`	`182`
`183`	`183`	`using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,`
`184`		`- airplane => airplane.ManufacturedAt, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))`
	`184`	`+ airplane => airplane.ManufacturedAt, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance,`
	`185`	`+ airplane => airplane.AirtimeInHours))`
`185`	`186`	`{`
`186`	`187`	`// Act`
`187`	`188`	`_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));`
`@@ -293,9 +294,9 @@ public async Task Patching_ToOne_relationship_produces_expected_request()`
`293`	`294`	`using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);`
`294`	`295`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`295`	`296`
`296`		`- var requestDocument = new ToOneAirplaneRequestData()`
	`297`	`+ var requestDocument = new ToOneAirplaneRequestData`
`297`	`298`	`{`
`298`		`- Data = new AirplaneIdentifier()`
	`299`	`+ Data = new AirplaneIdentifier`
`299`	`300`	`{`
`300`	`301`	`Id = "bBJHu",`
`301`	`302`	`Type = AirplanesResourceType.Airplanes`
`@@ -348,7 +349,7 @@ public async Task Posting_ToMany_relationship_produces_expected_request()`
`348`	`349`	`using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);`
`349`	`350`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`350`	`351`
`351`		`- var requestDocument = new ToManyFlightAttendantRequestData()`
	`352`	`+ var requestDocument = new ToManyFlightAttendantRequestData`
`352`	`353`	`{`
`353`	`354`	`Data = new List<FlightAttendantIdentifier>`
`354`	`355`	`{`
`@@ -398,7 +399,7 @@ public async Task Patching_ToMany_relationship_produces_expected_request()`
`398`	`399`	`using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);`
`399`	`400`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`400`	`401`
`401`		`- var requestDocument = new ToManyFlightAttendantRequestData()`
	`402`	`+ var requestDocument = new ToManyFlightAttendantRequestData`
`402`	`403`	`{`
`403`	`404`	`Data = new List<FlightAttendantIdentifier>`
`404`	`405`	`{`
`@@ -448,7 +449,7 @@ public async Task Deleting_ToMany_relationship_produces_expected_request()`
`448`	`449`	`using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);`
`449`	`450`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`450`	`451`
`451`		`- var requestDocument = new ToManyFlightAttendantRequestData()`
	`452`	`+ var requestDocument = new ToManyFlightAttendantRequestData`
`452`	`453`	`{`
`453`	`454`	`Data = new List<FlightAttendantIdentifier>`
`454`	`455`	`{`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public async Task Posting_resource_translates_response()`
`283`	`283`	`Type = FlightsResourceType.Flights,`
`284`	`284`	`Relationships = new FlightRelationshipsInPostRequest`
`285`	`285`	`{`
`286`		`- OperatingAirplane = new ToOneAirplaneRequestData()`
	`286`	`+ OperatingAirplane = new ToOneAirplaneRequestData`
`287`	`287`	`{`
`288`	`288`	`Data = new AirplaneIdentifier`
`289`	`289`	`{`
`@@ -466,9 +466,9 @@ public async Task Patching_ToOne_relationship_translates_response()`
`466`	`466`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`467`	`467`
`468`	`468`	`// Act`
`469`		`- await apiClient.PatchFlightOperatingAirplaneRelationshipAsync(8712, new ToOneAirplaneRequestData()`
	`469`	`+ await apiClient.PatchFlightOperatingAirplaneRelationshipAsync(8712, new ToOneAirplaneRequestData`
`470`	`470`	`{`
`471`		`- Data = new AirplaneIdentifier()`
	`471`	`+ Data = new AirplaneIdentifier`
`472`	`472`	`{`
`473`	`473`	`Id = "Adk2a",`
`474`	`474`	`Type = AirplanesResourceType.Airplanes`
`@@ -504,7 +504,8 @@ public async Task Getting_ToMany_relationship_translates_response()`
`504`	`504`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`505`	`505`
`506`	`506`	`// Act`
`507`		`- FlightAttendantIdentifierCollectionResponseDocument document = await apiClient.GetFlightFlightAttendantsRelationshipAsync(Convert.ToInt32(flightId));`
	`507`	`+ FlightAttendantIdentifierCollectionResponseDocument`
	`508`	`+ document = await apiClient.GetFlightFlightAttendantsRelationshipAsync(Convert.ToInt32(flightId));`
`508`	`509`
`509`	`510`	`// Assert`
`510`	`511`	`document.Data.Should().HaveCount(2);`
`@@ -522,7 +523,7 @@ public async Task Posting_ToMany_relationship_produces_empty_response()`
`522`	`523`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`523`	`524`
`524`	`525`	`// Act`
`525`		`- Func<Task> action = async () => await apiClient.PostFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()`
	`526`	`+ Func<Task> action = async () => await apiClient.PostFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData`
`526`	`527`	`{`
`527`	`528`	`Data = new List<FlightAttendantIdentifier>`
`528`	`529`	`{`
`@@ -551,7 +552,7 @@ public async Task Patching_ToMany_relationship_produces_empty_response()`
`551`	`552`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`552`	`553`
`553`	`554`	`// Act`
`554`		`- Func<Task> action = async () => await apiClient.PatchFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()`
	`555`	`+ Func<Task> action = async () => await apiClient.PatchFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData`
`555`	`556`	`{`
`556`	`557`	`Data = new List<FlightAttendantIdentifier>`
`557`	`558`	`{`
`@@ -580,7 +581,7 @@ public async Task Deleting_ToMany_relationship_produces_empty_response()`
`580`	`581`	`IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);`
`581`	`582`
`582`	`583`	`// Act`
`583`		`- Func<Task> action = async () => await apiClient.DeleteFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData()`
	`584`	`+ Func<Task> action = async () => await apiClient.DeleteFlightFlightAttendantsRelationshipAsync(8712, new ToManyFlightAttendantRequestData`
`584`	`585`	`{`
`585`	`586`	`Data = new List<FlightAttendantIdentifier>`
`586`	`587`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using System.ComponentModel.DataAnnotations;`
`4`	`3`	`using JetBrains.Annotations;`