Skip to content

Commit 8f36981

Browse files
bkoelmanbkoelman
committed
Revert "Resharper: Replace async method with Task return"
Reverting the effects of this Resharper rule because it makes stack traces harder to understand, while the gain it provides is theoretical. Resharper turned off this suggestion in the default ruleset in a later version. This reverts commit 9919ccc.
1 parent 1be5bd9 commit 8f36981

File tree

20 files changed

+110
-104
lines changed

20 files changed

+110
-104
lines changed

‎src/Examples/OpenApiNSwagClientExample/Worker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
4545
private static Task<ApiResponse<PersonCollectionResponseDocument?>> GetPeopleAsync(ExampleApiClient apiClient, IDictionary<string, string?> queryString,
4646
string? ifNoneMatch, CancellationToken cancellationToken)
4747
{
48-
return ApiResponse.TranslateAsync(() => apiClient.GetPersonCollectionAsync(queryString, ifNoneMatch, cancellationToken));
48+
return ApiResponse.TranslateAsync(async () => await apiClient.GetPersonCollectionAsync(queryString, ifNoneMatch, cancellationToken));
4949
}
5050

5151
private async Task UpdatePersonAsync(CancellationToken cancellationToken)
@@ -66,7 +66,7 @@ private async Task UpdatePersonAsync(CancellationToken cancellationToken)
6666
using (_apiClient.WithPartialAttributeSerialization<PersonPatchRequestDocument, PersonAttributesInPatchRequest>(patchRequest,
6767
person => person.FirstName))
6868
{
69-
_ = await ApiResponse.TranslateAsync(() => _apiClient.PatchPersonAsync(patchRequest.Data.Id, null, patchRequest, cancellationToken));
69+
_ = await ApiResponse.TranslateAsync(async () => await _apiClient.PatchPersonAsync(patchRequest.Data.Id, null, patchRequest, cancellationToken));
7070
}
7171
}
7272
}

‎test/OpenApiKiotaEndToEndTests/Headers/ETagTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ public async Task Returns_no_ETag_for_failed_GET_request()
107107
};
108108

109109
// Act
110-
Func<Task<CountryPrimaryResponseDocument?>> action = () =>
111-
apiClient.Countries[unknownCountryId].GetAsync(configuration => configuration.Options.Add(headerInspector));
110+
Func<Task> action = async () => await apiClient.Countries[unknownCountryId].GetAsync(configuration => configuration.Options.Add(headerInspector));
112111

113112
// Assert
114113
ErrorResponseDocument exception = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
@@ -188,7 +187,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
188187
headerInspector.ResponseHeaders.Clear();
189188

190189
// Act
191-
Func<Task<CountryCollectionResponseDocument?>> action = () => apiClient.Countries.GetAsync(configuration =>
190+
Func<Task> action = async () => await apiClient.Countries.GetAsync(configuration =>
192191
{
193192
configuration.Headers.Add(HeaderNames.IfNoneMatch, responseETag);
194193
configuration.Options.Add(headerInspector);

‎test/OpenApiNSwagClientTests/LegacyOpenApi/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(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
34+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
3535
}
3636

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

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

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

8383
wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
8484

8585
requestDocument.Data.Attributes.AirtimeInHours = null;
8686

8787
// Act
88-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
88+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
8989
}
9090

9191
// Assert
@@ -142,7 +142,7 @@ public async Task Request_is_unaffected_by_registration_for_different_document_o
142142
}
143143

144144
// Act
145-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
145+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
146146
}
147147

148148
// Assert
@@ -187,7 +187,7 @@ public async Task Attribute_values_can_be_changed_after_registration()
187187
requestDocument.Data.Attributes.IsInMaintenance = false;
188188

189189
// Act
190-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
190+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
191191
}
192192

193193
// Assert
@@ -239,7 +239,7 @@ public async Task Registration_is_unaffected_by_successive_registration_for_docu
239239
airplane => airplane.AirtimeInHours))
240240
{
241241
// Act
242-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
242+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
243243
}
244244
}
245245

@@ -279,7 +279,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
279279
using (apiClient.WithPartialAttributeSerialization<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
280280
airplane => airplane.AirtimeInHours))
281281
{
282-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
282+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, null, requestDocument1));
283283
}
284284

285285
const string airplaneId2 = "DJy1u";
@@ -303,7 +303,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
303303
airplane => airplane.SerialNumber))
304304
{
305305
// Act
306-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
306+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
307307
}
308308

309309
// Assert
@@ -343,7 +343,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
343343
using (apiClient.WithPartialAttributeSerialization<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument1,
344344
airplane => airplane.AirtimeInHours))
345345
{
346-
_ = await ApiResponse.TranslateAsync(() => apiClient.PostAirplaneAsync(null, requestDocument1));
346+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(null, requestDocument1));
347347
}
348348

349349
const string airplaneId = "DJy1u";
@@ -367,7 +367,7 @@ public async Task Registration_is_unaffected_by_preceding_disposed_registration_
367367
airplane => airplane.SerialNumber))
368368
{
369369
// Act
370-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument2));
370+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument2));
371371
}
372372

373373
// Assert
@@ -423,7 +423,7 @@ public async Task Registration_is_unaffected_by_preceding_registration_for_diffe
423423
airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
424424
{
425425
// Act
426-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
426+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, null, requestDocument2));
427427
}
428428
}
429429

‎test/OpenApiNSwagClientTests/LegacyOpenApi/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
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
2424

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

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

4545
// Act
46-
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightAsync(flightId, null, null));
46+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightAsync(flightId, null, 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(() => apiClient.PostFlightAsync(null, requestDocument));
91+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostFlightAsync(null, requestDocument));
9292

9393
// Assert
9494
wrapper.Request.ShouldNotBeNull();
@@ -159,7 +159,7 @@ public async Task Partial_posting_resource_produces_expected_request()
159159
airplane => airplane.SerialNumber))
160160
{
161161
// Act
162-
_ = await ApiResponse.TranslateAsync(() => apiClient.PostAirplaneAsync(null, requestDocument));
162+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(null, requestDocument));
163163
}
164164

165165
// Assert
@@ -212,7 +212,7 @@ public async Task Partial_patching_resource_produces_expected_request()
212212
airplane => airplane.SerialNumber, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
213213
{
214214
// Act
215-
_ = await ApiResponse.TranslateAsync(() => apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
215+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, null, requestDocument));
216216
}
217217

218218
// Assert
@@ -269,7 +269,7 @@ public async Task Getting_secondary_resource_produces_expected_request()
269269
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
270270

271271
// Act
272-
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightPurserAsync(flightId, null, null));
272+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserAsync(flightId, null, null));
273273

274274
// Assert
275275
wrapper.Request.ShouldNotBeNull();
@@ -289,7 +289,7 @@ public async Task Getting_secondary_resources_produces_expected_request()
289289
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
290290

291291
// Act
292-
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightCabinCrewMembersAsync(flightId, null, null));
292+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersAsync(flightId, null, null));
293293

294294
// Assert
295295
wrapper.Request.ShouldNotBeNull();
@@ -309,7 +309,7 @@ public async Task Getting_ToOne_relationship_produces_expected_request()
309309
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
310310

311311
// Act
312-
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightPurserRelationshipAsync(flightId, null, null));
312+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserRelationshipAsync(flightId, null, null));
313313

314314
// Assert
315315
wrapper.Request.ShouldNotBeNull();
@@ -368,7 +368,7 @@ public async Task Getting_ToMany_relationship_produces_expected_request()
368368
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
369369

370370
// Act
371-
_ = await ApiResponse.TranslateAsync(() => apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId, null, null));
371+
_ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId, null, null));
372372

373373
// Assert
374374
wrapper.Request.ShouldNotBeNull();

‎test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public async Task Getting_unknown_resource_translates_error_response()
221221
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
222222

223223
// Act
224-
Func<Task<FlightPrimaryResponseDocument>> action = () => apiClient.GetFlightAsync(flightId, null, null);
224+
Func<Task> action = async () => await apiClient.GetFlightAsync(flightId, null, null);
225225

226226
// Assert
227227
ApiException<ErrorResponseDocument> exception = (await action.Should().ThrowExactlyAsync<ApiException<ErrorResponseDocument>>()).Which;
@@ -373,7 +373,7 @@ public async Task Patching_resource_without_side_effects_translates_response()
373373
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
374374

375375
// Act
376-
FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(() => apiClient.PatchFlightAsync(flightId, null,
376+
FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId, null,
377377
new FlightPatchRequestDocument
378378
{
379379
Data = new FlightDataInPatchRequest
@@ -395,7 +395,7 @@ public async Task Deleting_resource_produces_empty_response()
395395
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
396396

397397
// Act
398-
Func<Task> action = () => apiClient.DeleteFlightAsync("ZvuH1");
398+
Func<Task> action = async () => await apiClient.DeleteFlightAsync("ZvuH1");
399399

400400
// Assert
401401
await action.Should().NotThrowAsync();
@@ -641,7 +641,7 @@ public async Task Posting_ToMany_relationship_produces_empty_response()
641641
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
642642

643643
// Act
644-
Func<Task> action = () => apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
644+
Func<Task> action = async () => await apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
645645
{
646646
Data = new List<FlightAttendantIdentifier>
647647
{
@@ -670,7 +670,7 @@ public async Task Patching_ToMany_relationship_produces_empty_response()
670670
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
671671

672672
// Act
673-
Func<Task> action = () => apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
673+
Func<Task> action = async () => await apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
674674
{
675675
Data = new List<FlightAttendantIdentifier>
676676
{
@@ -699,7 +699,7 @@ public async Task Deleting_ToMany_relationship_produces_empty_response()
699699
ILegacyClient apiClient = new LegacyClient(wrapper.HttpClient);
700700

701701
// Act
702-
Func<Task> action = () => apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
702+
Func<Task> action = async () => await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
703703
{
704704
Data = new List<FlightAttendantIdentifier>
705705
{

‎test/OpenApiNSwagClientTests/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(() => apiClient.PostResourceAsync(null, requestDocument));
54+
await ApiResponse.TranslateAsync(async () => await 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(() => apiClient.PostResourceAsync(null, requestDocument));
95+
await ApiResponse.TranslateAsync(async () => await 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 = () => apiClient.PostResourceAsync(null, requestDocument);
136+
Func<Task> action = async () => await 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(() => apiClient.PostResourceAsync(null, requestDocument));
172+
await ApiResponse.TranslateAsync(async () => await 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 = () => apiClient.PostResourceAsync(null, requestDocument);
210+
Func<Task> action = async () => await 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(() => apiClient.PostResourceAsync(null, requestDocument));
246+
await ApiResponse.TranslateAsync(async () => await apiClient.PostResourceAsync(null, requestDocument));
247247

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

‎test/OpenApiNSwagClientTests/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(() => apiClient.PatchResourceAsync(requestDocument.Data.Id, null, requestDocument));
82+
await ApiResponse.TranslateAsync(async () => await apiClient.PatchResourceAsync(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(() => apiClient.PatchResourceAsync(requestDocument.Data.Id, null, requestDocument));
123+
await ApiResponse.TranslateAsync(async () => await apiClient.PatchResourceAsync(requestDocument.Data.Id, null, requestDocument));
124124

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

0 commit comments

Comments
 (0)