Code cleanup

src/WorkItemMigrator/JiraExport/IJiraProvider.cs

@@ -1,10 +1,10 @@
-using System;
+using Atlassian.Jira;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Atlassian.Jira;
-using Newtonsoft.Json.Linq;
 using static JiraExport.JiraProvider;
 
 namespace JiraExport

src/WorkItemMigrator/JiraExport/JiraCommandLine.cs

@@ -1,16 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-
-using Common.Config;
-
+using Common.Config;
 using Microsoft.Extensions.CommandLineUtils;
-
 using Migration.Common.Config;
 using Migration.Common.Log;
 using Migration.WIContract;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using static JiraExport.JiraProvider;
 
 namespace JiraExport

src/WorkItemMigrator/JiraExport/JiraItem.cs

@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-using Atlassian.Jira;
+using Atlassian.Jira;
 using Migration.Common;
 using Migration.Common.Log;
-
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace JiraExport
 {
@@ -37,7 +35,7 @@ private static List<JiraRevision> BuildRevisions(JiraItem jiraItem, IJiraProvide
             string issueKey = jiraItem.Key;
             var remoteIssue = jiraItem.RemoteIssue;
             Dictionary<string, object> fieldsTemp = ExtractFields(issueKey, remoteIssue, jiraProvider);
-            
+
             // Add CustomFieldName fields, copy over all non-custom fields.
             // These get removed as we loop over the changeLog, so we're left with the original Jira values by the time we reach firstRevision.
             Dictionary<string, object> fields = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
@@ -47,7 +45,8 @@ private static List<JiraRevision> BuildRevisions(JiraItem jiraItem, IJiraProvide
                 if (!String.IsNullOrEmpty(key))
                 {
                     fields[key] = field.Value;
-                } else
+                }
+                else
                 {
                     fields[field.Key] = field.Value;
                 }

src/WorkItemMigrator/JiraExport/JiraMapper.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Common.Config;
-
+using Common.Config;
 using Migration.Common;
 using Migration.Common.Config;
 using Migration.Common.Log;
 using Migration.WIContract;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Migration.Jira-Export.Tests")]
 
@@ -371,7 +370,7 @@ private HashSet<string> InitializeTypeMappings()
         private Func<JiraRevision, (bool, object)> IfChanged<T>(string sourceField, bool isCustomField, Func<T, object> mapperFunc = null)
         {
             // Store both the customFieldName and the sourceField as the changelog seems to only use the customFieldName, which is then passed into this function as the sourceField.
-            string customFieldName="";
+            string customFieldName = "";
             if (isCustomField)
             {
                 customFieldName = _jiraProvider.GetCustomId(sourceField);
@@ -391,7 +390,7 @@ private HashSet<string> InitializeTypeMappings()
                     {
                         return (true, (T)value);
                     }
-                } 
+                }
                 else if (r.Fields.TryGetValue(customFieldName.ToLower(), out value))
                 {
                     if (mapperFunc != null)

src/WorkItemMigrator/JiraExport/JiraProvider.cs

@@ -1,17 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Web;
-using Atlassian.Jira;
+using Atlassian.Jira;
 using Atlassian.Jira.Remote;
 using Migration.Common;
 using Migration.Common.Log;
-
 using Newtonsoft.Json.Linq;
-
 using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
 
 namespace JiraExport
 {

src/WorkItemMigrator/JiraExport/JiraRevision.cs

@@ -1,7 +1,7 @@
-using System;
+using Migration.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Migration.Common;
 
 namespace JiraExport
 {

src/WorkItemMigrator/JiraExport/Program.cs

@@ -1,5 +1,5 @@
-using System;
-using Migration.Common.Log;
+using Migration.Common.Log;
+using System;
 
 namespace JiraExport
 {

src/WorkItemMigrator/JiraExport/RevisionUtils/FieldMapperUtils.cs

@@ -20,12 +20,13 @@ public static object MapRemainingWork(string seconds)
             var secs = 0d;
             try
             {
-                if(seconds == null)
+                if (seconds == null)
                 {
                     throw new FormatException();
                 }
                 secs = Convert.ToDouble(seconds);
-            } catch (FormatException)
+            }
+            catch (FormatException)
             {
                 Logger.Log(LogLevel.Warning, $"A FormatException was thrown when converting RemainingWork value '{seconds}' to double. Defaulting to RemainingWork = null.");
                 return null;

src/WorkItemMigrator/Migration.Common.Log/Logger.cs

@@ -1,10 +1,10 @@
-using System;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.DataContracts;
+using Microsoft.ApplicationInsights.Extensibility;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
-using Microsoft.ApplicationInsights;
-using Microsoft.ApplicationInsights.DataContracts;
-using Microsoft.ApplicationInsights.Extensibility;
 
 namespace Migration.Common.Log
 {

src/WorkItemMigrator/Migration.Common.Log/VersionInfo.cs

@@ -1,8 +1,8 @@
-using System;
+using Newtonsoft.Json.Linq;
+using Semver;
+using System;
 using System.Diagnostics;
 using System.Net.Http;
-using Newtonsoft.Json.Linq;
-using Semver;
 
 namespace Migration.Common.Log
 {

src/WorkItemMigrator/Migration.Common/BaseMapper.cs

@@ -1,6 +1,6 @@
-using System;
+using Migration.Common.Log;
+using System;
 using System.Collections.Generic;
-using Migration.Common.Log;
 
 namespace Migration.Common
 {

src/WorkItemMigrator/Migration.Common/Config/ConfigReaderJson.cs

@@ -1,11 +1,11 @@
-using System;
+using Common.Config;
+using Migration.Common.Log;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Common.Config;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Migration.Common.Log;
 
 namespace Migration.Common.Config
 {
@@ -87,7 +87,7 @@ public ConfigJson DeserializeText(string input)
                 }
                 result.TypeMap.Types.AddRange(types);
 
-                if(obj.ContainsKey("repository-map"))
+                if (obj.ContainsKey("repository-map"))
                 {
                     var repositories = obj.SelectToken("repository-map.repository").Select(li => li.ToObject<Repository>()).ToList();
                     if (result.RepositoryMap.Repositories == null)

src/WorkItemMigrator/Migration.Common/MigrationContext.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Common.Config;
+using Common.Config;
 using Migration.Common.Log;
 using Migration.WIContract;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
 namespace Migration.Common
 {

src/WorkItemMigrator/Migration.Common/RevisionUtility.cs

@@ -1,8 +1,8 @@
-using System;
+using Migration.WIContract;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Migration.WIContract;
 
 namespace Migration.Common
 {

src/WorkItemMigrator/Migration.Common/UserMapper.cs

@@ -1,8 +1,7 @@
-using System.Collections.Generic;
+using Migration.Common.Log;
+using System.Collections.Generic;
 using System.IO;
 
-using Migration.Common.Log;
-
 namespace Migration.Common
 {
     public static class UserMapper

src/WorkItemMigrator/Migration.WIContract/WiItemProvider.cs

@@ -1,12 +1,10 @@
-using System;
+using Migration.Common.Log;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 
-using Migration.Common.Log;
-
-using Newtonsoft.Json;
-
 namespace Migration.WIContract
 {
     public class WiItemProvider

src/WorkItemMigrator/WorkItemImport/Agent.cs

@@ -1,24 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.TeamFoundation.Core.WebApi;
+using Microsoft.TeamFoundation.Core.WebApi;
+using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
 using Microsoft.VisualStudio.Services.Common;
 using Microsoft.VisualStudio.Services.Operations;
-
 using Migration.Common;
 using Migration.Common.Log;
 using Migration.WIContract;
-
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using VsWebApi = Microsoft.VisualStudio.Services.WebApi;
 using WebApi = Microsoft.TeamFoundation.WorkItemTracking.WebApi;
 using WebModel = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
 
-using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
-using System.IO;
-
 namespace WorkItemImport
 {
     public class Agent

src/WorkItemMigrator/WorkItemImport/ExecutionPlan.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using Migration.Common;
+using Migration.Common;
 using Migration.WIContract;
+using System.Collections.Generic;
 
 namespace WorkItemImport
 {

src/WorkItemMigrator/WorkItemImport/ExecutionPlanBuilder.cs

@@ -1,8 +1,8 @@
-using System;
+using Migration.Common;
+using Migration.Common.Log;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using Migration.Common;
-using Migration.Common.Log;
 
 namespace WorkItemImport
 {

src/WorkItemMigrator/WorkItemImport/ImportCommandLine.cs

@@ -1,16 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using Common.Config;
-
+using Common.Config;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
-
 using Migration.Common;
 using Migration.Common.Config;
 using Migration.Common.Log;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
 
 namespace WorkItemImport
 {
@@ -143,7 +141,7 @@ private bool ExecuteMigration(CommandOption token, CommandOption url, CommandOpt
                         importedItems++;
 
                         // Artifical wait (optional) to avoid throttling for ADO Services
-                        if(config.SleepTimeBetweenRevisionImportMilliseconds > 0)
+                        if (config.SleepTimeBetweenRevisionImportMilliseconds > 0)
                         {
                             Thread.Sleep(config.SleepTimeBetweenRevisionImportMilliseconds);
                         }

src/WorkItemMigrator/WorkItemImport/Program.cs

@@ -1,5 +1,5 @@
-using System;
-using Migration.Common.Log;
+using Migration.Common.Log;
+using System;
 
 namespace WorkItemImport
 {

src/WorkItemMigrator/WorkItemImport/WitClient/IWitClientWrapper.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.TeamFoundation.Core.WebApi;
+using Microsoft.TeamFoundation.Core.WebApi;
 using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
 using Microsoft.VisualStudio.Services.WebApi.Patch.Json;
 using Migration.WIContract;
+using System;
+using System.Collections.Generic;
 
 namespace WorkItemImport
 {