Skip to content

Commit 9919ccc

Browse files
bkoelmanbkoelman
committed
Resharper: Replace async method with Task return
1 parent 657f25a commit 9919ccc

File tree

13 files changed

+62
-62
lines changed

13 files changed

+62
-62
lines changed

‎src/Examples/JsonApiDotNetCoreExampleClient/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
using (apiClient.WithPartialAttributeSerialization<PersonPatchRequestDocument, PersonAttributesInPatchRequest>(patchRequest, person => person.FirstName))
3232
{
3333
// Workaround for https://github.com/RicoSuter/NSwag/issues/2499.
34-
await TranslateAsync(async () => await apiClient.PatchPersonAsync(1, null, patchRequest));
34+
await TranslateAsync(() => apiClient.PatchPersonAsync(1, null, patchRequest));
3535
}
3636

3737
Console.WriteLine("Press any key to close.");

‎test/OpenApiClientTests/LegacyClient/PartialAttributeSerializationLifetimeTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ public async Task Disposed_registration_does_not_affect_request()
3131
using (apiClient.WithPartialAttributeSerialization<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
3232
airplane => airplane.AirtimeInHours))
3333
{
34-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
34+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
3535
}
3636

3737
wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
3838

3939
// Act
40-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
40+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
4141

4242
// Assert
4343
wrapper.RequestBody.Should().BeJson(@"{
@@ -76,14 +76,14 @@ public async Task Registration_can_be_used_for_multiple_requests()
7676
using (apiClient.WithPartialAttributeSerialization<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
7777
airplane => airplane.AirtimeInHours))
7878
{
79-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
79+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
8080

8181
wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
8282

8383
requestDocument.Data.Attributes.AirtimeInHours = null;
8484

8585
// Act
86-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
86+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
8787
}
8888

8989
// Assert
@@ -138,7 +138,7 @@ public async Task Request_is_unaffected_by_registration_for_different_document_o
138138
}
139139

140140
// Act
141-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
141+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
142142
}
143143

144144
// Assert
@@ -181,7 +181,7 @@ public async Task Attribute_values_can_be_changed_after_registration()
181181
requestDocument.Data.Attributes.IsInMaintenance = false;
182182

183183
// Act
184-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
184+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
185185
}
186186

187187
// Assert
@@ -231,7 +231,7 @@ public async Task Registration_is_unaffected_by_successive_registration_for_docu
231231
airplane => airplane.AirtimeInHours))
232232
{
233233
// Act
234-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
234+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
235235
}
236236
}
237237

@@ -269,7 +269,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
269269
using (apiClient.WithPartialAttributeSerialization<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
270270
airplane => airplane.AirtimeInHours))
271271
{
272-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
272+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
273273
}
274274

275275
const string airplaneId2 = "DJy1u";
@@ -293,7 +293,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
293293
airplane => airplane.SerialNumber))
294294
{
295295
// Act
296-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
296+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
297297
}
298298

299299
// Assert
@@ -331,7 +331,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
331331
using (apiClient.WithPartialAttributeSerialization<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument1,
332332
airplane => airplane.AirtimeInHours))
333333
{
334-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(null, requestDocument1));
334+
_ = await ApiResponse.TranslateAsync(() => apiClient.PostAirplaneAsync(null, requestDocument1));
335335
}
336336

337337
const string airplaneId = "DJy1u";
@@ -355,7 +355,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
355355
airplane => airplane.SerialNumber))
356356
{
357357
// Act
358-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument2));
358+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument2));
359359
}
360360

361361
// Assert
@@ -409,7 +409,7 @@ public async Task Registration_is_unaffected_by_preceding_registration_for_diffe
409409
airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
410410
{
411411
// Act
412-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
412+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
413413
}
414414
}
415415

‎test/OpenApiClientTests/LegacyClient/RequestTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task Getting_resource_collection_produces_expected_request()
2323
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
2424

2525
// Act
26-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCollectionAsync(null));
26+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightCollectionAsync(null));
2727

2828
// Assert
2929
wrapper.Request.ShouldNotBeNull();
@@ -43,7 +43,7 @@ public async Task Getting_resource_produces_expected_request()
4343
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
4444

4545
// Act
46-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightAsync(flightId, null));
46+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightAsync(flightId, null));
4747

4848
// Assert
4949
wrapper.Request.ShouldNotBeNull();
@@ -88,7 +88,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
8888
};
8989

9090
// Act
91-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostFlightAsync(null, requestDocument));
91+
_ = await ApiResponse.TranslateAsync(() => apiClient.PostFlightAsync(null, requestDocument));
9292

9393
// Assert
9494
wrapper.Request.ShouldNotBeNull();
@@ -157,7 +157,7 @@ public async Task Partial_posting_resource_produces_expected_request()
157157
airplane => airplane.SerialNumber))
158158
{
159159
// Act
160-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(null, requestDocument));
160+
_ = await ApiResponse.TranslateAsync(() => apiClient.PostAirplaneAsync(null, requestDocument));
161161
}
162162

163163
// Assert
@@ -208,7 +208,7 @@ public async Task Partial_patching_resource_produces_expected_request()
208208
airplane => airplane.SerialNumber, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
209209
{
210210
// Act
211-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
211+
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
212212
}
213213

214214
// Assert
@@ -263,7 +263,7 @@ public async Task Getting_secondary_resource_produces_expected_request()
263263
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
264264

265265
// Act
266-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserAsync(flightId, null));
266+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightPurserAsync(flightId, null));
267267

268268
// Assert
269269
wrapper.Request.ShouldNotBeNull();
@@ -283,7 +283,7 @@ public async Task Getting_secondary_resources_produces_expected_request()
283283
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
284284

285285
// Act
286-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersAsync(flightId, null));
286+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightCabinCrewMembersAsync(flightId, null));
287287

288288
// Assert
289289
wrapper.Request.ShouldNotBeNull();
@@ -303,7 +303,7 @@ public async Task Getting_ToOne_relationship_produces_expected_request()
303303
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
304304

305305
// Act
306-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserRelationshipAsync(flightId, null));
306+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightPurserRelationshipAsync(flightId, null));
307307

308308
// Assert
309309
wrapper.Request.ShouldNotBeNull();
@@ -360,7 +360,7 @@ public async Task Getting_ToMany_relationship_produces_expected_request()
360360
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
361361

362362
// Act
363-
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId, null));
363+
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId, null));
364364

365365
// Assert
366366
wrapper.Request.ShouldNotBeNull();

‎test/OpenApiClientTests/LegacyClient/ResponseTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public async Task Getting_unknown_resource_translates_error_response()
213213
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
214214

215215
// Act
216-
Func<Task<FlightPrimaryResponseDocument>> action = async () => await apiClient.GetFlightAsync(flightId, null);
216+
Func<Task<FlightPrimaryResponseDocument>> action = () => apiClient.GetFlightAsync(flightId, null);
217217

218218
// Assert
219219
ExceptionAssertions<ApiException> assertion = await action.Should().ThrowExactlyAsync<ApiException>();
@@ -353,7 +353,7 @@ public async Task Patching_resource_without_side_effects_translates_response()
353353
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
354354

355355
// Act
356-
FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId, null,
356+
FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(() => apiClient.PatchFlightAsync(flightId, null,
357357
new FlightPatchRequestDocument
358358
{
359359
Data = new FlightDataInPatchRequest
@@ -375,7 +375,7 @@ public async Task Deleting_resource_produces_empty_response()
375375
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
376376

377377
// Act
378-
Func<Task> action = async () => await apiClient.DeleteFlightAsync("ZvuH1");
378+
Func<Task> action = () => apiClient.DeleteFlightAsync("ZvuH1");
379379

380380
// Assert
381381
await action.Should().NotThrowAsync();
@@ -609,7 +609,7 @@ public async Task Posting_ToMany_relationship_produces_empty_response()
609609
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
610610

611611
// Act
612-
Func<Task> action = async () => await apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
612+
Func<Task> action = () => apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
613613
{
614614
Data = new List<FlightAttendantIdentifier>
615615
{
@@ -638,7 +638,7 @@ public async Task Patching_ToMany_relationship_produces_empty_response()
638638
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
639639

640640
// Act
641-
Func<Task> action = async () => await apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
641+
Func<Task> action = () => apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
642642
{
643643
Data = new List<FlightAttendantIdentifier>
644644
{
@@ -667,7 +667,7 @@ public async Task Deleting_ToMany_relationship_produces_empty_response()
667667
IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
668668

669669
// Act
670-
Func<Task> action = async () => await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
670+
Func<Task> action = () => apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
671671
{
672672
Data = new List<FlightAttendantIdentifier>
673673
{

‎test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/CreateResourceTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async Task Can_set_attribute_to_default_value(string attributePropertyNam
5151
using IDisposable _ = apiClient.WithPartialAttributeSerialization(requestDocument, includeAttributeSelector);
5252

5353
// Act
54-
await ApiResponse.TranslateAsync(async () => await apiClient.PostResourceAsync(null, requestDocument));
54+
await ApiResponse.TranslateAsync(() => apiClient.PostResourceAsync(null, requestDocument));
5555

5656
// Assert
5757
JsonElement document = wrapper.GetRequestBodyAsJson();
@@ -92,7 +92,7 @@ public async Task Can_omit_attribute(string attributePropertyName, string jsonPr
9292
using IDisposable _ = apiClient.WithPartialAttributeSerialization<ResourcePostRequestDocument, ResourceAttributesInPostRequest>(requestDocument);
9393

9494
// Act
95-
await ApiResponse.TranslateAsync(async () => await apiClient.PostResourceAsync(null, requestDocument));
95+
await ApiResponse.TranslateAsync(() => apiClient.PostResourceAsync(null, requestDocument));
9696

9797
// Assert
9898
JsonElement document = wrapper.GetRequestBodyAsJson();
@@ -133,7 +133,7 @@ public async Task Cannot_omit_attribute(string attributePropertyName, string jso
133133
using IDisposable _ = apiClient.WithPartialAttributeSerialization<ResourcePostRequestDocument, ResourceAttributesInPostRequest>(requestDocument);
134134

135135
// Act
136-
Func<Task<ResourcePrimaryResponseDocument?>> action = async () => await apiClient.PostResourceAsync(null, requestDocument);
136+
Func<Task<ResourcePrimaryResponseDocument?>> action = () => apiClient.PostResourceAsync(null, requestDocument);
137137

138138
// Assert
139139
ExceptionAssertions<InvalidOperationException> assertion = await action.Should().ThrowExactlyAsync<InvalidOperationException>();
@@ -169,7 +169,7 @@ public async Task Can_clear_relationship(string relationshipPropertyName, string
169169
var apiClient = new NrtOffMsvOffClient(wrapper.HttpClient);
170170

171171
// Act
172-
await ApiResponse.TranslateAsync(async () => await apiClient.PostResourceAsync(null, requestDocument));
172+
await ApiResponse.TranslateAsync(() => apiClient.PostResourceAsync(null, requestDocument));
173173

174174
// Assert
175175
JsonElement document = wrapper.GetRequestBodyAsJson();
@@ -207,7 +207,7 @@ public async Task Cannot_clear_relationship(string relationshipPropertyName, str
207207
var apiClient = new NrtOffMsvOffClient(wrapper.HttpClient);
208208

209209
// Act
210-
Func<Task<ResourcePrimaryResponseDocument?>> action = async () => await apiClient.PostResourceAsync(null, requestDocument);
210+
Func<Task<ResourcePrimaryResponseDocument?>> action = () => apiClient.PostResourceAsync(null, requestDocument);
211211

212212
// Assert
213213
ExceptionAssertions<JsonSerializationException> assertion = await action.Should().ThrowExactlyAsync<JsonSerializationException>();
@@ -243,7 +243,7 @@ public async Task Can_omit_relationship(string relationshipPropertyName, string
243243
var apiClient = new NrtOffMsvOffClient(wrapper.HttpClient);
244244

245245
// Act
246-
await ApiResponse.TranslateAsync(async () => await apiClient.PostResourceAsync(null, requestDocument));
246+
await ApiResponse.TranslateAsync(() => apiClient.PostResourceAsync(null, requestDocument));
247247

248248
// Assert
249249
JsonElement document = wrapper.GetRequestBodyAsJson();

‎test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/UpdateResourceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public async Task Can_omit_attribute(string attributePropertyName, string jsonPr
7979
using IDisposable _ = apiClient.WithPartialAttributeSerialization<ResourcePatchRequestDocument, ResourceAttributesInPatchRequest>(requestDocument);
8080

8181
// Act
82-
await ApiResponse.TranslateAsync(async () => await apiClient.PatchResourceAsync(int.Parse(requestDocument.Data.Id), null, requestDocument));
82+
await ApiResponse.TranslateAsync(() => apiClient.PatchResourceAsync(int.Parse(requestDocument.Data.Id), null, requestDocument));
8383

8484
// Assert
8585
JsonElement document = wrapper.GetRequestBodyAsJson();
@@ -120,7 +120,7 @@ public async Task Can_omit_relationship(string relationshipPropertyName, string
120120
var apiClient = new NrtOffMsvOffClient(wrapper.HttpClient);
121121

122122
// Act
123-
await ApiResponse.TranslateAsync(async () => await apiClient.PatchResourceAsync(int.Parse(requestDocument.Data.Id), null, requestDocument));
123+
await ApiResponse.TranslateAsync(() => apiClient.PatchResourceAsync(int.Parse(requestDocument.Data.Id), null, requestDocument));
124124

125125
// Assert
126126
JsonElement document = wrapper.GetRequestBodyAsJson();

0 commit comments

Comments
 (0)