Merge pull request restsharp#850 from andrewchaa/master

AddOrUpdateParameter, convenience method

Author: alexeyzimarev

RestSharp.Tests/UrlBuilderTests.cs

@@ -267,5 +267,36 @@ public void GET_with_Invalid_Url_string_throws_exception()
         {
             Assert.Throws<UriFormatException>(delegate { new RestClient("invalid url"); });
         }
+
+        [Test]
+        public void Should_add_parameter_if_it_is_new()
+        {
+            RestRequest request = new RestRequest();
+
+            request.AddOrUpdateParameter("param2", "value2");
+            request.AddOrUpdateParameter("param3", "value3");
+
+            RestClient client = new RestClient("http://example.com/resource?param1=value1");
+            Uri expected = new Uri("http://example.com/resource?param1=value1&param2=value2&param3=value3");
+            Uri output = client.BuildUri(request);
+
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void Should_update_parameter_if_it_already_exists()
+        {
+            RestRequest request = new RestRequest();
+
+            request.AddOrUpdateParameter("param2", "value2");
+            request.AddOrUpdateParameter("param2", "value2-1");
+
+            RestClient client = new RestClient("http://example.com/resource?param1=value1");
+            Uri expected = new Uri("http://example.com/resource?param1=value1&param2=value2-1");
+            Uri output = client.BuildUri(request);
+
+            Assert.AreEqual(expected, output);
+        }
+
     }
 }

RestSharp/IRestRequest.cs

@@ -276,6 +276,50 @@ public interface IRestRequest
         /// <returns>This request</returns>
         IRestRequest AddParameter(string name, object value, string contentType, ParameterType type);
 
+        /// <summary>
+        /// Add or update the parameter to the request
+        /// </summary>
+        /// <param name="p">Parameter to add</param>
+        /// <returns></returns>
+        IRestRequest AddOrUpdateParameter(Parameter p);
+
+        /// <summary>
+        /// Adds a HTTP parameter to 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>
+        /// <returns>This request</returns>
+        IRestRequest AddOrUpdateParameter(string name, object value);
+
+        /// <summary>
+        /// Adds a parameter to the request. There are five types of parameters:
+        /// - 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}
+        /// - Cookie: Adds the name/value pair to the HTTP request's Cookies collection
+        /// - 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>
+        IRestRequest AddOrUpdateParameter(string name, object value, ParameterType type);
+
+        /// <summary>
+        /// Adds a parameter to the request. There are five types of parameters:
+        /// - 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}
+        /// - Cookie: Adds the name/value pair to the HTTP request's Cookies collection
+        /// - 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="contentType">Content-Type of the parameter</param>
+        /// <param name="type">The type of parameter to add</param>
+        /// <returns>This request</returns>
+        IRestRequest AddOrUpdateParameter(string name, object value, string contentType, ParameterType type);
+
         /// <summary>
         /// Shortcut to AddParameter(name, value, HttpHeader) overload
         /// </summary>

RestSharp/RestRequest.cs

@@ -458,6 +458,53 @@ public IRestRequest AddParameter(string name, object value, string contentType,
                                      });
         }
 
+        public IRestRequest AddOrUpdateParameter(Parameter p)
+        {
+            if (Parameters.Any(param => param.Name == p.Name))
+            {
+                var parameter = this.Parameters.First(param => param.Name == p.Name);
+                parameter.Value = p.Value;
+                return this;
+            }
+
+            this.Parameters.Add(p);
+            return this;
+        }
+
+        public IRestRequest AddOrUpdateParameter(string name, object value)
+        {
+            return this.AddOrUpdateParameter(new Parameter
+            {
+                Name = name,
+                Value = value,
+                Type = ParameterType.GetOrPost
+            });
+
+        }
+
+        public IRestRequest AddOrUpdateParameter(string name, object value, ParameterType type)
+        {
+            return this.AddOrUpdateParameter(new Parameter
+            {
+                Name = name,
+                Value = value,
+                Type = type
+            });
+
+        }
+
+        public IRestRequest AddOrUpdateParameter(string name, object value, string contentType, ParameterType type)
+        {
+            return this.AddOrUpdateParameter(new Parameter
+            {
+                Name = name,
+                Value = value,
+                ContentType = contentType,
+                Type = type
+            });
+
+        }
+
         /// <summary>
         /// Shortcut to AddParameter(name, value, HttpHeader) overload
         /// </summary>