Cleanup: String interpolation

Author: niemyjski

src/Exceptionless/Configuration/ExceptionlessConfiguration.cs

@@ -388,7 +388,7 @@ public void AddPlugin<T>(T plugin) where T : IEventPlugin {
             RemovePlugin(key);
 
             if (!_plugins.TryAdd(key, new PluginRegistration(key, GetPriority(typeof(T)), new Lazy<IEventPlugin>(() => plugin))))
-                Resolver.GetLog().Error(String.Format("Unable to add plugin: {0}", key));
+                Resolver.GetLog().Error($"Unable to add plugin: {key}");
         }
 
         /// <summary>
@@ -409,7 +409,7 @@ public void AddPlugin(string key, Type pluginType) {
 
             var plugin = new PluginRegistration(key, GetPriority(pluginType), new Lazy<IEventPlugin>(() => Resolver.Resolve(pluginType) as IEventPlugin));
             if (!_plugins.TryAdd(key, plugin))
-                Resolver.GetLog().Error(String.Format("Unable to add plugin: {0}", key));
+                Resolver.GetLog().Error($"Unable to add plugin: {key}");
         }
 
         /// <summary>
@@ -432,7 +432,7 @@ public void AddPlugin(string key, int priority, Func<ExceptionlessConfiguration,
 
             var plugin = new PluginRegistration(key, priority, new Lazy<IEventPlugin>(() => factory(this)));
             if (!_plugins.TryAdd(key, plugin))
-                Resolver.GetLog().Error(String.Format("Unable to add plugin: {0}", key));
+                Resolver.GetLog().Error($"Unable to add plugin: {key}");
         }
 
         /// <summary>
@@ -463,7 +463,7 @@ public void AddPlugin(string key, int priority, Action<EventPluginContext> plugi
 
             var plugin = new PluginRegistration(key, priority, new Lazy<IEventPlugin>(() => new ActionPlugin(pluginAction)));
             if (!_plugins.TryAdd(key, plugin))
-                Resolver.GetLog().Error(String.Format("Unable to add plugin: {0}", key));
+                Resolver.GetLog().Error($"Unable to add plugin: {key}");
         }
 
         /// <summary>
@@ -520,7 +520,7 @@ public ValidationResult Validate() {
                 result.Messages.Add("ApiKey is not set.");
 
             if (key != null && (key.Length < 10 || key.Contains(" ")))
-                result.Messages.Add(String.Format("ApiKey \"{0}\" is not valid.", key));
+                result.Messages.Add($"ApiKey \"{key}\" is not valid.");
 
             if (String.IsNullOrEmpty(ServerUrl))
                 result.Messages.Add("ServerUrl is not set.");
@@ -561,7 +561,7 @@ public IEventPlugin Plugin {
             }
 
             public override string ToString() {
-                return String.Format("Key: {0}, Priority: {1}", Key, Priority);
+                return $"Key: {Key}, Priority: {Priority}";
             }
 
             public void Dispose() {

src/Exceptionless/Extensions/DataDictionaryExtensions.cs

@@ -16,7 +16,7 @@ public static T GetValue<T>(this DataDictionary items, string key, IJsonSerializ
 
             object data;
             if (!items.TryGetValue(key, out data))
-                throw new KeyNotFoundException(String.Format("The key '{0}' was not found.", key));
+                throw new KeyNotFoundException($"The key '{key}' was not found.");
 
             if (data == null || data is T)
                 return (T)data;

src/Exceptionless/Extensions/EventExtensions.cs

@@ -237,7 +237,7 @@ public static string GetEventReference(this Event ev, string name) {
             if (ev == null || String.IsNullOrEmpty(name))
                 return null;
 
-            return ev.Data.GetString(String.Format("@ref:{0}", name));
+            return ev.Data.GetString($"@ref:{name}");
         }
 
         /// <summary>
@@ -253,7 +253,7 @@ public static void SetEventReference(this Event ev, string name, string id) {
             if (!IsValidIdentifier(id) || String.IsNullOrEmpty(id))
                 throw new ArgumentException("Id must contain between 8 and 100 alphanumeric or '-' characters.", "id");
 
-            ev.SetProperty(String.Format("@ref:{0}", name), id);
+            ev.SetProperty($"@ref:{name}", id);
         }
 
         private static bool IsValidIdentifier(string value) {

src/Exceptionless/Extensions/ExceptionlessConfigurationExtensions.cs

@@ -352,20 +352,20 @@ public static void ReadFromConfigSection(this ExceptionlessConfiguration config)
 
                     Type resolverInterface = types.FirstOrDefault(t => t.Name.Equals(resolver.Service) || t.FullName.Equals(resolver.Service));
                     if (resolverInterface == null) {
-                        config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), String.Format("Error retrieving service type \"{0}\".", resolver.Service));
+                        config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), $"Error retrieving service type \"{resolver.Service}\".");
                         continue;
                     }
 
                     try {
                         Type implementationType = Type.GetType(resolver.Type);
                         if (!resolverInterface.IsAssignableFrom(implementationType)) {
-                            config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), String.Format("Type \"{0}\" does not implement \"{1}\".", resolver.Type, resolver.Service));
+                            config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), $"Type \"{resolver.Type}\" does not implement \"{resolver.Service}\".");
                             continue;
                         }
 
                         config.Resolver.Register(resolverInterface, implementationType);
                     } catch (Exception ex) {
-                        config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), ex, String.Format("An error occurred while registering service \"{0}\" implementation \"{1}\".", resolver.Service, resolver.Type));
+                        config.Resolver.GetLog().Error(typeof(ExceptionlessConfigurationExtensions), ex, $"An error occurred while registering service \"{resolver.Service}\" implementation \"{resolver.Type}\".");
                     }
                 }
             }

src/Exceptionless/Extensions/FileStorageExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -32,11 +32,10 @@ public static ICollection<ObjectInfo> GetQueueFiles(this IObjectStorage storage,
         public static bool IncrementAttempts(this IObjectStorage storage, ObjectInfo info) {
             string[] parts = info.Path.Split('.');
             if (parts.Length < 3)
-                throw new ArgumentException(String.Format("Path \"{0}\" must contain the number of attempts.", info.Path));
+                throw new ArgumentException($"Path \"{info.Path}\" must contain the number of attempts.");
 
-            int version;
-            if (!Int32.TryParse(parts[1], out version))
-                throw new ArgumentException(String.Format("Path \"{0}\" must contain the number of attempts.", info.Path));
+            if (!Int32.TryParse(parts[1], out int version))
+                throw new ArgumentException($"Path \"{info.Path}\" must contain the number of attempts.");
 
             version++;
             string newpath = String.Join(".", parts[0], version, parts[2]);

src/Exceptionless/Extensions/ToErrorModelExtensions.cs

@@ -134,7 +134,7 @@ private static bool ValueIsEmpty(object value) {
         };
 
         private static string GetMessage(this Exception exception, string typeName) {
-            string defaultMessage = String.Format("Exception of type '{0}' was thrown.", typeName);
+            string defaultMessage = $"Exception of type '{typeName}' was thrown.";
             string message = !String.IsNullOrEmpty(exception.Message) ? exception.Message.Trim() : null;
             return !String.IsNullOrEmpty(message) ? message : defaultMessage;
         }

src/Exceptionless/Extensions/ToSimpleErrorModelExtensions.cs

@@ -104,7 +104,7 @@ private static bool ValueIsEmpty(object value) {
         }
 
         private static string GetMessage(this Exception exception, string typeName) {
-            string defaultMessage = String.Format("Exception of type '{0}' was thrown.", typeName);
+            string defaultMessage = $"Exception of type '{typeName}' was thrown.";
             string message = !String.IsNullOrEmpty(exception.Message) ? exception.Message.Trim() : null;
 
             return !String.IsNullOrEmpty(message) ? message : defaultMessage;

src/Exceptionless/Plugins/Default/010_EventExclusionPlugin.cs

@@ -31,7 +31,7 @@ public void Run(EventPluginContext context) {
             }
 
             if (!context.Client.Configuration.Settings.GetTypeAndSourceEnabled(context.Event.Type, context.Event.Source)) {
-                context.Log.Info(String.Format("Cancelling event from excluded type: {0} and source: {1}", context.Event.Type, context.Event.Source));
+                context.Log.Info($"Cancelling event from excluded type: {context.Event.Type} and source: {context.Event.Source}");
                 context.Cancel = true;
                 return;
             }

src/Exceptionless/Queue/DefaultEventQueue.cs

@@ -141,7 +141,7 @@ public void SuspendProcessing(TimeSpan? duration = null, bool discardFutureQueue
             if (!duration.HasValue)
                 duration = TimeSpan.FromMinutes(5);
 
-            _log.Info(typeof(DefaultEventQueue), String.Format("Suspending processing for: {0}.", duration.Value));
+            _log.Info(typeof(DefaultEventQueue), $"Suspending processing for: {duration.Value}.");
             _suspendProcessingUntil = DateTime.Now.Add(duration.Value);
             _queueTimer.Change(duration.Value, _processQueueInterval);
 

src/Exceptionless/Utility/AssemblyHelper.cs

@@ -36,7 +36,7 @@ public static List<Type> GetTypes(IExceptionlessLog log) {
 
                     types.AddRange(assembly.GetExportedTypes());
                 } catch (Exception ex) {
-                    log.Error(typeof(AssemblyHelper), ex, String.Format("An error occurred while getting types for assembly \"{0}\".", assembly));
+                    log.Error(typeof(AssemblyHelper), ex, $"An error occurred while getting types for assembly \"{assembly}\".");
                 }
             }