Allow parameter values to be null #1420

Author: alexeyzimarev

src/RestSharp/HttpHeader.cs

@@ -12,6 +12,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License. 
 
+using System;
 using JetBrains.Annotations;
 
 namespace RestSharp
@@ -30,12 +31,20 @@ public class HttpHeader
         public HttpHeader(string name, string value)
         {
             Name  = name;
-            Value = value;
+            Value = value ?? "";
         }
 
+        /// <summary>
+        /// Creates a new instance of HttpHeader with value conversion
+        /// </summary>
+        /// <param name="name">Header name</param>
+        /// <param name="value">Header value, which has to implement ToString() properly</param>
+        public HttpHeader(string name, object value) : this(name, value?.ToString()) { }
+
         /// <summary>
         /// Creates a new instance of HttpHeader. Remember to assign properties!
         /// </summary>
+        [Obsolete("Use parameterized constructor")]
         public HttpHeader() { }
 
         /// <summary>
@@ -48,4 +57,4 @@ public HttpHeader() { }
         /// </summary>
         public string Value { get; set; }
     }
-}
+}

src/RestSharp/HttpParameter.cs

@@ -12,15 +12,43 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License. 
 
+using System;
+using JetBrains.Annotations;
+
 namespace RestSharp
 {
     /// <summary>
     ///     Representation of an HTTP parameter (QueryString or Form value)
     /// </summary>
+    [PublicAPI]
     public class HttpParameter
     {
         /// <summary>
-        ///     Name of the parameter
+        /// Creates a new instance of HttpParameter
+        /// </summary>
+        /// <param name="name">Header name</param>
+        /// <param name="value">Header value</param>
+        /// <param name="contentType">Parameter content type</param>
+        public HttpParameter(string name, string value, string contentType = null)
+        {
+            Name        = name;
+            ContentType = contentType;
+            Value       = value ?? "";
+        }
+
+        /// <summary>
+        /// Creates a new instance of HttpParameter with value conversion
+        /// </summary>
+        /// <param name="name">Header name</param>
+        /// <param name="value">Header value, which has to implement ToString() properly</param>
+        /// <param name="contentType">Parameter content type</param>
+        public HttpParameter(string name, object value, string contentType = null) : this(name, value?.ToString(), contentType) { }
+
+        [Obsolete("Use parameterized constructor")]
+        public HttpParameter() { }
+
+        /// <summary>
+        /// Name of the parameter
         /// </summary>
         public string Name { get; set; }
 
@@ -34,4 +62,4 @@ public class HttpParameter
         /// </summary>
         public string ContentType { get; set; }
     }
-}
+}

src/RestSharp/RestClient.cs

@@ -504,17 +504,17 @@ IHttp ConfigureHttp(IRestRequest request)
 
             http.Headers = requestParameters
                 .Where(p => p.Type == ParameterType.HttpHeader)
-                .Select(p => new HttpHeader {Name = p.Name, Value = Convert.ToString(p.Value)})
+                .Select(p => new HttpHeader(p.Name, p.Value))
                 .ToList();
 
             http.Cookies = requestParameters
                 .Where(p => p.Type == ParameterType.Cookie)
-                .Select(p => new HttpCookie {Name = p.Name, Value = Convert.ToString(p.Value)})
+                .Select(p => new HttpCookie {Name = p.Name, Value = p.Value?.ToString() ?? ""})
                 .ToList();
 
             http.Parameters = requestParameters
-                .Where(p => p.Type == ParameterType.GetOrPost && p.Value != null)
-                .Select(p => new HttpParameter {Name = p.Name, Value = Convert.ToString(p.Value)})
+                .Where(p => p.Type == ParameterType.GetOrPost)
+                .Select(p => new HttpParameter(p.Name, p.Value))
                 .ToList();
 
             http.Files = request.Files.Select(

src/RestSharp/RestRequestExtensions.cs

@@ -33,8 +33,8 @@ params ISerializer[] serializers
 
             if (body.DataFormat == DataFormat.None)
             {
-                 request.Body = new RequestBody(body.ContentType, body.Name, body.Value);
-                 return;
+                request.Body = new RequestBody(body.ContentType, body.Name, body.Value);
+                return;
             }
 
             var contentType       = body.ContentType ?? ContentType.FromDataFormat[body.DataFormat];
@@ -43,7 +43,8 @@ params ISerializer[] serializers
             if (requestSerializer != null)
             {
                 request.Body = new RequestBody(
-                    requestSerializer.ContentType, requestSerializer.ContentType,
+                    requestSerializer.ContentType,
+                    requestSerializer.ContentType,
                     requestSerializer.Serialize(body.Value)
                 );
                 return;
@@ -78,15 +79,8 @@ internal static void AddBody(this IHttp http, RequestBody requestBody)
             }
             else
             {
-                http.Parameters.Add(
-                    new HttpParameter
-                    {
-                        Name        = requestBody.Name,
-                        Value       = requestBody.Value.ToString(),
-                        ContentType = requestBody.ContentType
-                    }
-                );
+                http.Parameters.Add(new HttpParameter(requestBody.Name, requestBody.Value, requestBody.ContentType));
             }
         }
     }
-}
+}

test/RestSharp.IntegrationTests/HttpHeadersTests.cs

@@ -35,8 +35,10 @@ public void Ensure_headers_correctly_set_in_the_hook()
             // Prepare
             var client = new RestClient(server.Url);
 
-            var request = new RestRequest(RequestHeadCapturer.Resource);
-            request.OnBeforeRequest = http => http.Headers.Add(new HttpHeader {Name = headerName, Value = headerValue});
+            var request = new RestRequest(RequestHeadCapturer.Resource)
+            {
+                OnBeforeRequest = http => http.Headers.Add(new HttpHeader(headerName, headerValue))
+            };
 
             // Run
             client.Execute(request);