Merge

alexeyzimarev · alexeyzimarev · commit 68edc94c28fe · 2019-01-20T17:02:34.000+01:00
diff --git a/RestSharp/Authenticators/JwtAuthenticator.cs b/RestSharp/Authenticators/JwtAuthenticator.cs
@@ -33,7 +33,7 @@ public class JwtAuthenticator : IAuthenticator
         public JwtAuthenticator(string accessToken)
         {
             if (accessToken == null)
-                throw new ArgumentNullException("accessToken");
+                throw new ArgumentNullException(nameof(accessToken));
 
             authHeader = string.Format("Bearer {0}", accessToken);
         }
diff --git a/RestSharp/Authenticators/NtlmAuthenticator.cs b/RestSharp/Authenticators/NtlmAuthenticator.cs
@@ -52,7 +52,7 @@ public NtlmAuthenticator(string username, string password)
         /// <param name="credentials"></param>
         public NtlmAuthenticator(ICredentials credentials)
         {
-            this.credentials = credentials ?? throw new ArgumentNullException("credentials");
+            this.credentials = credentials ?? throw new ArgumentNullException(nameof(credentials));
         }
 
         public void Authenticate(IRestClient client, IRestRequest request)
diff --git a/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs
@@ -62,7 +62,7 @@ public static string ToQueryString(this NameValueCollection collection)
 
             if (collection.Count > 0)
             {
-                sb.Append("?");
+                sb.Append('?');
             }
 
             int count = 0;
@@ -77,7 +77,7 @@ public static string ToQueryString(this NameValueCollection collection)
                     continue;
                 }
 
-                sb.Append("&");
+                sb.Append('&');
             }
 
             return sb.ToString();
diff --git a/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs
@@ -8,12 +8,10 @@ namespace RestSharp.Authenticators.OAuth.Extensions
 {
     internal static class StringExtensions
     {
-        public static bool IsNullOrBlank(this string value) => string.IsNullOrEmpty(value) ||
-                                                               !string.IsNullOrEmpty(value) &&
-                                                               value.Trim() == string.Empty;
+        public static bool IsNullOrBlank(this string value) => string.IsNullOrWhiteSpace(value);
 
-        public static bool EqualsIgnoreCase(this string left, string right) => 
-            string.Compare(left, right, StringComparison.OrdinalIgnoreCase) == 0;
+        public static bool EqualsIgnoreCase(this string left, string right) =>
+            string.Equals(left, right, StringComparison.OrdinalIgnoreCase);
 
         public static bool EqualsAny(this string input, params string[] args) => 
             args.Aggregate(false, (current, arg) => current | input.Equals(arg));
@@ -42,7 +40,7 @@ public static string PercentEncode(this string s)
             var sb = new StringBuilder();
 
             foreach (var b in bytes)
-                sb.Append(string.Format("%{0:X2}", b));
+                sb.AppendFormat("%{0:X2}", b);
 
             return sb.ToString();
         }
diff --git a/RestSharp/Authenticators/OAuth/OAuthTools.cs b/RestSharp/Authenticators/OAuth/OAuthTools.cs
@@ -177,9 +177,12 @@ public static WebParameterCollection SortParametersExcludingSignature(WebParamet
                 p.Name = UrlEncodeStrict(p.Name);
                 p.Value = UrlEncodeStrict(p.Value);
             });
-            copy.Sort((x, y) => string.CompareOrdinal(x.Name, y.Name) != 0
-                ? string.CompareOrdinal(x.Name, y.Name)
-                : string.CompareOrdinal(x.Value, y.Value));
+            copy.Sort((x, y) => {
+                int compareName = string.CompareOrdinal(x.Name, y.Name);
+                return (compareName != 0)
+                    ? compareName
+                    : string.CompareOrdinal(x.Value, y.Value);
+                 });
 
             return copy;
         }
@@ -194,7 +197,7 @@ public static WebParameterCollection SortParametersExcludingSignature(WebParamet
         public static string ConstructRequestUrl(Uri url)
         {
             if (url == null)
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
 
             var sb = new StringBuilder();
             var requestUrl = "{0}://{1}".FormatWith(url.Scheme, url.Host);
diff --git a/RestSharp/Extensions/ReflectionExtensions.cs b/RestSharp/Extensions/ReflectionExtensions.cs
@@ -94,11 +94,13 @@ public static object ChangeType(this object source, Type newType, CultureInfo cu
         /// <returns></returns>
         public static object FindEnumValue(this Type type, string value, CultureInfo culture)
         {
+            var caseInsensitiveComparer = StringComparer.Create(culture, true);
+
             Enum ret = Enum.GetValues(type)
                 .Cast<Enum>()
                 .FirstOrDefault(v => v.ToString()
                     .GetNameVariants(culture)
-                    .Contains(value, StringComparer.Create(culture, true)));
+                    .Contains(value, caseInsensitiveComparer));
 
             if (ret != null) return ret;
 
diff --git a/RestSharp/Extensions/StringExtensions.cs b/RestSharp/Extensions/StringExtensions.cs
@@ -203,7 +203,7 @@ public static string ToPascalCase(this string text, bool removeUnderscores, Cult
             if (string.IsNullOrEmpty(text))
                 return text;
 
-            text = text.Replace("_", " ");
+            text = text.Replace('_', ' ');
 
             var joinString = removeUnderscores
                 ? string.Empty
diff --git a/RestSharp/Http.cs b/RestSharp/Http.cs
@@ -288,8 +288,8 @@ private string GetMultipartFormData(HttpParameter param)
         private void AppendHeaders(HttpWebRequest webRequest)
         {
             foreach (var header in Headers)
-                if (restrictedHeaderActions.ContainsKey(header.Name))
-                    restrictedHeaderActions[header.Name].Invoke(webRequest, header.Value);
+                if (restrictedHeaderActions.TryGetValue(header.Name, out var restrictedHeaderAction))
+                    restrictedHeaderAction.Invoke(webRequest, header.Value);
                 else
                     webRequest.Headers.Add(header.Name, header.Value);
         }
diff --git a/RestSharp/RestClient.cs b/RestSharp/RestClient.cs
@@ -83,7 +83,7 @@ public RestClient()
         public RestClient(string baseUrl) : this()
         {
             if (baseUrl.IsEmpty())
-                throw new ArgumentNullException("baseUrl");
+                throw new ArgumentNullException(nameof(baseUrl));
 
             BaseUrl = new Uri(baseUrl);
         }
@@ -471,7 +471,7 @@ private static IEnumerable<Parameter> GetQueryStringParameters(IRestRequest requ
         private Func<IDeserializer> GetHandler(string contentType)
         {
             if (contentType == null)
-                throw new ArgumentNullException("contentType");
+                throw new ArgumentNullException(nameof(contentType));
 
             if (string.IsNullOrEmpty(contentType) && ContentHandlers.ContainsKey("*"))
                 return ContentHandlers["*"];
@@ -481,8 +481,8 @@ private Func<IDeserializer> GetHandler(string contentType)
             if (semicolonIndex > -1)
                 contentType = contentType.Substring(0, semicolonIndex);
 
-            if (ContentHandlers.ContainsKey(contentType))
-                return ContentHandlers[contentType];
+            if (ContentHandlers.TryGetValue(contentType,  out var contentHandler))
+                return contentHandler;
 
             // Avoid unnecessary use of regular expressions in checking for structured syntax suffix by looking for a '+' first
             if (contentType.IndexOf('+') >= 0)
@@ -493,9 +493,9 @@ private Func<IDeserializer> GetHandler(string contentType)
                 if (structuredSyntaxSuffixMatch.Success)
                 {
                     var structuredSyntaxSuffixWildcard = "*" + structuredSyntaxSuffixMatch.Value;
-                    if (ContentHandlers.ContainsKey(structuredSyntaxSuffixWildcard))
+                    if (ContentHandlers.TryGetValue(structuredSyntaxSuffixWildcard, out var contentHandlerWildcard))
                     {
-                        return ContentHandlers[structuredSyntaxSuffixWildcard];
+                        return contentHandlerWildcard;
                     }
                 }
             }
@@ -556,7 +556,7 @@ internal IHttp ConfigureHttp(IRestRequest request)
             }
 
             // Add Accept header based on registered deserializers if none has been set by the caller.
-            if (requestParameters.All(p => p.Name.ToLowerInvariant() != "accept"))
+            if (requestParameters.All(p => !string.Equals(p.Name, "accept", StringComparison.InvariantCultureIgnoreCase)))
             {
                 var accepts = string.Join(", ", AcceptTypes.ToArray());
 
diff --git a/RestSharp/RestRequest.cs b/RestSharp/RestRequest.cs
@@ -561,7 +561,7 @@ bool InvalidHost(string host)
             }
 
             if (name == "Host" && InvalidHost(value))
-                throw new ArgumentException("The specified value is not a valid Host header string.", "value");
+                throw new ArgumentException("The specified value is not a valid Host header string.", nameof(value));
             return AddParameter(name, value, ParameterType.HttpHeader);
         }
 
diff --git a/RestSharp/Serialization/Json/JsonSerializer.cs b/RestSharp/Serialization/Json/JsonSerializer.cs
@@ -90,7 +90,6 @@ private object Map(object target, IDictionary<string, object> data)
             foreach (var prop in props)
             {
                 string name;
-                var type = prop.PropertyType.GetTypeInfo();
                 var attributes = prop.GetCustomAttributes(typeof(DeserializeAsAttribute), false);
 
                 if (attributes.Any())
@@ -128,6 +127,7 @@ private object Map(object target, IDictionary<string, object> data)
 
                 if (value != null)
                 {
+                    var type = prop.PropertyType.GetTypeInfo();
                     prop.SetValue(target, ConvertValue(type, value), null);
                 }
             }
diff --git a/RestSharp/Serialization/Xml/XmlDeserializer.cs b/RestSharp/Serialization/Xml/XmlDeserializer.cs
@@ -268,7 +268,6 @@ protected virtual object Map(object x, XElement root)
                 }
                 else if (type.IsGenericType)
                 {
-                    var t = type.GetGenericArguments()[0];
                     var list = (IList) Activator.CreateInstance(asType);
                     var container = this.GetElementByName(root, name);
 
@@ -278,6 +277,7 @@ protected virtual object Map(object x, XElement root)
 
                         if (first != null)
                         {
+                            var t = type.GetGenericArguments()[0];
                             var elements = container.Elements(first.Name);
 
                             PopulateListFromElements(t, elements, list);
@@ -454,12 +454,13 @@ protected virtual XElement GetElementByName(XElement root, XName name)
                 return root.Element(camelName);
 
             // try looking for element that matches sanitized property name (Order by depth)
-            var element = root.Descendants()
-                       .OrderBy(d => d.Ancestors().Count())
+            var orderedDescendants = root.Descendants()
+                       .OrderBy(d => d.Ancestors().Count());
+
+            var element = orderedDescendants
                        .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName) ??
-                   root.Descendants()
-                       .OrderBy(d => d.Ancestors().Count())
-                       .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName.ToLower());
+                   orderedDescendants
+                       .FirstOrDefault(d => string.Equals(d.Name.LocalName.RemoveUnderscoresAndDashes(), name.LocalName, StringComparison.OrdinalIgnoreCase));
 
             return element == null && name == "Value".AsNamespaced(name.NamespaceName) &&
                    (!root.HasAttributes || root.Attributes().All(x => x.Name != name))
diff --git a/RestSharp/Serialization/Xml/XmlSerializer.cs b/RestSharp/Serialization/Xml/XmlSerializer.cs
@@ -146,7 +146,6 @@ orderby indexAttribute?.Index ?? int.MaxValue
                 if (rawValue == null)
                     continue;
 
-                string value = this.GetSerializedValue(rawValue);
                 Type propType = prop.PropertyType;
                 bool useAttribute = false;
                 bool setTextContent = false;
@@ -180,6 +179,8 @@ orderby indexAttribute?.Index ?? int.MaxValue
                 if (propType.GetTypeInfo().IsPrimitive || propType.GetTypeInfo().IsValueType ||
                     propType == typeof(string))
                 {
+                    string value = this.GetSerializedValue(rawValue);
+
                     if (useAttribute)
                     {
                         root.Add(new XAttribute(name, value));
@@ -192,11 +193,11 @@ orderby indexAttribute?.Index ?? int.MaxValue
 
                     element.Value = value;
                 }
-                else if (rawValue is IList)
+                else if (rawValue is IList items)
                 {
                     var itemTypeName = "";
 
-                    foreach (var item in (IList) rawValue)
+                    foreach (var item in items)
                     {
                         if (itemTypeName == "")
                         {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class JwtAuthenticator : IAuthenticator`
`33`	`33`	`public JwtAuthenticator(string accessToken)`
`34`	`34`	`{`
`35`	`35`	`if (accessToken == null)`
`36`		`- throw new ArgumentNullException("accessToken");`
	`36`	`+ throw new ArgumentNullException(nameof(accessToken));`
`37`	`37`
`38`	`38`	`authHeader = string.Format("Bearer {0}", accessToken);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public NtlmAuthenticator(string username, string password)`
`52`	`52`	`/// <param name="credentials"></param>`
`53`	`53`	`public NtlmAuthenticator(ICredentials credentials)`
`54`	`54`	`{`
`55`		`- this.credentials = credentials ?? throw new ArgumentNullException("credentials");`
	`55`	`+ this.credentials = credentials ?? throw new ArgumentNullException(nameof(credentials));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public void Authenticate(IRestClient client, IRestRequest request)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static string ToQueryString(this NameValueCollection collection)`
`62`	`62`
`63`	`63`	`if (collection.Count > 0)`
`64`	`64`	`{`
`65`		`- sb.Append("?");`
	`65`	`+ sb.Append('?');`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`int count = 0;`
`@@ -77,7 +77,7 @@ public static string ToQueryString(this NameValueCollection collection)`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`	`79`
`80`		`- sb.Append("&");`
	`80`	`+ sb.Append('&');`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return sb.ToString();`
Original file line number	Diff line number	Diff line change
`@@ -288,8 +288,8 @@ private string GetMultipartFormData(HttpParameter param)`
`288`	`288`	`private void AppendHeaders(HttpWebRequest webRequest)`
`289`	`289`	`{`
`290`	`290`	`foreach (var header in Headers)`
`291`		`- if (restrictedHeaderActions.ContainsKey(header.Name))`
`292`		`- restrictedHeaderActions[header.Name].Invoke(webRequest, header.Value);`
	`291`	`+ if (restrictedHeaderActions.TryGetValue(header.Name, out var restrictedHeaderAction))`
	`292`	`+ restrictedHeaderAction.Invoke(webRequest, header.Value);`
`293`	`293`	`else`
`294`	`294`	`webRequest.Headers.Add(header.Name, header.Value);`
`295`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public RestClient()`
`83`	`83`	`public RestClient(string baseUrl) : this()`
`84`	`84`	`{`
`85`	`85`	`if (baseUrl.IsEmpty())`
`86`		`- throw new ArgumentNullException("baseUrl");`
	`86`	`+ throw new ArgumentNullException(nameof(baseUrl));`
`87`	`87`
`88`	`88`	`BaseUrl = new Uri(baseUrl);`
`89`	`89`	`}`
`@@ -471,7 +471,7 @@ private static IEnumerable<Parameter> GetQueryStringParameters(IRestRequest requ`
`471`	`471`	`private Func<IDeserializer> GetHandler(string contentType)`
`472`	`472`	`{`
`473`	`473`	`if (contentType == null)`
`474`		`- throw new ArgumentNullException("contentType");`
	`474`	`+ throw new ArgumentNullException(nameof(contentType));`
`475`	`475`
`476`	`476`	`if (string.IsNullOrEmpty(contentType) && ContentHandlers.ContainsKey("*"))`
`477`	`477`	`return ContentHandlers["*"];`
`@@ -481,8 +481,8 @@ private Func<IDeserializer> GetHandler(string contentType)`
`481`	`481`	`if (semicolonIndex > -1)`
`482`	`482`	`contentType = contentType.Substring(0, semicolonIndex);`
`483`	`483`
`484`		`- if (ContentHandlers.ContainsKey(contentType))`
`485`		`- return ContentHandlers[contentType];`
	`484`	`+ if (ContentHandlers.TryGetValue(contentType, out var contentHandler))`
	`485`	`+ return contentHandler;`
`486`	`486`
`487`	`487`	`// Avoid unnecessary use of regular expressions in checking for structured syntax suffix by looking for a '+' first`
`488`	`488`	`if (contentType.IndexOf('+') >= 0)`
`@@ -493,9 +493,9 @@ private Func<IDeserializer> GetHandler(string contentType)`
`493`	`493`	`if (structuredSyntaxSuffixMatch.Success)`
`494`	`494`	`{`
`495`	`495`	`var structuredSyntaxSuffixWildcard = "*" + structuredSyntaxSuffixMatch.Value;`
`496`		`- if (ContentHandlers.ContainsKey(structuredSyntaxSuffixWildcard))`
	`496`	`+ if (ContentHandlers.TryGetValue(structuredSyntaxSuffixWildcard, out var contentHandlerWildcard))`
`497`	`497`	`{`
`498`		`- return ContentHandlers[structuredSyntaxSuffixWildcard];`
	`498`	`+ return contentHandlerWildcard;`
`499`	`499`	`}`
`500`	`500`	`}`
`501`	`501`	`}`
`@@ -556,7 +556,7 @@ internal IHttp ConfigureHttp(IRestRequest request)`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`// Add Accept header based on registered deserializers if none has been set by the caller.`
`559`		`- if (requestParameters.All(p => p.Name.ToLowerInvariant() != "accept"))`
	`559`	`+ if (requestParameters.All(p => !string.Equals(p.Name, "accept", StringComparison.InvariantCultureIgnoreCase)))`
`560`	`560`	`{`
`561`	`561`	`var accepts = string.Join(", ", AcceptTypes.ToArray());`
`562`	`562`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ bool InvalidHost(string host)`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`if (name == "Host" && InvalidHost(value))`
`564`		`- throw new ArgumentException("The specified value is not a valid Host header string.", "value");`
	`564`	`+ throw new ArgumentException("The specified value is not a valid Host header string.", nameof(value));`
`565`	`565`	`return AddParameter(name, value, ParameterType.HttpHeader);`
`566`	`566`	`}`
`567`	`567`