From 76e836c59fed59380aa9c9b1352b7fbde2947fcd Mon Sep 17 00:00:00 2001 From: ThisWillDoIt Date: Thu, 6 Oct 2016 23:24:33 +0200 Subject: [PATCH 1/2] introduced nameof operator for ArgumentNullException strings --- BlogEngine/BlogEngine.Core/Helpers/Utils.cs | 6 +++--- .../Providers/BlogProviderCollection.cs | 4 ++-- .../Providers/DbProvider/DbBlogProvider.cs | 10 +++++----- .../Providers/DbProvider/DbMembershipProvider.cs | 4 ++-- .../Providers/DbProvider/DbRoleProvider.cs | 2 +- .../BlogFileSystemProviderCollection.cs | 4 ++-- .../FileSystemProviders/DbFileSystemProvider.cs | 2 +- .../FileSystemProviders/UNCFileSystemProvider.cs | 2 +- .../Providers/XmlProvider/PingServices.cs | 2 +- .../BlogEngine.Core/Providers/XmlProvider/Settings.cs | 2 +- .../Providers/XmlProvider/XmlMembershipProvider.cs | 6 +++--- .../Providers/XmlProvider/XmlRoleProvider.cs | 4 ++-- BlogEngine/BlogEngine.Core/RemoteFile.cs | 2 +- BlogEngine/BlogEngine.Core/Role.cs | 2 +- .../Compilation/LinqLengthExpressionBuilder.cs | 8 ++++---- .../Services/Messaging/Ping/Trackback.cs | 2 +- .../Services/Messaging/Ping/TrackbackMessage.cs | 2 +- .../Services/Security/CustomIdentity.cs | 4 ++-- BlogEngine/BlogEngine.Core/Services/Security/Right.cs | 8 ++++---- .../Services/Syndication/SyndicationGenerator.cs | 8 ++++---- BlogEngine/BlogEngine.Core/Web/BlogCulture.cs | 2 +- .../AppCode/App_Start/BlogEngineConfig.cs | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs index 0deb1fa08..d790bd134 100644 --- a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs +++ b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs @@ -514,7 +514,7 @@ public static Uri ConvertToAbsolute(string relativeUri) { if (String.IsNullOrEmpty(relativeUri)) { - throw new ArgumentNullException("relativeUri"); + throw new ArgumentNullException(nameof(relativeUri)); } var absolute = AbsoluteWebRoot.ToString(); @@ -1031,7 +1031,7 @@ public static string RenderControl(System.Web.UI.Control control) { if (control == null) { - throw new ArgumentNullException("control"); + throw new ArgumentNullException(nameof(control)); } using (var sWriter = new System.IO.StringWriter()) @@ -1108,7 +1108,7 @@ public static string SendMailMessage(MailMessage message, string smtpServer = "" int intPort = BlogSettings.Instance.SmtpServerPort; if (message == null) - throw new ArgumentNullException("message"); + throw new ArgumentNullException(nameof(message)); try { diff --git a/BlogEngine/BlogEngine.Core/Providers/BlogProviderCollection.cs b/BlogEngine/BlogEngine.Core/Providers/BlogProviderCollection.cs index 5fa895f15..087c8b12c 100644 --- a/BlogEngine/BlogEngine.Core/Providers/BlogProviderCollection.cs +++ b/BlogEngine/BlogEngine.Core/Providers/BlogProviderCollection.cs @@ -36,12 +36,12 @@ public override void Add(ProviderBase provider) { if (provider == null) { - throw new ArgumentNullException("provider"); + throw new ArgumentNullException(nameof(provider)); } if (!(provider is BlogProvider)) { - throw new ArgumentException("Invalid provider type", "provider"); + throw new ArgumentException("Invalid provider type", nameof(provider)); } base.Add(provider); diff --git a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs index 5ad88a68e..dcdc7ee73 100644 --- a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs @@ -52,7 +52,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (String.IsNullOrEmpty(name)) @@ -1989,7 +1989,7 @@ public override void SavePingServices(StringCollection services) { if (services == null) { - throw new ArgumentNullException("services"); + throw new ArgumentNullException(nameof(services)); } using (var conn = this.CreateConnection()) @@ -2075,7 +2075,7 @@ public override void SaveToDataStore(ExtensionType extensionType, string extensi { if (settings == null) { - throw new ArgumentNullException("settings"); + throw new ArgumentNullException(nameof(settings)); } // Save @@ -2195,7 +2195,7 @@ public override void SaveSettings(StringDictionary settings) { if (settings == null) { - throw new ArgumentNullException("settings"); + throw new ArgumentNullException(nameof(settings)); } using (var conn = this.CreateConnection()) @@ -2288,7 +2288,7 @@ public override void SaveRights(IEnumerable rights) { if (rights == null) { - throw new ArgumentNullException("rights"); + throw new ArgumentNullException(nameof(rights)); } using (var conn = this.CreateConnection()) diff --git a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbMembershipProvider.cs b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbMembershipProvider.cs index 746129d12..0851d2d03 100644 --- a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbMembershipProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbMembershipProvider.cs @@ -509,7 +509,7 @@ public override string GetUserNameByEmail(string email) { if (email == null) { - throw new ArgumentNullException("email"); + throw new ArgumentNullException(nameof(email)); } string userName = null; @@ -550,7 +550,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (string.IsNullOrEmpty(name)) diff --git a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbRoleProvider.cs b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbRoleProvider.cs index 488177b3c..d44d396b9 100644 --- a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbRoleProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbRoleProvider.cs @@ -357,7 +357,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (String.IsNullOrEmpty(name)) diff --git a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/BlogFileSystemProviderCollection.cs b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/BlogFileSystemProviderCollection.cs index 69010d927..d7b6addf9 100644 --- a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/BlogFileSystemProviderCollection.cs +++ b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/BlogFileSystemProviderCollection.cs @@ -36,12 +36,12 @@ public override void Add(ProviderBase provider) { if (provider == null) { - throw new ArgumentNullException("provider"); + throw new ArgumentNullException(nameof(provider)); } if (!(provider is BlogFileSystemProvider)) { - throw new ArgumentException("Invalid provider type", "provider"); + throw new ArgumentException("Invalid provider type", nameof(provider)); } base.Add(provider); diff --git a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/DbFileSystemProvider.cs b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/DbFileSystemProvider.cs index 040f64b4c..3cffdf621 100644 --- a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/DbFileSystemProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/DbFileSystemProvider.cs @@ -38,7 +38,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (String.IsNullOrEmpty(name)) diff --git a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/UNCFileSystemProvider.cs b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/UNCFileSystemProvider.cs index e4a385b79..6f1dea0bb 100644 --- a/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/UNCFileSystemProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/UNCFileSystemProvider.cs @@ -27,7 +27,7 @@ public override void Initialize(string name, System.Collections.Specialized.Name { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (String.IsNullOrEmpty(name)) diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/PingServices.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/PingServices.cs index f9d9cdcb8..a181f86d8 100644 --- a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/PingServices.cs +++ b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/PingServices.cs @@ -53,7 +53,7 @@ public override void SavePingServices(StringCollection services) { if (services == null) { - throw new ArgumentNullException("services"); + throw new ArgumentNullException(nameof(services)); } var fileName = this.Folder + "pingservices.xml"; diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/Settings.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/Settings.cs index d766d8b21..e97535726 100644 --- a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/Settings.cs +++ b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/Settings.cs @@ -53,7 +53,7 @@ public override void SaveSettings(StringDictionary settings) { if (settings == null) { - throw new ArgumentNullException("settings"); + throw new ArgumentNullException(nameof(settings)); } var filename = $"{Folder}settings.xml"; diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlMembershipProvider.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlMembershipProvider.cs index 48e81e52b..8d93fb2b4 100644 --- a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlMembershipProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlMembershipProvider.cs @@ -537,7 +537,7 @@ public override MembershipUser GetUser(object providerUserKey, bool userIsOnline { if (providerUserKey == null) { - throw new ArgumentNullException("providerUserKey"); + throw new ArgumentNullException(nameof(providerUserKey)); } var doc = new XmlDocument(); @@ -565,7 +565,7 @@ public override string GetUserNameByEmail(string email) { if (email == null) { - throw new ArgumentNullException("email"); + throw new ArgumentNullException(nameof(email)); } var doc = new XmlDocument(); @@ -594,7 +594,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (string.IsNullOrEmpty(name)) diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs index db0e54685..9a3f37592 100644 --- a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs @@ -272,7 +272,7 @@ public override void Initialize(string name, NameValueCollection config) { if (config == null) { - throw new ArgumentNullException("config"); + throw new ArgumentNullException(nameof(config)); } if (string.IsNullOrEmpty(name)) @@ -413,7 +413,7 @@ public override bool RoleExists(string roleName) { if (String.IsNullOrWhiteSpace(roleName)) { - throw new ArgumentNullException("roleName"); + throw new ArgumentNullException(nameof(roleName)); } else { diff --git a/BlogEngine/BlogEngine.Core/RemoteFile.cs b/BlogEngine/BlogEngine.Core/RemoteFile.cs index e960569e2..a03ae30df 100644 --- a/BlogEngine/BlogEngine.Core/RemoteFile.cs +++ b/BlogEngine/BlogEngine.Core/RemoteFile.cs @@ -38,7 +38,7 @@ internal RemoteFile(Uri filePath, bool ignoreRemoteDownloadSettings) { if (filePath == null) { - throw new ArgumentNullException("filePath"); + throw new ArgumentNullException(nameof(filePath)); } this.url = filePath; diff --git a/BlogEngine/BlogEngine.Core/Role.cs b/BlogEngine/BlogEngine.Core/Role.cs index 44c2e5b61..31c571e05 100644 --- a/BlogEngine/BlogEngine.Core/Role.cs +++ b/BlogEngine/BlogEngine.Core/Role.cs @@ -45,7 +45,7 @@ public Role(string name, List userNames) { if (userNames == null) { - throw new System.ArgumentNullException("userNames"); + throw new System.ArgumentNullException(nameof(userNames)); } else { diff --git a/BlogEngine/BlogEngine.Core/Services/Compilation/LinqLengthExpressionBuilder.cs b/BlogEngine/BlogEngine.Core/Services/Compilation/LinqLengthExpressionBuilder.cs index 245b8cb38..401ae7d97 100644 --- a/BlogEngine/BlogEngine.Core/Services/Compilation/LinqLengthExpressionBuilder.cs +++ b/BlogEngine/BlogEngine.Core/Services/Compilation/LinqLengthExpressionBuilder.cs @@ -72,7 +72,7 @@ private static string AfterLast(string value, string last) { if (value == null) { - throw new ArgumentNullException("value"); + throw new ArgumentNullException(nameof(value)); } return value.Substring(value.LastIndexOf(last) + last.Length); @@ -94,12 +94,12 @@ private static string BeforeLast(string value, string last) { if (value == null) { - throw new ArgumentNullException("value"); + throw new ArgumentNullException(nameof(value)); } if (last == null) { - throw new ArgumentNullException("last"); + throw new ArgumentNullException(nameof(last)); } return value.Substring(0, value.LastIndexOf(last)); @@ -124,7 +124,7 @@ private static string BetweenFirst(string value, string startText, string endTex { if (value == null) { - throw new ArgumentNullException("value"); + throw new ArgumentNullException(nameof(value)); } var start = value.IndexOf(startText, StringComparison.OrdinalIgnoreCase) + startText.Length; diff --git a/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs b/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs index b3ed06f74..2162ddf9a 100644 --- a/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs +++ b/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs @@ -42,7 +42,7 @@ public static bool Send(TrackbackMessage message) if (message == null) { - throw new ArgumentNullException("message"); + throw new ArgumentNullException(nameof(message)); } OnSending(message.UrlToNotifyTrackback); diff --git a/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs b/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs index 1955b2680..8281229e0 100644 --- a/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs +++ b/BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs @@ -26,7 +26,7 @@ public TrackbackMessage(IPublishable item, Uri urlToNotifyTrackback, Uri itemUrl { if (item == null) { - throw new ArgumentNullException("item"); + throw new ArgumentNullException(nameof(item)); } this.Title = item.Title; diff --git a/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs b/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs index 15926765d..4e9a429c5 100644 --- a/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs +++ b/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs @@ -59,10 +59,10 @@ public CustomIdentity(string username, bool isAuthenticated) public CustomIdentity(string username, string password) { if (String.IsNullOrWhiteSpace(username)) - throw new ArgumentNullException("username"); + throw new ArgumentNullException(nameof(username)); if (String.IsNullOrWhiteSpace(password)) - throw new ArgumentNullException("password"); + throw new ArgumentNullException(nameof(password)); if (!Membership.ValidateUser(username, password)) { return; } diff --git a/BlogEngine/BlogEngine.Core/Services/Security/Right.cs b/BlogEngine/BlogEngine.Core/Services/Security/Right.cs index 866198d44..7d4ed00b1 100644 --- a/BlogEngine/BlogEngine.Core/Services/Security/Right.cs +++ b/BlogEngine/BlogEngine.Core/Services/Security/Right.cs @@ -349,7 +349,7 @@ private static string PrepareRoleName(string roleName) { if (String.IsNullOrWhiteSpace(roleName)) { - throw new ArgumentNullException("roleName"); + throw new ArgumentNullException(nameof(roleName)); } else { @@ -375,7 +375,7 @@ public static Right GetRightByName(string rightName) { if (String.IsNullOrWhiteSpace(rightName)) { - throw new ArgumentNullException("rightName"); + throw new ArgumentNullException(nameof(rightName)); } else { @@ -439,7 +439,7 @@ public static IEnumerable GetRights(IEnumerable roles) { if (roles == null) { - throw new ArgumentNullException("roles"); + throw new ArgumentNullException(nameof(roles)); } else if (!roles.Any()) { @@ -473,7 +473,7 @@ public static bool HasRight(Rights right, IEnumerable roles) { if (roles == null) { - throw new ArgumentNullException("roles"); + throw new ArgumentNullException(nameof(roles)); } else if (!roles.Any()) { diff --git a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs index 047219ca8..f3bf1e10a 100644 --- a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs +++ b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs @@ -84,12 +84,12 @@ public SyndicationGenerator(BlogSettings settings, List categories) { if (settings == null) { - throw new ArgumentNullException("settings"); + throw new ArgumentNullException(nameof(settings)); } if (categories == null) { - throw new ArgumentNullException("categories"); + throw new ArgumentNullException(nameof(categories)); } // ------------------------------------------------------------ @@ -243,12 +243,12 @@ public void WriteFeed(SyndicationFormat format, Stream stream, List Date: Thu, 6 Oct 2016 23:28:47 +0200 Subject: [PATCH 2/2] added another nameof usage --- .../Services/Syndication/SyndicationGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs index f3bf1e10a..4770a833a 100644 --- a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs +++ b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs @@ -168,7 +168,7 @@ protected set { if (value == null) { - throw new ArgumentNullException("value"); + throw new ArgumentNullException(nameof(value)); } this.blogSettings = value;