Fix CA1062 in NuKeeper main project (#984)

skolima · web-flow · commit b5cdced3371d · 2020-05-19T19:47:04.000+02:00
diff --git a/CodeAnalysisRules.ruleset b/CodeAnalysisRules.ruleset
@@ -1,7 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="CodeProjects" Description="Code analysis rules for NuKeeper Code." ToolsVersion="15.0">
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
-    <Rule Id="CA1062" Action="None" />
     <Rule Id="CA1303" Action="None" />
     <Rule Id="CA2000" Action="None" />
     <Rule Id="CA2007" Action="None" />
diff --git a/NuKeeper/Collaboration/CollaborationEngine.cs b/NuKeeper/Collaboration/CollaborationEngine.cs
@@ -31,6 +31,11 @@ public CollaborationEngine(
 
         public async Task<int> Run(SettingsContainer settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             _logger.Detailed($"{Now()}: Started");
             _folderFactory.DeleteExistingTempDirs();
 
diff --git a/NuKeeper/ContainerInspectionRegistration.cs b/NuKeeper/ContainerInspectionRegistration.cs
@@ -14,9 +14,9 @@
 
 namespace NuKeeper
 {
-    public static class ContainerInspectionRegistration
+    internal static class ContainerInspectionRegistration
     {
-        public static void Register(Container container)
+        internal static void Register(Container container)
         {
             var logger = new ConfigurableLogger();
             container.RegisterInstance<INuKeeperLogger>(logger);
diff --git a/NuKeeper/ContainerUpdateRegistration.cs b/NuKeeper/ContainerUpdateRegistration.cs
@@ -5,9 +5,9 @@
 
 namespace NuKeeper
 {
-    public static class ContainerUpdateRegistration
+    internal static class ContainerUpdateRegistration
     {
-        public static void Register(Container container)
+        internal static void Register(Container container)
         {
             container.Register<IFileRestoreCommand, NuGetFileRestoreCommand>();
             container.Register<INuGetUpdatePackageCommand, NuGetUpdatePackageCommand>();
diff --git a/NuKeeper/Engine/BranchNamer.cs b/NuKeeper/Engine/BranchNamer.cs
@@ -26,6 +26,11 @@ public static bool IsValidTemplateToken(string token)
         /// <returns></returns>
         public static string MakeName(IReadOnlyCollection<PackageUpdateSet> updates, string branchTemplate = null)
         {
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             var tokenValues = new Dictionary<string, string>();
 
             foreach (var token in TemplateTokens)
@@ -63,7 +68,7 @@ public static string MakeName(IReadOnlyCollection<PackageUpdateSet> updates, str
         /// <param name="tokenValuePairs"></param>
         /// <param name="branchTemplate"></param>
         /// <returns></returns>
-        public static string MakeName(Dictionary<string, string> tokenValuePairs, string branchTemplate)
+        internal static string MakeName(Dictionary<string, string> tokenValuePairs, string branchTemplate)
         {
             var branchName = branchTemplate ?? "{default}";
 
diff --git a/NuKeeper/Engine/DefaultCommitWorder.cs b/NuKeeper/Engine/DefaultCommitWorder.cs
@@ -16,6 +16,11 @@ public class DefaultCommitWorder : ICommitWorder
 
         public string MakePullRequestTitle(IReadOnlyCollection<PackageUpdateSet> updates)
         {
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             if (updates.Count == 1)
             {
                 return PackageTitle(updates.First());
@@ -31,11 +36,21 @@ private static string PackageTitle(PackageUpdateSet updates)
 
         public string MakeCommitMessage(PackageUpdateSet updates)
         {
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             return $":{CommitEmoji}: {PackageTitle(updates)}";
         }
 
         public string MakeCommitDetails(IReadOnlyCollection<PackageUpdateSet> updates)
         {
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             var builder = new StringBuilder();
 
             if (updates.Count > 1)
diff --git a/NuKeeper/Engine/GitRepositoryEngine.cs b/NuKeeper/Engine/GitRepositoryEngine.cs
@@ -39,6 +39,21 @@ public async Task<int> Run(RepositorySettings repository,
             GitUsernamePasswordCredentials credentials,
             SettingsContainer settings, User user)
         {
+            if (repository == null)
+            {
+                throw new ArgumentNullException(nameof(repository));
+            }
+
+            if (credentials == null)
+            {
+                throw new ArgumentNullException(nameof(credentials));
+            }
+
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             try
             {
                 var repositoryData = await BuildGitRepositorySpec(repository, credentials.Username);
diff --git a/NuKeeper/Engine/Packages/ExistingCommitFilter.cs b/NuKeeper/Engine/Packages/ExistingCommitFilter.cs
@@ -22,6 +22,16 @@ public ExistingCommitFilter(ICollaborationFactory collaborationFactory, INuKeepe
 
         public async Task<IReadOnlyCollection<PackageUpdateSet>> Filter(IGitDriver git, IReadOnlyCollection<PackageUpdateSet> updates, string baseBranch, string headBranch)
         {
+            if (git == null)
+            {
+                throw new ArgumentNullException(nameof(git));
+            }
+
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             try
             {
                 var filtered = new List<PackageUpdateSet>();
diff --git a/NuKeeper/Engine/Packages/PackageUpdater.cs b/NuKeeper/Engine/Packages/PackageUpdater.cs
@@ -39,6 +39,21 @@ public async Task<int> MakeUpdatePullRequests(
             NuGetSources sources,
             SettingsContainer settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
+            if (git == null)
+            {
+                throw new ArgumentNullException(nameof(git));
+            }
+
+            if (repository == null)
+            {
+                throw new ArgumentNullException(nameof(repository));
+            }
+
             int totalCount = 0;
             try
             {
diff --git a/NuKeeper/Engine/RepositoryFilter.cs b/NuKeeper/Engine/RepositoryFilter.cs
@@ -21,6 +21,11 @@ public RepositoryFilter(ICollaborationFactory collaborationFactory, INuKeeperLog
 
         public async Task<bool> ContainsDotNetProjects(RepositorySettings repository)
         {
+            if (repository == null)
+            {
+                throw new ArgumentNullException(nameof(repository));
+            }
+
             const string dotNetCodeFiles = "\"packages.config\" OR \".csproj\" OR \".fsproj\" OR \".vbproj\"";
 
             var repos = new List<SearchRepo>
diff --git a/NuKeeper/Engine/RepositoryUpdater.cs b/NuKeeper/Engine/RepositoryUpdater.cs
@@ -1,3 +1,4 @@
+using System;
 using NuKeeper.Abstractions.Configuration;
 using NuKeeper.Abstractions.Git;
 using NuKeeper.Abstractions.Logging;
@@ -46,6 +47,21 @@ public async Task<int> Run(
             RepositoryData repository,
             SettingsContainer settings)
         {
+            if (repository == null)
+            {
+                throw new ArgumentNullException(nameof(repository));
+            }
+
+            if (git == null)
+            {
+                throw new ArgumentNullException(nameof(git));
+            }
+
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             if (!repository.IsLocalRepo)
             {
                 await GitInit(git, repository);
diff --git a/NuKeeper/Engine/UpdatesLogger.cs b/NuKeeper/Engine/UpdatesLogger.cs
@@ -10,6 +10,11 @@ public static class UpdatesLogger
     {
         public static string OldVersionsToBeUpdated(IReadOnlyCollection<PackageUpdateSet> updates)
         {
+            if (updates == null)
+            {
+                throw new ArgumentNullException(nameof(updates));
+            }
+
             if (updates.Count == 1)
             {
                 return $"Updating {DescribeOldVersions(updates.First())}";
diff --git a/NuKeeper/Local/LocalEngine.cs b/NuKeeper/Local/LocalEngine.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -48,6 +49,11 @@ public LocalEngine(
 
         public async Task Run(SettingsContainer settings, bool write)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             DefaultCredentialServiceUtility.SetupDefaultCredentialService(_nugetLogger, true);
 
             var folder = TargetFolder(settings.UserSettings);
diff --git a/NuKeeper/Local/LocalUpdater.cs b/NuKeeper/Local/LocalUpdater.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -38,6 +39,11 @@ public async Task ApplyUpdates(
             NuGetSources sources,
             SettingsContainer settings)
         {
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
             if (!updates.Any())
             {
                 return;
diff --git a/NuKeeper/LowercaseContractResolver.cs b/NuKeeper/LowercaseContractResolver.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Globalization;
 using Newtonsoft.Json.Serialization;
 
@@ -9,6 +10,11 @@ public class LowercaseContractResolver : DefaultContractResolver
     {
         protected override string ResolvePropertyName(string propertyName)
         {
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
             return propertyName.ToLower(CultureInfo.InvariantCulture);
         }
     }
diff --git a/NuKeeper/Program.cs b/NuKeeper/Program.cs
@@ -49,6 +49,11 @@ public static async Task<int> Main(string[] args)
         // ReSharper disable once UnusedMember.Global
         protected int OnExecute(CommandLineApplication app)
         {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
             // this shows help even if the --help option isn't specified
             app.ShowHelp();
             return 1;

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`
`15`	`15`	`namespace NuKeeper`
`16`	`16`	`{`
`17`		`- public static class ContainerInspectionRegistration`
	`17`	`+ internal static class ContainerInspectionRegistration`
`18`	`18`	`{`
`19`		`- public static void Register(Container container)`
	`19`	`+ internal static void Register(Container container)`
`20`	`20`	`{`
`21`	`21`	`var logger = new ConfigurableLogger();`
`22`	`22`	`container.RegisterInstance<INuKeeperLogger>(logger);`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`namespace NuKeeper`
`7`	`7`	`{`
`8`		`- public static class ContainerUpdateRegistration`
	`8`	`+ internal static class ContainerUpdateRegistration`
`9`	`9`	`{`
`10`		`- public static void Register(Container container)`
	`10`	`+ internal static void Register(Container container)`
`11`	`11`	`{`
`12`	`12`	`container.Register<IFileRestoreCommand, NuGetFileRestoreCommand>();`
`13`	`13`	`container.Register<INuGetUpdatePackageCommand, NuGetUpdatePackageCommand>();`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ public class DefaultCommitWorder : ICommitWorder`
`16`	`16`
`17`	`17`	`public string MakePullRequestTitle(IReadOnlyCollection<PackageUpdateSet> updates)`
`18`	`18`	`{`
	`19`	`+ if (updates == null)`
	`20`	`+ {`
	`21`	`+ throw new ArgumentNullException(nameof(updates));`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`if (updates.Count == 1)`
`20`	`25`	`{`
`21`	`26`	`return PackageTitle(updates.First());`
`@@ -31,11 +36,21 @@ private static string PackageTitle(PackageUpdateSet updates)`
`31`	`36`
`32`	`37`	`public string MakeCommitMessage(PackageUpdateSet updates)`
`33`	`38`	`{`
	`39`	`+ if (updates == null)`
	`40`	`+ {`
	`41`	`+ throw new ArgumentNullException(nameof(updates));`
	`42`	`+ }`
	`43`	`+`
`34`	`44`	`return $":{CommitEmoji}: {PackageTitle(updates)}";`
`35`	`45`	`}`
`36`	`46`
`37`	`47`	`public string MakeCommitDetails(IReadOnlyCollection<PackageUpdateSet> updates)`
`38`	`48`	`{`
	`49`	`+ if (updates == null)`
	`50`	`+ {`
	`51`	`+ throw new ArgumentNullException(nameof(updates));`
	`52`	`+ }`
	`53`	`+`
`39`	`54`	`var builder = new StringBuilder();`
`40`	`55`
`41`	`56`	`if (updates.Count > 1)`