More cleanuo

Author: alexeyzimarev

src/RestSharp.Serializers.NewtonsoftJson/RestRequestExtensions.cs

@@ -6,6 +6,6 @@
     <ProjectReference Include="..\RestSharp\RestSharp.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Using Include="Newtonsoft.Json"/>
+    <Using Include="Newtonsoft.Json" />
   </ItemGroup>
 </Project>

src/RestSharp.Serializers.NewtonsoftJson/RestSharp.Serializers.NewtonsoftJson.csproj

@@ -7,5 +7,5 @@ public abstract class AuthenticatorBase : IAuthenticator {
 
     protected abstract Parameter GetAuthenticationParameter(string accessToken);
 
-    public void Authenticate(IRestClient client, IRestRequest request) => request.AddOrUpdateParameter(GetAuthenticationParameter(Token));
+    public void Authenticate(RestClient client, IRestRequest request) => request.AddOrUpdateParameter(GetAuthenticationParameter(Token));
 }

src/RestSharp/Authenticators/AuthenticatorBase.cs

@@ -1,5 +1,5 @@
 namespace RestSharp.Authenticators;
 
 public interface IAuthenticator {
-    void Authenticate(IRestClient client, IRestRequest request);
+    void Authenticate(RestClient client, IRestRequest request);
 }

src/RestSharp/Authenticators/IAuthenticator.cs

@@ -20,6 +20,6 @@ public void SetBearerToken(string accessToken) {
         _authHeader = $"Bearer {accessToken}";
     }
 
-    public void Authenticate(IRestClient client, IRestRequest request)
+    public void Authenticate(RestClient client, IRestRequest request)
         => request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
 }

src/RestSharp/Authenticators/JwtAuthenticator.cs

@@ -39,7 +39,7 @@ public class OAuth1Authenticator : IAuthenticator {
 
     internal virtual string ClientPassword { get; set; }
 
-    public void Authenticate(IRestClient client, IRestRequest request) {
+    public void Authenticate(RestClient client, IRestRequest request) {
         var workflow = new OAuthWorkflow {
             ConsumerKey        = ConsumerKey,
             ConsumerSecret     = ConsumerSecret,
@@ -219,7 +219,7 @@ public static OAuth1Authenticator ForProtectedResource(
             TokenSecret        = accessTokenSecret
         };
 
-    void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflow workflow) {
+    void AddOAuthData(RestClient client, IRestRequest request, OAuthWorkflow workflow) {
         var requestUrl = client.BuildUriWithoutQueryParameters(request);
 
         if (requestUrl.Contains('?'))
@@ -249,7 +249,7 @@ void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflow workfl
                 ? x => BaseQuery(x) && x.Name.StartsWith("oauth_")
                 : (Func<Parameter, bool>)BaseQuery;
 
-        parameters.AddRange(client.DefaultParameters.Where(query).ToWebParameters());
+        parameters.AddRange(client.Options.DefaultParameters.Where(query).ToWebParameters());
         parameters.AddRange(request.Parameters.Where(query).ToWebParameters());
 
         if (Type == OAuthType.RequestToken)

src/RestSharp/Authenticators/NtlmAuthenticator.cs

@@ -149,7 +149,7 @@ HttpWebRequest ConfigureWebRequest(string method, Uri url) {
         if (ClientCertificates != null)
             webRequest.ClientCertificates.AddRange(ClientCertificates);
 
-        AllowedDecompressionMethods.ForEach(x => webRequest.AutomaticDecompression |= x);
+        // AllowedDecompressionMethods.ForEach(x => webRequest.AutomaticDecompression |= x);
 
         if (AutomaticDecompression)
             webRequest.AutomaticDecompression =

src/RestSharp/Authenticators/OAuth/OAuth1Authenticator.cs

@@ -136,7 +136,7 @@ static void AddRange(HttpWebRequest r, string range) {
 
     public bool UseDefaultCredentials { get; set; }
 
-    public string ConnectionGroupName { get; set; } = null!;
+    // public string ConnectionGroupName { get; set; } = null!;
 
     public Encoding Encoding { get; set; } = Encoding.UTF8;
 
@@ -156,7 +156,7 @@ static void AddRange(HttpWebRequest r, string range) {
 
     public string? Host { get; set; }
 
-    public IList<DecompressionMethods> AllowedDecompressionMethods { get; set; } = null!;
+    // public IList<DecompressionMethods> AllowedDecompressionMethods { get; set; } = null!;
 
     public bool PreAuthenticate { get; set; }