Skip to content

Commit a1bf71b

Browse files
alexeyzimarevalexeyzimarev
committed
Replacement for #1817 
1 parent d3e1334 commit a1bf71b

File tree

6 files changed

+67
-62
lines changed

6 files changed

+67
-62
lines changed

‎src/RestSharp/Parameters/Parameter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public abstract record Parameter(string? Name, object? Value, ParameterType Type
3030
public override string ToString() => $"{Name}={Value}";
3131

3232
public static Parameter CreateParameter(string? name, object? value, ParameterType type, bool encode = true)
33+
// ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault
3334
=> type switch {
3435
ParameterType.GetOrPost => new GetOrPostParameter(name!, value?.ToString(), encode),
3536
ParameterType.UrlSegment => new UrlSegmentParameter(name!, value?.ToString()!, encode),
3637
ParameterType.HttpHeader => new HeaderParameter(name, value?.ToString()),
37-
ParameterType.RequestBody => new BodyParameter(name, value!, Serializers.ContentType.Plain),
3838
ParameterType.QueryString => new QueryParameter(name!, value?.ToString(), encode),
3939
_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
4040
};

‎src/RestSharp/Request/RestRequest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ public Func<HttpResponseMessage, RestResponse>? AdvancedResponseWriter {
193193
/// Removes a parameter object from the request parameters
194194
/// </summary>
195195
/// <param name="parameter">Parameter to remove</param>
196-
public void RemoveParameter(Parameter parameter) => Parameters.RemoveParameter(parameter);
196+
public RestRequest RemoveParameter(Parameter parameter) {
197+
Parameters.RemoveParameter(parameter);
198+
return this;
199+
}
197200

198201
internal RestRequest AddFile(FileParameter file) => this.With(x => x._files.Add(file));
199202
}

‎src/RestSharp/Request/RestRequestExtensions.cs‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ public static RestRequest AddOrUpdateHeaders(this RestRequest request, ICollecti
204204
/// <param name="encode">Encode the value or not, default true</param>
205205
/// <returns></returns>
206206
public static RestRequest AddParameter(this RestRequest request, string? name, object value, ParameterType type, bool encode = true)
207-
=> request.AddParameter(Parameter.CreateParameter(name, value, type, encode));
207+
=> type == ParameterType.RequestBody
208+
? request.AddBody(value, name)
209+
: request.AddParameter(Parameter.CreateParameter(name, value, type, encode));
208210

209211
/// <summary>
210212
/// Adds or updates request parameter of a given type. It will create a typed parameter instance based on the type argument.
@@ -218,8 +220,12 @@ public static RestRequest AddParameter(this RestRequest request, string? name, o
218220
/// <param name="type">Enum value specifying what kind of parameter is being added</param>
219221
/// <param name="encode">Encode the value or not, default true</param>
220222
/// <returns></returns>
221-
public static RestRequest AddOrUpdateParameter(this RestRequest request, string name, object value, ParameterType type, bool encode = true)
222-
=> request.AddOrUpdateParameter(Parameter.CreateParameter(name, value, type, encode));
223+
public static RestRequest AddOrUpdateParameter(this RestRequest request, string name, object value, ParameterType type, bool encode = true) {
224+
request.RemoveParameter(name, type);
225+
return type == ParameterType.RequestBody
226+
? request.AddBody(value, name)
227+
: request.AddOrUpdateParameter(Parameter.CreateParameter(name, value, type, encode));
228+
}
223229

224230
/// <summary>
225231
/// Adds or updates request parameter, given the parameter instance, for example <see cref="QueryParameter"/> or <see cref="UrlSegmentParameter"/>.
@@ -228,13 +234,12 @@ public static RestRequest AddOrUpdateParameter(this RestRequest request, string
228234
/// <param name="request">Request instance</param>
229235
/// <param name="parameter">Parameter instance</param>
230236
/// <returns></returns>
231-
public static RestRequest AddOrUpdateParameter(this RestRequest request, Parameter parameter) {
232-
var p = request.Parameters.FirstOrDefault(x => x.Name == parameter.Name && x.Type == parameter.Type);
233-
234-
if (p != null) request.RemoveParameter(p);
237+
public static RestRequest AddOrUpdateParameter(this RestRequest request, Parameter parameter)
238+
=> request.RemoveParameter(parameter.Name, parameter.Type).AddParameter(parameter);
235239

236-
request.AddParameter(parameter);
237-
return request;
240+
static RestRequest RemoveParameter(this RestRequest request, string? name, ParameterType type) {
241+
var p = request.Parameters.FirstOrDefault(x => x.Name == name && x.Type == type);
242+
return p != null ? request.RemoveParameter(p) : request;
238243
}
239244

240245
/// <summary>
@@ -245,8 +250,7 @@ public static RestRequest AddOrUpdateParameter(this RestRequest request, Paramet
245250
/// <param name="parameters">Collection of parameter instances</param>
246251
/// <returns></returns>
247252
public static RestRequest AddOrUpdateParameters(this RestRequest request, IEnumerable<Parameter> parameters) {
248-
foreach (var parameter in parameters)
249-
request.AddOrUpdateParameter(parameter);
253+
foreach (var parameter in parameters) request.AddOrUpdateParameter(parameter);
250254

251255
return request;
252256
}
@@ -304,15 +308,15 @@ public static RestRequest AddFile(
304308
public static RestRequest AddBody(this RestRequest request, object obj, string? contentType = null) {
305309
if (contentType == null) {
306310
return request.RequestFormat switch {
307-
DataFormat.Json => request.AddJsonBody(obj, contentType ?? ContentType.Json),
308-
DataFormat.Xml => request.AddXmlBody(obj, contentType ?? ContentType.Xml),
309-
DataFormat.Binary => request.AddParameter(new BodyParameter("", obj, contentType ?? ContentType.Binary)),
310-
_ => request.AddParameter(new BodyParameter("", obj.ToString()!, contentType ?? ContentType.Plain))
311+
DataFormat.Json => request.AddJsonBody(obj),
312+
DataFormat.Xml => request.AddXmlBody(obj),
313+
DataFormat.Binary => request.AddParameter(new BodyParameter("", obj, ContentType.Binary)),
314+
_ => request.AddParameter(new BodyParameter("", obj.ToString()!, ContentType.Plain))
311315
};
312316
}
313317

314318
return
315-
obj is string str ? request.AddParameter(new BodyParameter("", str, contentType)) :
319+
obj is string str ? request.AddStringBody(str, contentType) :
316320
obj is byte[] bytes ? request.AddParameter(new BodyParameter("", bytes, contentType, DataFormat.Binary)) :
317321
contentType.Contains("xml") ? request.AddXmlBody(obj, contentType) :
318322
contentType.Contains("json") ? request.AddJsonBody(obj, contentType) :
@@ -352,7 +356,7 @@ public static RestRequest AddStringBody(this RestRequest request, string body, s
352356
/// <returns></returns>
353357
public static RestRequest AddJsonBody<T>(this RestRequest request, T obj, string contentType = ContentType.Json) where T : class {
354358
request.RequestFormat = DataFormat.Json;
355-
return request.AddParameter(new JsonParameter("", obj, contentType));
359+
return obj is string str ? request.AddStringBody(str, DataFormat.Json) : request.AddParameter(new JsonParameter("", obj, contentType));
356360
}
357361

358362
/// <summary>
@@ -366,8 +370,10 @@ public static RestRequest AddJsonBody<T>(this RestRequest request, T obj, string
366370
public static RestRequest AddXmlBody<T>(this RestRequest request, T obj, string contentType = ContentType.Xml, string xmlNamespace = "")
367371
where T : class {
368372
request.RequestFormat = DataFormat.Xml;
369-
request.AddParameter(new XmlParameter("", obj, xmlNamespace, contentType));
370-
return request;
373+
374+
return obj is string str
375+
? request.AddStringBody(str, DataFormat.Xml)
376+
: request.AddParameter(new XmlParameter("", obj, xmlNamespace, contentType));
371377
}
372378

373379
/// <summary>
@@ -401,7 +407,6 @@ static void CheckAndThrowsDuplicateKeys(ICollection<KeyValuePair<string, string>
401407
.Select(group => group.Key)
402408
.ToList();
403409

404-
if (duplicateKeys.Any())
405-
throw new ArgumentException($"Duplicate header names exist: {string.Join(", ", duplicateKeys)}");
410+
if (duplicateKeys.Any()) throw new ArgumentException($"Duplicate header names exist: {string.Join(", ", duplicateKeys)}");
406411
}
407-
}
412+
}

‎src/RestSharp/RestClient.Async.cs‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async Task<RestResponse> ExecuteAsync(RestRequest request, CancellationTo
4242
response.Request = request;
4343
response.Request.IncreaseNumAttempts();
4444

45-
return Options.ThrowOnAnyError ? ThrowIfError(response) : response;
45+
return Options.ThrowOnAnyError ? response.ThrowIfError() : response;
4646
}
4747

4848
async Task<InternalResponse> ExecuteInternal(RestRequest request, CancellationToken cancellationToken) {
@@ -130,13 +130,6 @@ static RestResponse AddError(RestResponse response, Exception exception, Cancell
130130
bool TimedOut() => timeoutToken.IsCancellationRequested || exception.Message.Contains("HttpClient.Timeout");
131131
}
132132

133-
internal static RestResponse ThrowIfError(RestResponse response) {
134-
var exception = response.GetException();
135-
if (exception != null) throw exception;
136-
137-
return response;
138-
}
139-
140133
static HttpMethod AsHttpMethod(Method method)
141134
=> method switch {
142135
Method.Get => HttpMethod.Get,
@@ -155,4 +148,20 @@ static HttpMethod AsHttpMethod(Method method)
155148
Method.Search => new HttpMethod("SEARCH"),
156149
_ => throw new ArgumentOutOfRangeException()
157150
};
151+
}
152+
153+
public static class ResponseThrowExtension {
154+
public static RestResponse ThrowIfError(this RestResponse response) {
155+
var exception = response.GetException();
156+
if (exception != null) throw exception;
157+
158+
return response;
159+
}
160+
161+
public static RestResponse<T> ThrowIfError<T>(this RestResponse<T> response) {
162+
var exception = response.GetException();
163+
if (exception != null) throw exception;
164+
165+
return response;
166+
}
158167
}

‎src/RestSharp/RestClientExtensions.Params.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ public static RestClient AddDefaultParameter(this RestClient client, string name
4040
/// <param name="value">Value of the parameter</param>
4141
/// <param name="type">The type of parameter to add</param>
4242
/// <returns>This request</returns>
43-
public static RestClient AddDefaultParameter(this RestClient client, string name, object value, ParameterType type)
44-
=> client.AddDefaultParameter(Parameter.CreateParameter(name, value, type));
43+
public static RestClient AddDefaultParameter(this RestClient client, string name, object value, ParameterType type) {
44+
if (type == ParameterType.RequestBody) throw new ArgumentException("Default parameter cannot be Body", nameof(type));
45+
return client.AddDefaultParameter(Parameter.CreateParameter(name, value, type));
46+
}
4547

4648
/// <summary>
4749
/// Adds a default header to the RestClient. Used on every request made by this client instance.

‎src/RestSharp/RestClientExtensions.cs‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,12 @@ public static Task<RestResponse<T>> ExecuteAsync<T>(
160160
/// <returns></returns>
161161
public static async Task<T?> GetAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
162162
var response = await client.ExecuteGetAsync<T>(request, cancellationToken).ConfigureAwait(false);
163-
RestClient.ThrowIfError(response);
164-
return response.Data;
163+
return response.ThrowIfError().Data;
165164
}
166165

167166
public static async Task<RestResponse> GetAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
168167
var response = await client.ExecuteGetAsync(request, cancellationToken).ConfigureAwait(false);
169-
RestClient.ThrowIfError(response);
170-
return response;
168+
return response.ThrowIfError();
171169
}
172170

173171
/// <summary>
@@ -181,17 +179,15 @@ public static async Task<RestResponse> GetAsync(this RestClient client, RestRequ
181179
/// <returns></returns>
182180
public static async Task<T?> PostAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
183181
var response = await client.ExecutePostAsync<T>(request, cancellationToken).ConfigureAwait(false);
184-
RestClient.ThrowIfError(response);
185-
return response.Data;
182+
return response.ThrowIfError().Data;
186183
}
187184

188185
public static RestResponse Post(this RestClient client, RestRequest request)
189186
=> AsyncHelpers.RunSync(() => client.PostAsync(request));
190187

191188
public static async Task<RestResponse> PostAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
192189
var response = await client.ExecutePostAsync(request, cancellationToken).ConfigureAwait(false);
193-
RestClient.ThrowIfError(response);
194-
return response;
190+
return response.ThrowIfError();
195191
}
196192

197193
/// <summary>
@@ -205,14 +201,12 @@ public static async Task<RestResponse> PostAsync(this RestClient client, RestReq
205201
/// <returns></returns>
206202
public static async Task<T?> PutAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
207203
var response = await client.ExecuteAsync<T>(request, Method.Put, cancellationToken).ConfigureAwait(false);
208-
RestClient.ThrowIfError(response);
209-
return response.Data;
204+
return response.ThrowIfError().Data;
210205
}
211206

212207
public static async Task<RestResponse> PutAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
213208
var response = await client.ExecuteAsync(request, Method.Put, cancellationToken).ConfigureAwait(false);
214-
RestClient.ThrowIfError(response);
215-
return response;
209+
return response.ThrowIfError();
216210
}
217211

218212
/// <summary>
@@ -226,14 +220,12 @@ public static async Task<RestResponse> PutAsync(this RestClient client, RestRequ
226220
/// <returns></returns>
227221
public static async Task<T?> HeadAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
228222
var response = await client.ExecuteAsync<T>(request, Method.Head, cancellationToken).ConfigureAwait(false);
229-
RestClient.ThrowIfError(response);
230-
return response.Data;
223+
return response.ThrowIfError().Data;
231224
}
232225

233226
public static async Task<RestResponse> HeadAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
234227
var response = await client.ExecuteAsync(request, Method.Head, cancellationToken).ConfigureAwait(false);
235-
RestClient.ThrowIfError(response);
236-
return response;
228+
return response.ThrowIfError();
237229
}
238230

239231
/// <summary>
@@ -247,14 +239,12 @@ public static async Task<RestResponse> HeadAsync(this RestClient client, RestReq
247239
/// <returns></returns>
248240
public static async Task<T?> OptionsAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
249241
var response = await client.ExecuteAsync<T>(request, Method.Options, cancellationToken).ConfigureAwait(false);
250-
RestClient.ThrowIfError(response);
251-
return response.Data;
242+
return response.ThrowIfError().Data;
252243
}
253244

254245
public static async Task<RestResponse> OptionsAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
255246
var response = await client.ExecuteAsync(request, Method.Options, cancellationToken).ConfigureAwait(false);
256-
RestClient.ThrowIfError(response);
257-
return response;
247+
return response.ThrowIfError();
258248
}
259249

260250
/// <summary>
@@ -268,14 +258,12 @@ public static async Task<RestResponse> OptionsAsync(this RestClient client, Rest
268258
/// <returns></returns>
269259
public static async Task<T?> PatchAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
270260
var response = await client.ExecuteAsync<T>(request, Method.Patch, cancellationToken).ConfigureAwait(false);
271-
RestClient.ThrowIfError(response);
272-
return response.Data;
261+
return response.ThrowIfError().Data;
273262
}
274263

275264
public static async Task<RestResponse> PatchAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
276265
var response = await client.ExecuteAsync(request, Method.Patch, cancellationToken).ConfigureAwait(false);
277-
RestClient.ThrowIfError(response);
278-
return response;
266+
return response.ThrowIfError();
279267
}
280268

281269
/// <summary>
@@ -289,14 +277,12 @@ public static async Task<RestResponse> PatchAsync(this RestClient client, RestRe
289277
/// <returns></returns>
290278
public static async Task<T?> DeleteAsync<T>(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
291279
var response = await client.ExecuteAsync<T>(request, Method.Delete, cancellationToken).ConfigureAwait(false);
292-
RestClient.ThrowIfError(response);
293-
return response.Data;
280+
return response.ThrowIfError().Data;
294281
}
295282

296283
public static async Task<RestResponse> DeleteAsync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) {
297284
var response = await client.ExecuteAsync(request, Method.Delete, cancellationToken).ConfigureAwait(false);
298-
RestClient.ThrowIfError(response);
299-
return response;
285+
return response.ThrowIfError();
300286
}
301287

302288
/// <summary>

0 commit comments

Comments
 (0)