Fix CA1062 in Git and GitHub projects (#976)

NuKeeperDotNet · May 17, 2020 · 7a0b057 · 7a0b057
1 parent 27d299e
commit 7a0b057
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 29 deletions.
diff --git a/NuKeeper.Git.Tests/TestDirectoryHelper.cs b/NuKeeper.Git.Tests/TestDirectoryHelper.cs
@@ -1,22 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using System.Threading;
 
 namespace NuKeeper.Git.Tests
 {
     public static class TestDirectoryHelper
     {
-        private static readonly Dictionary<string, string> toRename = new Dictionary<string, string>
-        {
-            { "dot_git", ".git" },
-            { "gitmodules", ".gitmodules" },
-        };
-
         private static readonly Type[] whitelist = { typeof(IOException), typeof(UnauthorizedAccessException) };
 
         public static string DiscoverPathToGit()
@@ -53,28 +44,13 @@ public static DirectoryInfo UniqueTemporaryFolder()
             return tempDir;
         }
 
-        public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
+        public static void DeleteDirectory(DirectoryInfo toDelete)
         {
-            // From http://stackoverflow.com/questions/58744/best-way-to-copy-the-entire-contents-of-a-directory-in-c/58779#58779
-
-            foreach (DirectoryInfo dir in source.GetDirectories())
+            if (toDelete == null)
             {
-                CopyFilesRecursively(dir, target.CreateSubdirectory(Rename(dir.Name)));
+                throw new ArgumentNullException(nameof(toDelete));
             }
-            foreach (FileInfo file in source.GetFiles())
-            {
-                file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
-            }
-        }
 
-        private static string Rename(string name)
-        {
-            return toRename.ContainsKey(name) ? toRename[name] : name;
-        }
-
-
-        public static void DeleteDirectory(DirectoryInfo toDelete)
-        {
             // http://stackoverflow.com/questions/329355/cannot-delete-directory-with-directory-deletepath-true/329502#329502
             if (!toDelete.Exists)
             {

diff --git a/NuKeeper.Git/GitCmdDiscoveryDriver.cs b/NuKeeper.Git/GitCmdDiscoveryDriver.cs
@@ -35,12 +35,22 @@ public GitCmdDiscoveryDriver(string pathToGit, INuKeeperLogger logger)
 
         public async Task<Uri> DiscoverRepo(Uri repositoryUri)
         {
+            if (repositoryUri == null)
+            {
+                throw new ArgumentNullException(nameof(repositoryUri));
+            }
+
             var result = await StartGitProcess("config --get remote.origin.url", true, repositoryUri.LocalPath);
             return new Uri(result);
         }
 
         public async Task<string> GetCurrentHead(Uri repositoryUri)
         {
+            if (repositoryUri == null)
+            {
+                throw new ArgumentNullException(nameof(repositoryUri));
+            }
+
             var getBranchHead = await StartGitProcess($"symbolic-ref -q --short HEAD", true, repositoryUri.LocalPath);
             return string.IsNullOrEmpty(getBranchHead) ?
                 await StartGitProcess($"rev-parse HEAD", true, repositoryUri.LocalPath) :
@@ -55,6 +65,11 @@ public async Task<GitRemote> GetRemoteForPlatform(Uri repositoryUri, string plat
 
         public async Task<IEnumerable<GitRemote>> GetRemotes(Uri repositoryUri)
         {
+            if (repositoryUri == null)
+            {
+                throw new ArgumentNullException(nameof(repositoryUri));
+            }
+
             if (!await IsGitRepo(repositoryUri))
             {
                 return Enumerable.Empty<GitRemote>();

diff --git a/NuKeeper.Git/LibGit2SharpDiscoveryDriver.cs b/NuKeeper.Git/LibGit2SharpDiscoveryDriver.cs
@@ -33,6 +33,11 @@ public async Task<bool> IsGitRepo(Uri repositoryUri)
 
         public async Task<IEnumerable<GitRemote>> GetRemotes(Uri repositoryUri)
         {
+            if (repositoryUri == null)
+            {
+                throw new ArgumentNullException(nameof(repositoryUri));
+            }
+
             if (!await IsGitRepo(repositoryUri))
             {
                 return Enumerable.Empty<GitRemote>();

diff --git a/NuKeeper.GitHub/GitHubForkFinder.cs b/NuKeeper.GitHub/GitHubForkFinder.cs
@@ -16,14 +16,18 @@ public class GitHubForkFinder : IForkFinder
         public GitHubForkFinder(ICollaborationPlatform collaborationPlatform, INuKeeperLogger logger, ForkMode forkMode)
         {
             _collaborationPlatform = collaborationPlatform;
-            _logger = logger;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _forkMode = forkMode;
 
             _logger.Detailed($"FindPushFork. Fork Mode is {_forkMode}");
         }
 
         public async Task<ForkData> FindPushFork(string userName, ForkData fallbackFork)
         {
+            if (fallbackFork == null)
+            {
+                throw new ArgumentNullException(nameof(fallbackFork));
+            }
 
             switch (_forkMode)
             {

diff --git a/NuKeeper.GitHub/GitHubRepository.cs b/NuKeeper.GitHub/GitHubRepository.cs
@@ -2,7 +2,7 @@
 
 namespace NuKeeper.GitHub
 {
-    public class GitHubRepository : Repository
+    internal class GitHubRepository : Repository
     {
         public GitHubRepository(Octokit.Repository repository)
         : base(

diff --git a/NuKeeper.GitHub/GitHubRepositoryDiscovery.cs b/NuKeeper.GitHub/GitHubRepositoryDiscovery.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -22,6 +23,11 @@ public GitHubRepositoryDiscovery(INuKeeperLogger logger, ICollaborationPlatform
 
         public async Task<IEnumerable<RepositorySettings>> GetRepositories(SourceControlServerSettings settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             switch (settings.Scope)
             {
                 case ServerScope.Global:

diff --git a/NuKeeper.GitHub/GitHubSettingsReader.cs b/NuKeeper.GitHub/GitHubSettingsReader.cs
@@ -43,6 +43,11 @@ public async Task<bool> CanRead(Uri repositoryUri)
 
         public void UpdateCollaborationPlatformSettings(CollaborationPlatformSettings settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             var envToken = _environmentVariablesProvider.GetEnvironmentVariable("NuKeeper_github_token");
             settings.Token = Concat.FirstValue(envToken, settings.Token);
             settings.ForkMode ??= ForkMode.PreferFork;

diff --git a/NuKeeper.GitHub/GithubUriHelpers.cs b/NuKeeper.GitHub/GithubUriHelpers.cs
@@ -6,6 +6,11 @@ public static class GithubUriHelpers
     {
         public static Uri Normalise(Uri value)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
             return Normalise(value.ToString());
         }
 

diff --git a/NuKeeper.GitHub/OctokitClient.cs b/NuKeeper.GitHub/OctokitClient.cs
@@ -34,6 +34,11 @@ public OctokitClient(INuKeeperLogger logger)
 
         public void Initialise(AuthSettings settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             _apiBase = settings.ApiBase;
 
             _client = new GitHubClient(new ProductHeaderValue("NuKeeper"), _apiBase)