@@ -33,6 +33,7 @@ namespace RestSharp;
33
33
/// <summary>
34
34
/// Client to translate RestRequests into Http requests and process response result
35
35
/// </summary>
36
+ // ReSharper disable once ClassWithVirtualMembersNeverInherited.Global
36
37
public partial class RestClient : IRestClient {
37
38
/// <summary>
38
39
/// Content types that will be sent in the Accept header. The list is populated from the known serializers.
@@ -55,11 +56,6 @@ public string[] AcceptedContentTypes {
55
56
/// <inheritdoc/>
56
57
public DefaultParameters DefaultParameters { get ; }
57
58
58
- [ Obsolete ( "Use RestClientOptions.Authenticator instead" ) ]
59
- public IAuthenticator ? Authenticator => Options . Authenticator ;
60
-
61
- // set => Options.Authenticator = value;
62
-
63
59
/// <summary>
64
60
/// Creates an instance of RestClient using the provided <see cref="RestClientOptions"/>
65
61
/// </summary>
@@ -226,7 +222,6 @@ public RestClient(
226
222
: this ( new HttpClient ( handler , disposeHandler ) , true , configureRestClient , configureSerialization ) { }
227
223
228
224
static void ConfigureHttpClient ( HttpClient httpClient , RestClientOptions options ) {
229
-
230
225
// We will use Options.Timeout in ExecuteAsInternalAsync method
231
226
httpClient . Timeout = Timeout . InfiniteTimeSpan ;
232
227
@@ -259,6 +254,7 @@ static void ConfigureHttpMessageHandler(HttpClientHandler handler, RestClientOpt
259
254
handler . AllowAutoRedirect = options . FollowRedirects ;
260
255
261
256
#if NET
257
+ // ReSharper disable once InvertIf
262
258
if ( ! OperatingSystem . IsBrowser ( ) && ! OperatingSystem . IsIOS ( ) && ! OperatingSystem . IsTvOS ( ) ) {
263
259
#endif
264
260
if ( handler . SupportsProxy ) handler . Proxy = options . Proxy ;
@@ -278,12 +274,12 @@ void ConfigureSerializers(ConfigureSerialization? configureSerialization) {
278
274
}
279
275
280
276
void ConfigureDefaultParameters ( RestClientOptions options ) {
281
- if ( options . UserAgent != null ) {
282
- if ( ! options . AllowMultipleDefaultParametersWithSameName
283
- && DefaultParameters . Any ( parameter => parameter . Type == ParameterType . HttpHeader && parameter . Name == KnownHeaders . UserAgent ) )
284
- DefaultParameters . RemoveParameter ( KnownHeaders . UserAgent , ParameterType . HttpHeader ) ;
285
- DefaultParameters . AddParameter ( Parameter . CreateParameter ( KnownHeaders . UserAgent , options . UserAgent , ParameterType . HttpHeader ) ) ;
286
- }
277
+ if ( options . UserAgent == null ) return ;
278
+
279
+ if ( ! options . AllowMultipleDefaultParametersWithSameName
280
+ && DefaultParameters . Any ( parameter => parameter . Type == ParameterType . HttpHeader && parameter . Name == KnownHeaders . UserAgent ) )
281
+ DefaultParameters . RemoveParameter ( KnownHeaders . UserAgent , ParameterType . HttpHeader ) ;
282
+ DefaultParameters . AddParameter ( Parameter . CreateParameter ( KnownHeaders . UserAgent , options . UserAgent , ParameterType . HttpHeader ) ) ;
287
283
}
288
284
289
285
readonly bool _disposeHttpClient ;
0 commit comments