Cleanup: use nameof

niemyjski · niemyjski · commit abd74874081f · 2023-04-10T22:43:33.000-05:00
diff --git a/samples/Exceptionless.SampleWcf/Service1.svc.cs b/samples/Exceptionless.SampleWcf/Service1.svc.cs
@@ -10,7 +10,7 @@ public string GetData(int value) {
 
         public CompositeType GetDataUsingDataContract(CompositeType composite) {
             if (composite == null)
-                throw new ArgumentNullException("composite");
+                throw new ArgumentNullException(nameof(composite));
 
             if (composite.BoolValue)
                 composite.StringValue += "Suffix";
diff --git a/src/Exceptionless/Configuration/ExceptionlessConfiguration.cs b/src/Exceptionless/Configuration/ExceptionlessConfiguration.cs
@@ -40,7 +40,7 @@ public class ExceptionlessConfiguration {
 
         public ExceptionlessConfiguration(IDependencyResolver resolver) {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
 
             ServerUrl = DEFAULT_SERVER_URL;
             ConfigServerUrl = DEFAULT_CONFIG_SERVER_URL;
diff --git a/src/Exceptionless/Dependency/DefaultDependencyResolver.cs b/src/Exceptionless/Dependency/DefaultDependencyResolver.cs
@@ -7,7 +7,7 @@ public sealed class DefaultDependencyResolver : IDependencyResolver {
 
         public object Resolve(Type serviceType) {
             if (serviceType == null)
-                throw new ArgumentNullException("serviceType");
+                throw new ArgumentNullException(nameof(serviceType));
 
             return _container.Resolve(serviceType);
         }
diff --git a/src/Exceptionless/Dependency/DependencyResolverExtensions.cs b/src/Exceptionless/Dependency/DependencyResolverExtensions.cs
@@ -25,39 +25,39 @@ public static bool HasDefaultRegistration<TService, TDefaultImplementation>(this
 
         public static object Resolve(this IDependencyResolver resolver, Type type) {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
 
             if (type == null)
-                throw new ArgumentNullException("type");
+                throw new ArgumentNullException(nameof(type));
 
             return resolver.Resolve(type);
         }
 
         public static TService Resolve<TService>(this IDependencyResolver resolver, TService defaultImplementation = null) where TService : class {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
             
             var serviceImpl = resolver.Resolve(typeof(TService));
             return serviceImpl as TService ?? defaultImplementation;
         }
 
         public static void Register<TService>(this IDependencyResolver resolver, TService implementation) {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
 
             resolver.Register(typeof(TService), () => implementation);
         }
 
         public static void Register<TService>(this IDependencyResolver resolver) {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
 
             resolver.Register(typeof(TService), typeof(TService));
         }
 
         public static void Register<TService, TImplementation>(this IDependencyResolver resolver) where TImplementation : TService {
             if (resolver == null)
-                throw new ArgumentNullException("resolver");
+                throw new ArgumentNullException(nameof(resolver));
 
             resolver.Register(typeof(TService), typeof(TImplementation));
         }
diff --git a/src/Exceptionless/ExceptionlessClient.cs b/src/Exceptionless/ExceptionlessClient.cs
@@ -31,7 +31,7 @@ public ExceptionlessClient(Action<ExceptionlessConfiguration> configure) : this(
 
         public ExceptionlessClient(ExceptionlessConfiguration configuration) {
             if (configuration == null)
-                throw new ArgumentNullException("configuration");
+                throw new ArgumentNullException(nameof(configuration));
 
             Configuration = configuration;
             Configuration.Changed += OnConfigurationChanged;
@@ -91,7 +91,7 @@ private async void OnUpdateSettingsAsync(object state) {
         /// <param name="description">The user's description of the event.</param>
         public async Task<bool> UpdateUserEmailAndDescriptionAsync(string referenceId, string email, string description) {
             if (String.IsNullOrEmpty(referenceId))
-                throw new ArgumentNullException("referenceId");
+                throw new ArgumentNullException(nameof(referenceId));
 
             if (String.IsNullOrEmpty(email) && String.IsNullOrEmpty(description))
                 return true;
@@ -161,7 +161,7 @@ public Task ProcessQueueAsync() {
         /// </param>
         public void SubmitEvent(Event ev, ContextData pluginContextData = null) {
             if (ev == null)
-                throw new ArgumentNullException("ev");
+                throw new ArgumentNullException(nameof(ev));
 
             if (!Configuration.Enabled) {
                 _log.Value.Info(typeof(ExceptionlessClient), "Configuration is disabled. The event will not be submitted.");
diff --git a/src/Exceptionless/Extensions/DataDictionaryExtensions.cs b/src/Exceptionless/Extensions/DataDictionaryExtensions.cs
@@ -9,10 +9,10 @@ namespace Exceptionless {
     public static class DataDictionaryExtensions {
         public static T GetValue<T>(this DataDictionary items, string key, IJsonSerializer serializer = null) {
             if (items == null)
-                throw new ArgumentNullException("items");
+                throw new ArgumentNullException(nameof(items));
 
             if (String.IsNullOrEmpty(key))
-                throw new ArgumentNullException("key");
+                throw new ArgumentNullException(nameof(key));
 
             object data;
             if (!items.TryGetValue(key, out data))
diff --git a/src/Exceptionless/Extensions/EventExtensions.cs b/src/Exceptionless/Extensions/EventExtensions.cs
@@ -185,7 +185,7 @@ public static void SetGeo(this Event ev, string coordinates) {
             if (coordinates.Contains(",") || coordinates.Contains(".") || coordinates.Contains(":"))
                 ev.Geo = coordinates;
             else
-                throw new ArgumentException("Must be either lat,lon or an IP address.", "coordinates");
+                throw new ArgumentException("Must be either lat,lon or an IP address.", nameof(coordinates));
         }
 
         /// <summary>
@@ -196,9 +196,9 @@ public static void SetGeo(this Event ev, string coordinates) {
         /// <param name="longitude">The event longitude.</param>
         public static void SetGeo(this Event ev, double latitude, double longitude) {
             if (latitude < -90.0 || latitude > 90.0)
-                throw new ArgumentOutOfRangeException("latitude", "Must be a valid latitude value between -90.0 and 90.0.");
+                throw new ArgumentOutOfRangeException(nameof(latitude), "Must be a valid latitude value between -90.0 and 90.0.");
             if (longitude < -180.0 || longitude > 180.0)
-                throw new ArgumentOutOfRangeException("longitude", "Must be a valid longitude value between -180.0 and 180.0.");
+                throw new ArgumentOutOfRangeException(nameof(longitude), "Must be a valid longitude value between -180.0 and 180.0.");
 
             ev.Geo = latitude.ToString("#0.0#######", CultureInfo.InvariantCulture) + "," + longitude.ToString("#0.0#######", CultureInfo.InvariantCulture);
         }
@@ -222,7 +222,7 @@ public static void AddTags(this Event ev, params string[] tags) {
         /// <param name="referenceId">The event reference id.</param>
         public static void SetReferenceId(this Event ev, string referenceId) {
             if (!IsValidIdentifier(referenceId))
-                throw new ArgumentException("ReferenceId must contain between 8 and 100 alphanumeric or '-' characters.", "referenceId");
+                throw new ArgumentException("ReferenceId must contain between 8 and 100 alphanumeric or '-' characters.", nameof(referenceId));
 
             ev.ReferenceId = referenceId;
         }
@@ -248,10 +248,10 @@ public static string GetEventReference(this Event ev, string name) {
         /// <param name="id">The reference id that points to a specific event</param>
         public static void SetEventReference(this Event ev, string name, string id) {
             if (String.IsNullOrEmpty(name))
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
 
             if (!IsValidIdentifier(id) || String.IsNullOrEmpty(id))
-                throw new ArgumentException("Id must contain between 8 and 100 alphanumeric or '-' characters.", "id");
+                throw new ArgumentException("Id must contain between 8 and 100 alphanumeric or '-' characters.", nameof(id));
 
             ev.SetProperty($"@ref:{name}", id);
         }
diff --git a/src/Exceptionless/Extensions/ExceptionlessConfigurationExtensions.cs b/src/Exceptionless/Extensions/ExceptionlessConfigurationExtensions.cs
@@ -135,7 +135,7 @@ public static void UseReferenceIds(this ExceptionlessConfiguration config) {
         /// <param name="assemblies">The assembly that contains the Exceptionless configuration attributes.</param>
         public static void ReadFromAttributes(this ExceptionlessConfiguration config, params Assembly[] assemblies) {
             if (config == null)
-                throw new ArgumentNullException("config");
+                throw new ArgumentNullException(nameof(config));
 
             config.ReadFromAttributes(assemblies.ToList());
         }
@@ -148,7 +148,7 @@ public static void ReadFromAttributes(this ExceptionlessConfiguration config, pa
         /// <param name="assemblies">A list of assemblies that should be checked for the Exceptionless configuration attributes.</param>
         public static void ReadFromAttributes(this ExceptionlessConfiguration config, ICollection<Assembly> assemblies = null) {
             if (config == null)
-                throw new ArgumentNullException("config");
+                throw new ArgumentNullException(nameof(config));
 
             if (assemblies == null) {
                 Assembly callingAssembly = null;
diff --git a/src/Exceptionless/Extensions/RequestInfoExtensions.cs b/src/Exceptionless/Extensions/RequestInfoExtensions.cs
@@ -60,7 +60,7 @@ private static string CreateQueryString(IEnumerable<KeyValuePair<string, string>
 
         private static string EscapeUriDataStringRfc3986(string value) {
             if (value == null)
-                throw new ArgumentNullException("value");
+                throw new ArgumentNullException(nameof(value));
 
             return value; //.HexEscape(_uriRfc3986CharsToEscape);
         }
diff --git a/src/Exceptionless/Logging/FileExceptionlessLog.cs b/src/Exceptionless/Logging/FileExceptionlessLog.cs
@@ -17,7 +17,7 @@ public class FileExceptionlessLog : IExceptionlessLog, IDisposable {
 
         public FileExceptionlessLog(string filePath, bool append = false) {
             if (String.IsNullOrEmpty(filePath))
-                throw new ArgumentNullException("filePath");
+                throw new ArgumentNullException(nameof(filePath));
 
             FilePath = filePath;
             MinimumLogLevel = LogLevel.Trace;
diff --git a/src/Exceptionless/Logging/LogLevel.cs b/src/Exceptionless/Logging/LogLevel.cs
@@ -55,36 +55,36 @@ public int Ordinal {
 
         public static bool operator >(LogLevel level1, LogLevel level2) {
             if (level1 == null)
-                throw new ArgumentNullException("level1");
+                throw new ArgumentNullException(nameof(level1));
             if (level2 == null)
-                throw new ArgumentNullException("level2");
+                throw new ArgumentNullException(nameof(level2));
 
             return level1.Ordinal > level2.Ordinal;
         }
 
         public static bool operator >=(LogLevel level1, LogLevel level2) {
             if (level1 == null)
-                throw new ArgumentNullException("level1");
+                throw new ArgumentNullException(nameof(level1));
             if (level2 == null)
-                throw new ArgumentNullException("level2");
+                throw new ArgumentNullException(nameof(level2));
 
             return level1.Ordinal >= level2.Ordinal;
         }
 
         public static bool operator <(LogLevel level1, LogLevel level2) {
             if (level1 == null)
-                throw new ArgumentNullException("level1");
+                throw new ArgumentNullException(nameof(level1));
             if (level2 == null)
-                throw new ArgumentNullException("level2");
+                throw new ArgumentNullException(nameof(level2));
 
             return level1.Ordinal < level2.Ordinal;
         }
 
         public static bool operator <=(LogLevel level1, LogLevel level2) {
             if (level1 == null)
-                throw new ArgumentNullException("level1");
+                throw new ArgumentNullException(nameof(level1));
             if (level2 == null)
-                throw new ArgumentNullException("level2");
+                throw new ArgumentNullException(nameof(level2));
 
             return level1.Ordinal <= level2.Ordinal;
         }
@@ -114,7 +114,7 @@ public static LogLevel FromOrdinal(int ordinal) {
 
         public static LogLevel FromString(string levelName) {
             if (levelName == null)
-                throw new ArgumentNullException("levelName");
+                throw new ArgumentNullException(nameof(levelName));
             if (levelName.Equals("Trace", StringComparison.OrdinalIgnoreCase) 
                 || levelName.Equals("true", StringComparison.OrdinalIgnoreCase) 
                 || levelName.Equals("1", StringComparison.OrdinalIgnoreCase)
@@ -164,7 +164,7 @@ public bool Equals(LogLevel other) {
 
         public int CompareTo(object obj) {
             if (obj == null)
-                throw new ArgumentNullException("obj");
+                throw new ArgumentNullException(nameof(obj));
 
             return Ordinal - ((LogLevel)obj).Ordinal;
         }
diff --git a/src/Exceptionless/Storage/FolderObjectStorage.cs b/src/Exceptionless/Storage/FolderObjectStorage.cs
@@ -31,7 +31,7 @@ public FolderObjectStorage(IDependencyResolver resolver, string folder) {
 
         public T GetObject<T>(string path) where T : class {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             try {
                 using (var reader = File.OpenRead(Path.Combine(Folder, path))) {
@@ -61,7 +61,7 @@ public bool Exists(string path) {
 
         public bool SaveObject<T>(string path, T value) where T : class {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             try {
                 string directory = Path.GetDirectoryName(Path.Combine(Folder, path));
@@ -81,9 +81,9 @@ public bool SaveObject<T>(string path, T value) where T : class {
 
         public bool RenameObject(string oldpath, string newpath) {
             if (String.IsNullOrEmpty(oldpath))
-                throw new ArgumentNullException("oldpath");
+                throw new ArgumentNullException(nameof(oldpath));
             if (String.IsNullOrEmpty(newpath))
-                throw new ArgumentNullException("newpath");
+                throw new ArgumentNullException(nameof(newpath));
 
             try {
                 lock (_lockObject) {
@@ -99,7 +99,7 @@ public bool RenameObject(string oldpath, string newpath) {
 
         public bool DeleteObject(string path) {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             try {
                 File.Delete(Path.Combine(Folder, path));
diff --git a/src/Exceptionless/Storage/InMemoryObjectStorage.cs b/src/Exceptionless/Storage/InMemoryObjectStorage.cs
@@ -23,7 +23,7 @@ public int Count {
 
         public T GetObject<T>(string path) where T : class {
             if (String.IsNullOrWhiteSpace(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             lock (_lock) {
                 Tuple<ObjectInfo, object> value;
@@ -45,7 +45,7 @@ public bool Exists(string path) {
 
         public bool SaveObject<T>(string path, T value) where T : class {
             if (String.IsNullOrWhiteSpace(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             lock (_lock) {
                 _storage[path] = Tuple.Create(new ObjectInfo {
@@ -63,9 +63,9 @@ public bool SaveObject<T>(string path, T value) where T : class {
 
         public bool RenameObject(string oldpath, string newpath) {
             if (String.IsNullOrWhiteSpace(oldpath))
-                throw new ArgumentNullException("oldpath");
+                throw new ArgumentNullException(nameof(oldpath));
             if (String.IsNullOrWhiteSpace(newpath))
-                throw new ArgumentNullException("newpath");
+                throw new ArgumentNullException(nameof(newpath));
 
             lock (_lock) {
                 if (!_storage.ContainsKey(oldpath))
@@ -82,7 +82,7 @@ public bool RenameObject(string oldpath, string newpath) {
 
         public bool DeleteObject(string path) {
             if (String.IsNullOrWhiteSpace(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             lock (_lock) {
                 if (!_storage.ContainsKey(path))
diff --git a/src/Exceptionless/Storage/IsolatedStorageObjectStorage.cs b/src/Exceptionless/Storage/IsolatedStorageObjectStorage.cs
@@ -97,7 +97,7 @@ public bool Exists(string path) {
 
         public T GetObject<T>(string path) where T : class {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             try {
                 var buffer = Run.WithRetries(() => {
@@ -122,7 +122,7 @@ public T GetObject<T>(string path) where T : class {
 
         public bool SaveObject<T>(string path, T value) where T : class {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             EnsureDirectory(path);
             byte[] buffer;
@@ -156,9 +156,9 @@ public bool SaveObject<T>(string path, T value) where T : class {
 
         public bool RenameObject(string oldpath, string newpath) {
             if (String.IsNullOrEmpty(oldpath))
-                throw new ArgumentNullException("oldpath");
+                throw new ArgumentNullException(nameof(oldpath));
             if (String.IsNullOrEmpty(newpath))
-                throw new ArgumentNullException("newpath");
+                throw new ArgumentNullException(nameof(newpath));
 
             try {
                 lock (_lockObject) {
@@ -176,7 +176,7 @@ public bool RenameObject(string oldpath, string newpath) {
 
         public bool DeleteObject(string path) {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             try {
                 lock (_lockObject) {
diff --git a/src/Exceptionless/Submission/GzipContent.cs b/src/Exceptionless/Submission/GzipContent.cs
@@ -11,7 +11,7 @@ public sealed class GzipContent : HttpContent {
 
         public GzipContent(HttpContent httpContent) {
             if (httpContent == null)
-                throw new ArgumentNullException("httpContent");
+                throw new ArgumentNullException(nameof(httpContent));
             
             _httpContent = httpContent;
             
diff --git a/src/Exceptionless/Utility/Run.cs b/src/Exceptionless/Utility/Run.cs
@@ -12,7 +12,7 @@ public static void WithRetries(Action action, int attempts = 3, TimeSpan? retryI
 
         public static T WithRetries<T>(Func<T> action, int attempts = 3, TimeSpan? retryInterval = null) {
             if (action == null)
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
 
             if (!retryInterval.HasValue)
                 retryInterval = TimeSpan.FromMilliseconds(new Random().Next(75, 125));
diff --git a/src/Platforms/Exceptionless.Web/WebLastReferenceIdManager.cs b/src/Platforms/Exceptionless.Web/WebLastReferenceIdManager.cs
@@ -8,7 +8,7 @@ internal sealed class WebLastReferenceIdManager : ILastReferenceIdManager {
 
         public WebLastReferenceIdManager(IExceptionlessLog log) {
             if (log == null)
-                throw new ArgumentNullException("log");
+                throw new ArgumentNullException(nameof(log));
 
             Log = log;
         }
diff --git a/test/Exceptionless.Tests/Utility/PasswordGenerator.cs b/test/Exceptionless.Tests/Utility/PasswordGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public sealed class DefaultDependencyResolver : IDependencyResolver {`
`7`	`7`
`8`	`8`	`public object Resolve(Type serviceType) {`
`9`	`9`	`if (serviceType == null)`
`10`		`- throw new ArgumentNullException("serviceType");`
	`10`	`+ throw new ArgumentNullException(nameof(serviceType));`
`11`	`11`
`12`	`12`	`return _container.Resolve(serviceType);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private static string CreateQueryString(IEnumerable<KeyValuePair<string, string>`
`60`	`60`
`61`	`61`	`private static string EscapeUriDataStringRfc3986(string value) {`
`62`	`62`	`if (value == null)`
`63`		`- throw new ArgumentNullException("value");`
	`63`	`+ throw new ArgumentNullException(nameof(value));`
`64`	`64`
`65`	`65`	`return value; //.HexEscape(_uriRfc3986CharsToEscape);`
`66`	`66`	`}`