Removed unnecessary abstraction

Author: alexeyzimarev

RestSharp.Tests/RequestConfiguratorTests.cs

@@ -0,0 +1,23 @@
+using NUnit.Framework;
+
+namespace RestSharp.Tests
+{
+    [TestFixture]
+    public class RequestConfiguratorTests
+    {
+        [Test]
+        public void ConfiguresTheHttpProtocolVersion()
+        {
+            bool executed = false;
+            
+            var restClient = new RestClient("http://localhost");
+            restClient.ConfigureWebRequest(r => executed = true);
+            
+            var req = new RestRequest("bob", Method.GET);
+
+            restClient.Execute(req);
+            
+            Assert.IsTrue(executed);
+        }
+    }
+}

RestSharp/Http.cs

@@ -33,7 +33,7 @@ namespace RestSharp
     /// <summary>
     ///     HttpWebRequest wrapper
     /// </summary>
-    public partial class Http : IHttp, IHttpFactory
+    public partial class Http : IHttp
     {
         private const string LINE_BREAK = "\r\n";
 
@@ -233,10 +233,7 @@ public Http()
         ///     Creates an IHttp
         /// </summary>
         /// <returns></returns>
-        public IHttp Create()
-        {
-            return new Http();
-        }
+        public static IHttp Create() => new Http();
 
         protected virtual HttpWebRequest CreateWebRequest(Uri url)
         {

RestSharp/IHttpFactory.cs

@@ -326,10 +326,8 @@ private RestRequestAsyncHandle ExecuteAsync(IRestRequest request,
             Action<IRestResponse, RestRequestAsyncHandle> callback, string httpMethod,
             Func<IHttp, Action<HttpResponse>, string, HttpWebRequest> getWebRequest)
         {
-            var http = HttpFactory.Create();
-
             AuthenticateIfNeeded(this, request);
-            ConfigureHttp(request, http);
+            var http = ConfigureHttp(request);
 
             var asyncHandle = new RestRequestAsyncHandle();
             Action<HttpResponse> responseCb = r => ProcessResponse(request, r, asyncHandle, callback);

RestSharp/RestClient.Async.cs

@@ -95,9 +95,7 @@ private IRestResponse Execute(IRestRequest request, string httpMethod,
 
             try
             {
-                var http = HttpFactory.Create();
-
-                ConfigureHttp(request, http);
+                var http = ConfigureHttp(request);
 
                 response = ConvertToRestResponse(request, getResponse(http, httpMethod));
                 response.Request = request;

RestSharp/RestClient.Sync.cs

@@ -45,8 +45,6 @@ public partial class RestClient : IRestClient
         private static readonly Regex StructuredSyntaxSuffixWildcardRegex =
             new Regex(@"^\*\+\w+$", RegexOptions.Compiled);
 
-        public IHttpFactory HttpFactory = new SimpleFactory<Http>();
-
         /// <summary>
         ///     Default constructor that registers default content handlers
         /// </summary>
@@ -421,8 +419,10 @@ private static string EncodeParameter(Parameter parameter, Encoding encoding) =>
         private static readonly ParameterType[] MultiParameterTypes =
             {ParameterType.QueryString, ParameterType.GetOrPost};
 
-        private void ConfigureHttp(IRestRequest request, IHttp http)
+        private IHttp ConfigureHttp(IRestRequest request)
         {
+            var http = Http.Create();
+            
             http.Encoding = Encoding;
             http.AlwaysMultipartFormData = request.AlwaysMultipartFormData;
             http.UseDefaultCredentials = request.UseDefaultCredentials;
@@ -488,7 +488,7 @@ private void ConfigureHttp(IRestRequest request, IHttp http)
             http.MaxRedirects = MaxRedirects;
             http.CachePolicy = CachePolicy;
             http.Pipelined = Pipelined;
-
+            
             if (request.Credentials != null)
                 http.Credentials = request.Credentials;
 
@@ -579,6 +579,8 @@ private void ConfigureHttp(IRestRequest request, IHttp http)
 #endif
 
             http.RemoteCertificateValidationCallback = RemoteCertificateValidationCallback;
+
+            return http;
         }
 
         private static RestResponse ConvertToRestResponse(IRestRequest request, HttpResponse httpResponse)

RestSharp/RestClient.cs

@@ -31,6 +31,11 @@ namespace RestSharp
     /// </summary>
     public class RestRequest : IRestRequest
     {
+        /// <summary>
+        ///     Local list of Allowed Decompresison Methods
+        /// </summary>
+        private readonly IList<DecompressionMethods> alloweDecompressionMethods;
+
         /// <summary>
         ///     Default constructor
         /// </summary>
@@ -96,25 +101,20 @@ public RestRequest(Uri resource, Method method)
             //resource.PathAndQuery not supported by Silverlight :(
         }
 
-        /// <summary>
-        /// Local list of Allowed Decompresison Methods
-        /// </summary>
-        private readonly IList<DecompressionMethods> alloweDecompressionMethods;
-        
-        /// <summary>
-        /// List of Allowed Decompresison Methods
-        /// </summary>
-        public IList<DecompressionMethods> AllowedDecompressionMethods => 
-            alloweDecompressionMethods.Any() 
-                ? alloweDecompressionMethods 
-                : new[] { DecompressionMethods.None, DecompressionMethods.Deflate, DecompressionMethods.GZip };
-
         /// <summary>
         ///     Gets or sets a user-defined state object that contains information about a request and which can be later
         ///     retrieved when the request completes.
         /// </summary>
         public object UserState { get; set; }
 
+        /// <summary>
+        ///     List of Allowed Decompresison Methods
+        /// </summary>
+        public IList<DecompressionMethods> AllowedDecompressionMethods =>
+            alloweDecompressionMethods.Any()
+                ? alloweDecompressionMethods
+                : new[] {DecompressionMethods.None, DecompressionMethods.Deflate, DecompressionMethods.GZip};
+
         /// <summary>
         ///     Always send a multipart/form-data request - even when no Files are present.
         /// </summary>
@@ -465,7 +465,8 @@ public IRestRequest AddParameter(string name, object value, string contentType,
         }
 
         /// <summary>
-        /// Adds a parameter to the request or updates it with the given argument, if the parameter already exists in the request 
+        ///     Adds a parameter to the request or updates it with the given argument, if the parameter already exists in the
+        ///     request
         /// </summary>
         /// <param name="p">Parameter to add</param>
         /// <returns></returns>
@@ -483,8 +484,9 @@ public IRestRequest AddOrUpdateParameter(Parameter p)
         }
 
         /// <summary>
-        /// Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the request 
-        /// (QueryString for GET, DELETE, OPTIONS and HEAD; Encoded form for POST and PUT)
+        ///     Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the
+        ///     request
+        ///     (QueryString for GET, DELETE, OPTIONS and HEAD; Encoded form for POST and PUT)
         /// </summary>
         /// <param name="name">Name of the parameter</param>
         /// <param name="value">Value of the parameter</param>
@@ -499,33 +501,37 @@ public IRestRequest AddOrUpdateParameter(string name, object value)
             });
         }
 
+        /// <inheritdoc />
         /// <summary>
-        /// Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the request 
-        /// - GetOrPost: Either a QueryString value or encoded form value based on method
-        /// - HttpHeader: Adds the name/value pair to the HTTP request's Headers collection
-        /// - UrlSegment: Inserted into URL if there is a matching url token e.g. {AccountId}
-        /// - RequestBody: Used by AddBody() (not recommended to use directly)
+        ///     Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the
+        ///     request
+        ///     - GetOrPost: Either a QueryString value or encoded form value based on method
+        ///     - HttpHeader: Adds the name/value pair to the HTTP request's Headers collection
+        ///     - UrlSegment: Inserted into URL if there is a matching url token e.g. {AccountId}
+        ///     - RequestBody: Used by AddBody() (not recommended to use directly)
         /// </summary>
         /// <param name="name">Name of the parameter</param>
         /// <param name="value">Value of the parameter</param>
         /// <param name="type">The type of parameter to add</param>
         /// <returns>This request</returns>
         public IRestRequest AddOrUpdateParameter(string name, object value, ParameterType type)
         {
-            return AddOrUpdateParameter(new Parameter
-            {
-                Name = name,
-                Value = value,
-                Type = type
-            });
+            return AddOrUpdateParameter(
+                new Parameter
+                {
+                    Name = name,
+                    Value = value,
+                    Type = type
+                });
         }
 
         /// <summary>
-        /// Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the request 
-        /// - GetOrPost: Either a QueryString value or encoded form value based on method
-        /// - HttpHeader: Adds the name/value pair to the HTTP request's Headers collection
-        /// - UrlSegment: Inserted into URL if there is a matching url token e.g. {AccountId}
-        /// - RequestBody: Used by AddBody() (not recommended to use directly)
+        ///     Adds a HTTP parameter to the request or updates it with the given argument, if the parameter already exists in the
+        ///     request
+        ///     - GetOrPost: Either a QueryString value or encoded form value based on method
+        ///     - HttpHeader: Adds the name/value pair to the HTTP request's Headers collection
+        ///     - UrlSegment: Inserted into URL if there is a matching url token e.g. {AccountId}
+        ///     - RequestBody: Used by AddBody() (not recommended to use directly)
         /// </summary>
         /// <param name="name">Name of the parameter</param>
         /// <param name="value">Value of the parameter</param>
@@ -543,6 +549,7 @@ public IRestRequest AddOrUpdateParameter(string name, object value, string conte
             });
         }
 
+        /// <inheritdoc />
         /// <summary>
         ///     Shortcut to AddParameter(name, value, HttpHeader) overload
         /// </summary>
@@ -552,14 +559,18 @@ public IRestRequest AddOrUpdateParameter(string name, object value, string conte
         public IRestRequest AddHeader(string name, string value)
         {
             const string portSplit = @":\d+";
-            Func<string, bool> invalidHost =
-                host => Uri.CheckHostName(Regex.Split(host, portSplit)[0]) == UriHostNameType.Unknown;
 
-            if (name == "Host" && invalidHost(value))
+            bool InvalidHost(string host)
+            {
+                return Uri.CheckHostName(Regex.Split(host, portSplit)[0]) == UriHostNameType.Unknown;
+            }
+
+            if (name == "Host" && InvalidHost(value))
                 throw new ArgumentException("The specified value is not a valid Host header string.", "value");
             return AddParameter(name, value, ParameterType.HttpHeader);
         }
 
+        /// <inheritdoc />
         /// <summary>
         ///     Shortcut to AddParameter(name, value, Cookie) overload
         /// </summary>
@@ -594,17 +605,15 @@ public IRestRequest AddQueryParameter(string name, string value)
         }
 
         /// <summary>
-        /// Add a Decompression Method to the request
+        ///     Add a Decompression Method to the request
         /// </summary>
         /// <param name="decompressionMethod">None | GZip | Deflate</param>
         /// <returns></returns>
         public IRestRequest AddDecompressionMethod(DecompressionMethods decompressionMethod)
         {
-            if (!this.alloweDecompressionMethods.Contains(decompressionMethod))
-            {
-                this.alloweDecompressionMethods.Add(decompressionMethod);    
-            }
-            
+            if (!alloweDecompressionMethods.Contains(decompressionMethod))
+                alloweDecompressionMethods.Add(decompressionMethod);
+
             return this;
         }