From 44af396da9c2b3d2dc2b2a6a7bd93d896a5cab3d Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 26 Mar 2014 22:24:38 -0700 Subject: [PATCH] Prefer string.Equals static method over the Equals instance method --- .../Formatters/JsonInputFormatter.cs | 5 ++--- .../ValueProviders/ElementalValueProvider.cs | 2 +- .../ValueProviders/FormValueProviderFactory.cs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Formatters/JsonInputFormatter.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Formatters/JsonInputFormatter.cs index def4ad4b21..627315f3d9 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/Formatters/JsonInputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Formatters/JsonInputFormatter.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; -using System.Reflection; -using Microsoft.AspNet.Mvc.ModelBinding.Internal; using Newtonsoft.Json; namespace Microsoft.AspNet.Mvc.ModelBinding @@ -181,7 +180,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding for (var i = 0; i < _supportedEncodings.Count; i++) { var supportedEncoding = _supportedEncodings[i]; - if (charset.Equals(supportedEncoding.WebName, StringComparison.OrdinalIgnoreCase)) + if (string.Equals(charset, supportedEncoding.WebName, StringComparison.OrdinalIgnoreCase)) { return supportedEncoding; } diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ElementalValueProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ElementalValueProvider.cs index 5fcc4e6676..b966e7d13c 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ElementalValueProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ElementalValueProvider.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding public ValueProviderResult GetValue(string key) { - return String.Equals(key, Name, StringComparison.OrdinalIgnoreCase) + return string.Equals(key, Name, StringComparison.OrdinalIgnoreCase) ? new ValueProviderResult(RawValue, Convert.ToString(RawValue, Culture), Culture) : null; } diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs index c081a67d9a..5c0b04bbec 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding { var contentType = request.GetContentType(); return contentType != null && - contentType.ContentType.Equals(FormEncodedContentType, StringComparison.OrdinalIgnoreCase); + string.Equals(contentType.ContentType, FormEncodedContentType, StringComparison.OrdinalIgnoreCase); } private static CultureInfo GetCultureInfo(HttpRequest request)