Reintroduced 'data' in schema names of resource objects.

maurei · maurei · commit d877f7d907cb · 2021-11-30T14:46:00.000+01:00
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
@@ -15,10 +15,10 @@ internal sealed class JsonApiSchemaIdSelector
         {
             [typeof(ResourcePostRequestDocument<>)] = "###-post-request-document",
             [typeof(ResourcePatchRequestDocument<>)] = "###-patch-request-document",
-            [typeof(ResourceObjectInPostRequest<>)] = "###-in-post-request",
+            [typeof(ResourceObjectInPostRequest<>)] = "###-data-in-post-request",
             [typeof(AttributesInPostRequest<>)] = "###-attributes-in-post-request",
             [typeof(RelationshipsInPostRequest<>)] = "###-relationships-in-post-request",
-            [typeof(ResourceObjectInPatchRequest<>)] = "###-in-patch-request",
+            [typeof(ResourceObjectInPatchRequest<>)] = "###-data-in-patch-request",
             [typeof(AttributesInPatchRequest<>)] = "###-attributes-in-patch-request",
             [typeof(RelationshipsInPatchRequest<>)] = "###-relationships-in-patch-request",
             [typeof(ToOneRelationshipInRequest<>)] = "to-one-###-in-request",
@@ -34,7 +34,7 @@ internal sealed class JsonApiSchemaIdSelector
             [typeof(ToOneRelationshipInResponse<>)] = "to-one-###-in-response",
             [typeof(NullableToOneRelationshipInResponse<>)] = "nullable-to-one-###-in-response",
             [typeof(ToManyRelationshipInResponse<>)] = "to-many-###-in-response",
-            [typeof(ResourceObjectInResponse<>)] = "###-in-response",
+            [typeof(ResourceObjectInResponse<>)] = "###-data-in-response",
             [typeof(AttributesInResponse<>)] = "###-attributes-in-response",
             [typeof(RelationshipsInResponse<>)] = "###-relationships-in-response",
             [typeof(ResourceIdentifierObject<>)] = "###-identifier"
diff --git a/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs b/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs
@@ -20,7 +20,7 @@ public async Task Disposed_attribute_registration_for_document_does_not_affect_r
 
             var requestDocument = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
@@ -62,7 +62,7 @@ public async Task Attribute_registration_can_be_used_for_multiple_requests()
 
             var requestDocument = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
@@ -109,7 +109,7 @@ public async Task Request_is_unaffected_by_attribute_registration_for_different_
 
             var requestDocument1 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId1,
                     Type = AirplanesResourceType.Airplanes,
@@ -121,7 +121,7 @@ public async Task Request_is_unaffected_by_attribute_registration_for_different_
 
             var requestDocument2 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId2,
                     Type = AirplanesResourceType.Airplanes,
@@ -164,7 +164,7 @@ public async Task Attribute_values_can_be_changed_after_attribute_registration()
 
             var requestDocument = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
@@ -207,7 +207,7 @@ public async Task Attribute_registration_is_unaffected_by_successive_attribute_r
 
             var requestDocument1 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId1,
                     Type = AirplanesResourceType.Airplanes,
@@ -217,7 +217,7 @@ public async Task Attribute_registration_is_unaffected_by_successive_attribute_r
 
             var requestDocument2 = new AirplanePostRequestDocument
             {
-                Data = new AirplaneInPostRequest
+                Data = new AirplaneDataInPostRequest
                 {
                     Type = AirplanesResourceType.Airplanes,
                     Attributes = new AirplaneAttributesInPostRequest()
@@ -258,7 +258,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
 
             var requestDocument1 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId1,
                     Type = AirplanesResourceType.Airplanes,
@@ -276,7 +276,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
 
             var requestDocument2 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId2,
                     Type = AirplanesResourceType.Airplanes,
@@ -318,7 +318,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
 
             var requestDocument1 = new AirplanePostRequestDocument
             {
-                Data = new AirplaneInPostRequest
+                Data = new AirplaneDataInPostRequest
                 {
                     Type = AirplanesResourceType.Airplanes,
                     Attributes = new AirplaneAttributesInPostRequest()
@@ -335,7 +335,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
 
             var requestDocument2 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
@@ -379,7 +379,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_attribute_re
 
             var requestDocument1 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId1,
                     Type = AirplanesResourceType.Airplanes,
@@ -391,7 +391,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_attribute_re
 
             var requestDocument2 = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId2,
                     Type = AirplanesResourceType.Airplanes,
diff --git a/test/OpenApiClientTests/LegacyClient/RequestTests.cs b/test/OpenApiClientTests/LegacyClient/RequestTests.cs
@@ -64,7 +64,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
 
             var requestDocument = new FlightPostRequestDocument
             {
-                Data = new FlightInPostRequest
+                Data = new FlightDataInPostRequest
                 {
                     Type = FlightsResourceType.Flights,
                     Relationships = new FlightRelationshipsInPostRequest
@@ -144,7 +144,7 @@ public async Task Partial_posting_resource_produces_expected_request()
 
             var requestDocument = new AirplanePostRequestDocument
             {
-                Data = new AirplaneInPostRequest
+                Data = new AirplaneDataInPostRequest
                 {
                     Type = AirplanesResourceType.Airplanes,
                     Attributes = new AirplaneAttributesInPostRequest
@@ -195,7 +195,7 @@ public async Task Partial_patching_resource_produces_expected_request()
 
             var requestDocument = new AirplanePatchRequestDocument
             {
-                Data = new AirplaneInPatchRequest
+                Data = new AirplaneDataInPatchRequest
                 {
                     Id = airplaneId,
                     Type = AirplanesResourceType.Airplanes,
diff --git a/test/OpenApiClientTests/LegacyClient/ResponseTests.cs b/test/OpenApiClientTests/LegacyClient/ResponseTests.cs
@@ -110,7 +110,7 @@ public async Task Getting_resource_collection_translates_response()
             document.Links.Last.Should().Be(topLevelLink);
             document.Data.Should().HaveCount(1);
 
-            FlightInResponse flight = document.Data.First();
+            FlightDataInResponse flight = document.Data.First();
             flight.Id.Should().Be(flightId);
             flight.Type.Should().Be(FlightsResourceType.Flights);
             flight.Links.Self.Should().Be(flightResourceLink);
@@ -278,7 +278,7 @@ public async Task Posting_resource_translates_response()
             // Act
             FlightPrimaryResponseDocument document = await apiClient.PostFlightAsync(new FlightPostRequestDocument
             {
-                Data = new FlightInPostRequest
+                Data = new FlightDataInPostRequest
                 {
                     Type = FlightsResourceType.Flights,
                     Relationships = new FlightRelationshipsInPostRequest
@@ -330,7 +330,7 @@ public async Task Patching_resource_with_side_effects_translates_response()
             // Act
             FlightPrimaryResponseDocument document = await apiClient.PatchFlightAsync(flightId, new FlightPatchRequestDocument
             {
-                Data = new FlightInPatchRequest
+                Data = new FlightDataInPatchRequest
                 {
                     Id = flightId,
                     Type = FlightsResourceType.Flights
@@ -355,7 +355,7 @@ public async Task Patching_resource_without_side_effects_translates_response()
             FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId,
                 new FlightPatchRequestDocument
                 {
-                    Data = new FlightInPatchRequest
+                    Data = new FlightDataInPatchRequest
                     {
                         Id = flightId,
                         Type = FlightsResourceType.Flights
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json b/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public async Task Disposed_attribute_registration_for_document_does_not_affect_r`
`20`	`20`
`21`	`21`	`var requestDocument = new AirplanePatchRequestDocument`
`22`	`22`	`{`
`23`		`- Data = new AirplaneInPatchRequest`
	`23`	`+ Data = new AirplaneDataInPatchRequest`
`24`	`24`	`{`
`25`	`25`	`Id = airplaneId,`
`26`	`26`	`Type = AirplanesResourceType.Airplanes,`
`@@ -62,7 +62,7 @@ public async Task Attribute_registration_can_be_used_for_multiple_requests()`
`62`	`62`
`63`	`63`	`var requestDocument = new AirplanePatchRequestDocument`
`64`	`64`	`{`
`65`		`- Data = new AirplaneInPatchRequest`
	`65`	`+ Data = new AirplaneDataInPatchRequest`
`66`	`66`	`{`
`67`	`67`	`Id = airplaneId,`
`68`	`68`	`Type = AirplanesResourceType.Airplanes,`
`@@ -109,7 +109,7 @@ public async Task Request_is_unaffected_by_attribute_registration_for_different_`
`109`	`109`
`110`	`110`	`var requestDocument1 = new AirplanePatchRequestDocument`
`111`	`111`	`{`
`112`		`- Data = new AirplaneInPatchRequest`
	`112`	`+ Data = new AirplaneDataInPatchRequest`
`113`	`113`	`{`
`114`	`114`	`Id = airplaneId1,`
`115`	`115`	`Type = AirplanesResourceType.Airplanes,`
`@@ -121,7 +121,7 @@ public async Task Request_is_unaffected_by_attribute_registration_for_different_`
`121`	`121`
`122`	`122`	`var requestDocument2 = new AirplanePatchRequestDocument`
`123`	`123`	`{`
`124`		`- Data = new AirplaneInPatchRequest`
	`124`	`+ Data = new AirplaneDataInPatchRequest`
`125`	`125`	`{`
`126`	`126`	`Id = airplaneId2,`
`127`	`127`	`Type = AirplanesResourceType.Airplanes,`
`@@ -164,7 +164,7 @@ public async Task Attribute_values_can_be_changed_after_attribute_registration()`
`164`	`164`
`165`	`165`	`var requestDocument = new AirplanePatchRequestDocument`
`166`	`166`	`{`
`167`		`- Data = new AirplaneInPatchRequest`
	`167`	`+ Data = new AirplaneDataInPatchRequest`
`168`	`168`	`{`
`169`	`169`	`Id = airplaneId,`
`170`	`170`	`Type = AirplanesResourceType.Airplanes,`
`@@ -207,7 +207,7 @@ public async Task Attribute_registration_is_unaffected_by_successive_attribute_r`
`207`	`207`
`208`	`208`	`var requestDocument1 = new AirplanePatchRequestDocument`
`209`	`209`	`{`
`210`		`- Data = new AirplaneInPatchRequest`
	`210`	`+ Data = new AirplaneDataInPatchRequest`
`211`	`211`	`{`
`212`	`212`	`Id = airplaneId1,`
`213`	`213`	`Type = AirplanesResourceType.Airplanes,`
`@@ -217,7 +217,7 @@ public async Task Attribute_registration_is_unaffected_by_successive_attribute_r`
`217`	`217`
`218`	`218`	`var requestDocument2 = new AirplanePostRequestDocument`
`219`	`219`	`{`
`220`		`- Data = new AirplaneInPostRequest`
	`220`	`+ Data = new AirplaneDataInPostRequest`
`221`	`221`	`{`
`222`	`222`	`Type = AirplanesResourceType.Airplanes,`
`223`	`223`	`Attributes = new AirplaneAttributesInPostRequest()`
`@@ -258,7 +258,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att`
`258`	`258`
`259`	`259`	`var requestDocument1 = new AirplanePatchRequestDocument`
`260`	`260`	`{`
`261`		`- Data = new AirplaneInPatchRequest`
	`261`	`+ Data = new AirplaneDataInPatchRequest`
`262`	`262`	`{`
`263`	`263`	`Id = airplaneId1,`
`264`	`264`	`Type = AirplanesResourceType.Airplanes,`
`@@ -276,7 +276,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att`
`276`	`276`
`277`	`277`	`var requestDocument2 = new AirplanePatchRequestDocument`
`278`	`278`	`{`
`279`		`- Data = new AirplaneInPatchRequest`
	`279`	`+ Data = new AirplaneDataInPatchRequest`
`280`	`280`	`{`
`281`	`281`	`Id = airplaneId2,`
`282`	`282`	`Type = AirplanesResourceType.Airplanes,`
`@@ -318,7 +318,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att`
`318`	`318`
`319`	`319`	`var requestDocument1 = new AirplanePostRequestDocument`
`320`	`320`	`{`
`321`		`- Data = new AirplaneInPostRequest`
	`321`	`+ Data = new AirplaneDataInPostRequest`
`322`	`322`	`{`
`323`	`323`	`Type = AirplanesResourceType.Airplanes,`
`324`	`324`	`Attributes = new AirplaneAttributesInPostRequest()`
`@@ -335,7 +335,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att`
`335`	`335`
`336`	`336`	`var requestDocument2 = new AirplanePatchRequestDocument`
`337`	`337`	`{`
`338`		`- Data = new AirplaneInPatchRequest`
	`338`	`+ Data = new AirplaneDataInPatchRequest`
`339`	`339`	`{`
`340`	`340`	`Id = airplaneId,`
`341`	`341`	`Type = AirplanesResourceType.Airplanes,`
`@@ -379,7 +379,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_attribute_re`
`379`	`379`
`380`	`380`	`var requestDocument1 = new AirplanePatchRequestDocument`
`381`	`381`	`{`
`382`		`- Data = new AirplaneInPatchRequest`
	`382`	`+ Data = new AirplaneDataInPatchRequest`
`383`	`383`	`{`
`384`	`384`	`Id = airplaneId1,`
`385`	`385`	`Type = AirplanesResourceType.Airplanes,`
`@@ -391,7 +391,7 @@ public async Task Attribute_registration_is_unaffected_by_preceding_attribute_re`
`391`	`391`
`392`	`392`	`var requestDocument2 = new AirplanePatchRequestDocument`
`393`	`393`	`{`
`394`		`- Data = new AirplaneInPatchRequest`
	`394`	`+ Data = new AirplaneDataInPatchRequest`
`395`	`395`	`{`
`396`	`396`	`Id = airplaneId2,`
`397`	`397`	`Type = AirplanesResourceType.Airplanes,`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_`
`64`	`64`
`65`	`65`	`var requestDocument = new FlightPostRequestDocument`
`66`	`66`	`{`
`67`		`- Data = new FlightInPostRequest`
	`67`	`+ Data = new FlightDataInPostRequest`
`68`	`68`	`{`
`69`	`69`	`Type = FlightsResourceType.Flights,`
`70`	`70`	`Relationships = new FlightRelationshipsInPostRequest`
`@@ -144,7 +144,7 @@ public async Task Partial_posting_resource_produces_expected_request()`
`144`	`144`
`145`	`145`	`var requestDocument = new AirplanePostRequestDocument`
`146`	`146`	`{`
`147`		`- Data = new AirplaneInPostRequest`
	`147`	`+ Data = new AirplaneDataInPostRequest`
`148`	`148`	`{`
`149`	`149`	`Type = AirplanesResourceType.Airplanes,`
`150`	`150`	`Attributes = new AirplaneAttributesInPostRequest`
`@@ -195,7 +195,7 @@ public async Task Partial_patching_resource_produces_expected_request()`
`195`	`195`
`196`	`196`	`var requestDocument = new AirplanePatchRequestDocument`
`197`	`197`	`{`
`198`		`- Data = new AirplaneInPatchRequest`
	`198`	`+ Data = new AirplaneDataInPatchRequest`
`199`	`199`	`{`
`200`	`200`	`Id = airplaneId,`
`201`	`201`	`Type = AirplanesResourceType.Airplanes,`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public async Task Getting_resource_collection_translates_response()`
`110`	`110`	`document.Links.Last.Should().Be(topLevelLink);`
`111`	`111`	`document.Data.Should().HaveCount(1);`
`112`	`112`
`113`		`- FlightInResponse flight = document.Data.First();`
	`113`	`+ FlightDataInResponse flight = document.Data.First();`
`114`	`114`	`flight.Id.Should().Be(flightId);`
`115`	`115`	`flight.Type.Should().Be(FlightsResourceType.Flights);`
`116`	`116`	`flight.Links.Self.Should().Be(flightResourceLink);`
`@@ -278,7 +278,7 @@ public async Task Posting_resource_translates_response()`
`278`	`278`	`// Act`
`279`	`279`	`FlightPrimaryResponseDocument document = await apiClient.PostFlightAsync(new FlightPostRequestDocument`
`280`	`280`	`{`
`281`		`- Data = new FlightInPostRequest`
	`281`	`+ Data = new FlightDataInPostRequest`
`282`	`282`	`{`
`283`	`283`	`Type = FlightsResourceType.Flights,`
`284`	`284`	`Relationships = new FlightRelationshipsInPostRequest`
`@@ -330,7 +330,7 @@ public async Task Patching_resource_with_side_effects_translates_response()`
`330`	`330`	`// Act`
`331`	`331`	`FlightPrimaryResponseDocument document = await apiClient.PatchFlightAsync(flightId, new FlightPatchRequestDocument`
`332`	`332`	`{`
`333`		`- Data = new FlightInPatchRequest`
	`333`	`+ Data = new FlightDataInPatchRequest`
`334`	`334`	`{`
`335`	`335`	`Id = flightId,`
`336`	`336`	`Type = FlightsResourceType.Flights`
`@@ -355,7 +355,7 @@ public async Task Patching_resource_without_side_effects_translates_response()`
`355`	`355`	`FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId,`
`356`	`356`	`new FlightPatchRequestDocument`
`357`	`357`	`{`
`358`		`- Data = new FlightInPatchRequest`
	`358`	`+ Data = new FlightDataInPatchRequest`
`359`	`359`	`{`
`360`	`360`	`Id = flightId,`
`361`	`361`	`Type = FlightsResourceType.Flights`