nullチェックをArgumentNullException.ThrowIfNullへ統一

Author: Widthdom

Models/FileDiffResultLists.cs

@@ -244,10 +244,7 @@ public static void RecordDisassemblerToolVersion(string toolName, string version
         /// <exception cref="ArgumentNullException">items が null の場合。</exception>
         private static void ReplaceQueueItems(ConcurrentQueue<string> targetQueue, IEnumerable<string> items, string paramName)
         {
-            if (items is null)
-            {
-                throw new ArgumentNullException(paramName);
-            }
+            ArgumentNullException.ThrowIfNull(items, paramName);
 
             targetQueue.Clear();
             foreach (var item in items)
@@ -265,10 +262,7 @@ private static void ReplaceQueueItems(ConcurrentQueue<string> targetQueue, IEnum
         /// <exception cref="ArgumentNullException">path が null の場合。</exception>
         private static void EnqueuePath(ConcurrentQueue<string> targetQueue, string path, string paramName)
         {
-            if (path is null)
-            {
-                throw new ArgumentNullException(paramName);
-            }
+            ArgumentNullException.ThrowIfNull(path, paramName);
             targetQueue.Enqueue(path);
         }
     }

Services/Caching/ILCache.cs

@@ -519,10 +519,7 @@ private static void LogPrecomputeProgress(int totalFiles, int processed, ref lon
         /// <exception cref="ArgumentNullException"><paramref name="ilCacheKey"/> が null の場合。</exception>
         private void StoreInMemoryCache(string ilCacheKey, string ilText)
         {
-            if (ilCacheKey == null)
-            {
-                throw new ArgumentNullException(nameof(ilCacheKey));
-            }
+            ArgumentNullException.ThrowIfNull(ilCacheKey);
             EnsureMemoryCapacity();
             _memoryILCacheDictionary[ilCacheKey] = (ilText, DateTime.UtcNow, DateTime.UtcNow);
         }

Services/DotNetDisassembleService.cs

@@ -217,7 +217,8 @@ public sealed class DotNetDisassembleService
         /// <exception cref="ArgumentNullException"></exception>
         public DotNetDisassembleService(ConfigSettings config, ILCache ilCache)
         {
-            _config = config ?? throw new ArgumentNullException(nameof(config));
+            ArgumentNullException.ThrowIfNull(config);
+            _config = config;
             _ilCache = ilCache;
         }
 

Services/FileDiffService.cs

@@ -66,10 +66,15 @@ public sealed class FileDiffService
         /// </summary>
         public FileDiffService(ConfigSettings config, ILOutputService ilOutputService, string oldFolderAbsolutePath, string newFolderAbsolutePath, bool optimizeForNetworkShares)
         {
-            _config = config ?? throw new ArgumentNullException(nameof(config));
-            _ilOutputService = ilOutputService ?? throw new ArgumentNullException(nameof(ilOutputService));
-            _oldFolderAbsolutePath = oldFolderAbsolutePath ?? throw new ArgumentNullException(nameof(oldFolderAbsolutePath));
-            _newFolderAbsolutePath = newFolderAbsolutePath ?? throw new ArgumentNullException(nameof(newFolderAbsolutePath));
+            ArgumentNullException.ThrowIfNull(config);
+            ArgumentNullException.ThrowIfNull(ilOutputService);
+            ArgumentNullException.ThrowIfNull(oldFolderAbsolutePath);
+            ArgumentNullException.ThrowIfNull(newFolderAbsolutePath);
+
+            _config = config;
+            _ilOutputService = ilOutputService;
+            _oldFolderAbsolutePath = oldFolderAbsolutePath;
+            _newFolderAbsolutePath = newFolderAbsolutePath;
             _optimizeForNetworkShares = optimizeForNetworkShares;
         }
 

Services/FolderDiffService.cs

@@ -183,12 +183,18 @@ public sealed class FolderDiffService
         /// <exception cref="ArgumentNullException">config または progressReporter または oldFolderAbsolutePath または newFolderAbsolutePath または reportsFolderAbsolutePath が null の場合。</exception>
         public FolderDiffService(ConfigSettings config, ProgressReportService progressReporter, string oldFolderAbsolutePath, string newFolderAbsolutePath, string reportsFolderAbsolutePath)
         {
-            _config = config ?? throw new ArgumentNullException(nameof(config));
-            _progressReporter = progressReporter ?? throw new ArgumentNullException(nameof(progressReporter));
+            ArgumentNullException.ThrowIfNull(config);
+            ArgumentNullException.ThrowIfNull(progressReporter);
+            ArgumentNullException.ThrowIfNull(oldFolderAbsolutePath);
+            ArgumentNullException.ThrowIfNull(newFolderAbsolutePath);
+            ArgumentNullException.ThrowIfNull(reportsFolderAbsolutePath);
+
+            _config = config;
+            _progressReporter = progressReporter;
             _progressReporter.SetLabel(SPINNER_LABEL_FOLDER_DIFF);
-            _oldFolderAbsolutePath = oldFolderAbsolutePath ?? throw new ArgumentNullException(nameof(oldFolderAbsolutePath));
-            _newFolderAbsolutePath = newFolderAbsolutePath ?? throw new ArgumentNullException(nameof(newFolderAbsolutePath));
-            _reportsFolderAbsolutePath = reportsFolderAbsolutePath ?? throw new ArgumentNullException(nameof(reportsFolderAbsolutePath));
+            _oldFolderAbsolutePath = oldFolderAbsolutePath;
+            _newFolderAbsolutePath = newFolderAbsolutePath;
+            _reportsFolderAbsolutePath = reportsFolderAbsolutePath;
             _ilOutputFolderAbsolutePath = Path.Combine(_reportsFolderAbsolutePath, IL_FOLDER_NAME);
             _ilOldFolderAbsolutePath = Path.Combine(_ilOutputFolderAbsolutePath, IL_OLD_SUB_DIR);
             _ilNewFolderAbsolutePath = Path.Combine(_ilOutputFolderAbsolutePath, IL_NEW_SUB_DIR);

Services/ILOutput/ILTextOutputService.cs

@@ -40,8 +40,11 @@ public sealed class ILTextOutputService
         /// <param name="ilNewFolderAbsolutePath">新 IL フォルダの絶対パス</param>
         public ILTextOutputService(string ilOldFolderAbsolutePath, string ilNewFolderAbsolutePath)
         {
-            _ilOldFolderAbsolutePath = ilOldFolderAbsolutePath ?? throw new ArgumentNullException(nameof(ilOldFolderAbsolutePath));
-            _ilNewFolderAbsolutePath = ilNewFolderAbsolutePath ?? throw new ArgumentNullException(nameof(ilNewFolderAbsolutePath));
+            ArgumentNullException.ThrowIfNull(ilOldFolderAbsolutePath);
+            ArgumentNullException.ThrowIfNull(ilNewFolderAbsolutePath);
+
+            _ilOldFolderAbsolutePath = ilOldFolderAbsolutePath;
+            _ilNewFolderAbsolutePath = ilNewFolderAbsolutePath;
         }
 
         /// <summary>