Skip to content

Commit 21afcd9

Browse files
author
Bart Koelman
committed
Replaced "var _" with discards
1 parent 1a64287 commit 21afcd9

27 files changed

+143
-204
lines changed

src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void ApplyOptions(IJsonApiOptions options)
168168
{
169169
ApplyOptionsInEntry(_globalScope, options);
170170

171-
foreach ((ResourceFieldChainExpression _, MutablePaginationEntry entry) in _nestedScopes)
171+
foreach ((_, MutablePaginationEntry entry) in _nestedScopes)
172172
{
173173
ApplyOptionsInEntry(entry, options);
174174
}

test/JsonApiDotNetCoreExampleTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public async Task Can_process_operations_same_as_maximum()
115115
const string route = "/operations";
116116

117117
// Act
118-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecutePostAtomicAsync<ErrorDocument>(route, requestBody);
118+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<ErrorDocument>(route, requestBody);
119119

120120
// Assert
121121
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -155,7 +155,7 @@ public async Task Can_process_high_number_of_operations_when_unconstrained()
155155
const string route = "/operations";
156156

157157
// Act
158-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecutePostAtomicAsync<ErrorDocument>(route, requestBody);
158+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<ErrorDocument>(route, requestBody);
159159

160160
// Assert
161161
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task Permits_no_Accept_headers()
3131
var acceptHeaders = new MediaTypeWithQualityHeaderValue[0];
3232

3333
// Act
34-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
34+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
3535

3636
// Assert
3737
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -66,8 +66,7 @@ public async Task Permits_no_Accept_headers_at_operations_endpoint()
6666
var acceptHeaders = new MediaTypeWithQualityHeaderValue[0];
6767

6868
// Act
69-
(HttpResponseMessage httpResponse, ErrorDocument _) =
70-
await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType, acceptHeaders);
69+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType, acceptHeaders);
7170

7271
// Assert
7372
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -86,7 +85,7 @@ public async Task Permits_global_wildcard_in_Accept_headers()
8685
};
8786

8887
// Act
89-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
88+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
9089

9190
// Assert
9291
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -105,7 +104,7 @@ public async Task Permits_application_wildcard_in_Accept_headers()
105104
};
106105

107106
// Act
108-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
107+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
109108

110109
// Assert
111110
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -127,7 +126,7 @@ public async Task Permits_JsonApi_without_parameters_in_Accept_headers()
127126
};
128127

129128
// Act
130-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
129+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, acceptHeaders);
131130

132131
// Assert
133132
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -169,8 +168,7 @@ public async Task Permits_JsonApi_with_AtomicOperations_extension_in_Accept_head
169168
};
170169

171170
// Act
172-
(HttpResponseMessage httpResponse, ErrorDocument _) =
173-
await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType, acceptHeaders);
171+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType, acceptHeaders);
174172

175173
// Assert
176174
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task Returns_JsonApi_ContentType_header()
2828
const string route = "/policies";
2929

3030
// Act
31-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
31+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
3232

3333
// Assert
3434
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -61,7 +61,7 @@ public async Task Returns_JsonApi_ContentType_header_with_AtomicOperations_exten
6161
const string route = "/operations";
6262

6363
// Act
64-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
64+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
6565

6666
// Assert
6767
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -123,7 +123,7 @@ public async Task Permits_JsonApi_ContentType_header()
123123

124124
// Act
125125
// ReSharper disable once RedundantArgumentDefaultValue
126-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType);
126+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType);
127127

128128
// Assert
129129
httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
@@ -156,7 +156,7 @@ public async Task Permits_JsonApi_ContentType_header_with_AtomicOperations_exten
156156
const string contentType = HeaderConstants.AtomicOperationsMediaType;
157157

158158
// Act
159-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType);
159+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<ErrorDocument>(route, requestBody, contentType);
160160

161161
// Assert
162162
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Logging/LoggingTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public async Task Logs_request_body_at_Trace_level()
6767
const string route = "/auditEntries";
6868

6969
// Act
70-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
70+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
7171

7272
// Assert
7373
httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
@@ -89,7 +89,7 @@ public async Task Logs_response_body_at_Trace_level()
8989
const string route = "/auditEntries";
9090

9191
// Act
92-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteGetAsync<string>(route);
92+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
9393

9494
// Assert
9595
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -113,7 +113,7 @@ public async Task Logs_invalid_request_body_error_at_Information_level()
113113
const string route = "/auditEntries";
114114

115115
// Act
116-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
116+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
117117

118118
// Assert
119119
httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
679679
string route = $"/blogs/{blog.StringId}/posts?include=author,comments";
680680

681681
// Act
682-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
682+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
683683

684684
// Assert
685685
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public async Task Can_use_positive_page_number()
7777
const string route = "/blogs?page[number]=20";
7878

7979
// Act
80-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
80+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
8181

8282
// Assert
8383
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -135,7 +135,7 @@ public async Task Can_use_zero_page_size()
135135
const string route = "/blogs?page[size]=0";
136136

137137
// Act
138-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
138+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
139139

140140
// Assert
141141
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -148,7 +148,7 @@ public async Task Can_use_positive_page_size()
148148
const string route = "/blogs?page[size]=50";
149149

150150
// Act
151-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
151+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
152152

153153
// Assert
154154
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task Can_use_page_number_below_maximum()
3636
string route = "/blogs?page[number]=" + pageNumber;
3737

3838
// Act
39-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
39+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
4040

4141
// Assert
4242
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -50,7 +50,7 @@ public async Task Can_use_page_number_equal_to_maximum()
5050
string route = "/blogs?page[number]=" + pageNumber;
5151

5252
// Act
53-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
53+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
5454

5555
// Assert
5656
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -107,7 +107,7 @@ public async Task Can_use_page_size_below_maximum()
107107
string route = "/blogs?page[size]=" + pageSize;
108108

109109
// Act
110-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecuteGetAsync<ErrorDocument>(route);
110+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<ErrorDocument>(route);
111111

112112
// Assert
113113
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -121,7 +121,7 @@ public async Task Can_use_page_size_equal_to_maximum()
121121
string route = "/blogs?page[size]=" + pageSize;
122122

123123
// Act
124-
(HttpResponseMessage httpResponse, ErrorDocument _) = await _testContext.ExecuteGetAsync<ErrorDocument>(route);
124+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<ErrorDocument>(route);
125125

126126
// Assert
127127
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/QueryStringTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task Can_use_unknown_query_string_parameter()
5757
const string route = "/calendars?foo=bar";
5858

5959
// Act
60-
(HttpResponseMessage httpResponse, Document _) = await _testContext.ExecuteGetAsync<Document>(route);
60+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
6161

6262
// Assert
6363
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/HttpReadOnlyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task Can_get_resources()
2626
const string route = "/beds";
2727

2828
// Act
29-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteGetAsync<string>(route);
29+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
3030

3131
// Assert
3232
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/NoHttpDeleteTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task Can_get_resources()
2626
const string route = "/sofas";
2727

2828
// Act
29-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteGetAsync<string>(route);
29+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
3030

3131
// Assert
3232
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -50,7 +50,7 @@ public async Task Can_create_resource()
5050
const string route = "/sofas";
5151

5252
// Act
53-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
53+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
5454

5555
// Assert
5656
httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
@@ -83,7 +83,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8383
string route = "/sofas/" + existingSofa.StringId;
8484

8585
// Act
86-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
86+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
8787

8888
// Assert
8989
httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/NoHttpPatchTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task Can_get_resources()
2626
const string route = "/chairs";
2727

2828
// Act
29-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteGetAsync<string>(route);
29+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
3030

3131
// Assert
3232
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -50,7 +50,7 @@ public async Task Can_create_resource()
5050
const string route = "/chairs";
5151

5252
// Act
53-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
53+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
5454

5555
// Assert
5656
httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
@@ -111,7 +111,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
111111
string route = "/chairs/" + existingChair.StringId;
112112

113113
// Act
114-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteDeleteAsync<string>(route);
114+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
115115

116116
// Assert
117117
httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);

test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/NoHttpPostTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task Can_get_resources()
2626
const string route = "/tables";
2727

2828
// Act
29-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteGetAsync<string>(route);
29+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
3030

3131
// Assert
3232
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
@@ -90,7 +90,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
9090
string route = "/tables/" + existingTable.StringId;
9191

9292
// Act
93-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
93+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
9494

9595
// Assert
9696
httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
@@ -111,7 +111,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
111111
string route = "/tables/" + existingTable.StringId;
112112

113113
// Act
114-
(HttpResponseMessage httpResponse, string _) = await _testContext.ExecuteDeleteAsync<string>(route);
114+
(HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
115115

116116
// Assert
117117
httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);

0 commit comments

Comments
 (0)