From 2e9439bb2ef53bb20c92986698b1bda5f4d0181e Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 4 Jan 2023 17:47:37 +0100 Subject: [PATCH] Fix SonarQube's "'Any()' should be used to test for emptiness" / Code Smell (#3404) --- src/Agent.Plugins/Artifact/PipelineArtifactServer.cs | 2 +- src/Agent.Sdk/ProcessInvoker.Windows.cs | 2 +- src/Agent.Worker/Build/TrackingManager.cs | 4 ++-- src/Agent.Worker/CodeCoverage/CodeCoverageCommands.cs | 4 ++-- src/Agent.Worker/Release/ReleaseTrackingManager.cs | 4 ++-- src/Agent.Worker/TaskManager.cs | 2 +- src/Test/L0/Listener/CommandSettingsL0.cs | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Agent.Plugins/Artifact/PipelineArtifactServer.cs b/src/Agent.Plugins/Artifact/PipelineArtifactServer.cs index eeba92396f..3cd9063f9f 100644 --- a/src/Agent.Plugins/Artifact/PipelineArtifactServer.cs +++ b/src/Agent.Plugins/Artifact/PipelineArtifactServer.cs @@ -176,7 +176,7 @@ internal async Task DownloadAsync( } IEnumerable pipelineArtifacts = artifacts.Where(a => string.Equals(a.Resource.Type, PipelineArtifactConstants.PipelineArtifact, StringComparison.OrdinalIgnoreCase)); - if (pipelineArtifacts.Count() == 0) + if (!pipelineArtifacts.Any()) { throw new ArgumentException("Could not find any pipeline artifacts in the build."); } diff --git a/src/Agent.Sdk/ProcessInvoker.Windows.cs b/src/Agent.Sdk/ProcessInvoker.Windows.cs index 02e25e03da..09c83231e7 100644 --- a/src/Agent.Sdk/ProcessInvoker.Windows.cs +++ b/src/Agent.Sdk/ProcessInvoker.Windows.cs @@ -134,7 +134,7 @@ private void WindowsKillProcessTree() Trace.Verbose($"Start killing process tree of process '{pid.Value}'."); Stack processesNeedtoKill = new Stack(); processesNeedtoKill.Push(new ProcessTerminationInfo(pid.Value, false)); - while (processesNeedtoKill.Count() > 0) + while (processesNeedtoKill.Any()) { ProcessTerminationInfo procInfo = processesNeedtoKill.Pop(); List childProcessesIds = new List(); diff --git a/src/Agent.Worker/Build/TrackingManager.cs b/src/Agent.Worker/Build/TrackingManager.cs index dd65956ec5..802fb19539 100644 --- a/src/Agent.Worker/Build/TrackingManager.cs +++ b/src/Agent.Worker/Build/TrackingManager.cs @@ -338,7 +338,7 @@ public void DisposeCollectedGarbage(IExecutionContext executionContext) } IEnumerable gcTrackingFiles = Directory.EnumerateFiles(gcDirectory, "*.json"); - if (gcTrackingFiles == null || gcTrackingFiles.Count() == 0) + if (gcTrackingFiles == null || !gcTrackingFiles.Any()) { executionContext.Output(StringUtil.Loc("GCDirIsEmpty", gcDirectory)); return; @@ -346,7 +346,7 @@ public void DisposeCollectedGarbage(IExecutionContext executionContext) Trace.Info($"Find {gcTrackingFiles.Count()} GC tracking files."); - if (gcTrackingFiles.Count() > 0) + if (gcTrackingFiles.Any()) { foreach (string gcFile in gcTrackingFiles) { diff --git a/src/Agent.Worker/CodeCoverage/CodeCoverageCommands.cs b/src/Agent.Worker/CodeCoverage/CodeCoverageCommands.cs index b88a5a511c..81d65728eb 100644 --- a/src/Agent.Worker/CodeCoverage/CodeCoverageCommands.cs +++ b/src/Agent.Worker/CodeCoverage/CodeCoverageCommands.cs @@ -69,7 +69,7 @@ public void Execute(IExecutionContext context, Command command) context.Output(StringUtil.Loc("ReadingCodeCoverageSummary", _summaryFileLocation)); var coverageData = reader.GetCodeCoverageSummary(context, _summaryFileLocation); - if (coverageData == null || coverageData.Count() == 0) + if (coverageData == null || !coverageData.Any()) { context.Warning(StringUtil.Loc("CodeCoverageDataIsNull")); } @@ -95,7 +95,7 @@ private async Task PublishCodeCoverageAsync( CancellationToken cancellationToken) { //step 2: publish code coverage summary to TFS - if (coverageData != null && coverageData.Count() > 0) + if (coverageData != null && coverageData.Any()) { commandContext.Output(StringUtil.Loc("PublishingCodeCoverage")); foreach (var coverage in coverageData) diff --git a/src/Agent.Worker/Release/ReleaseTrackingManager.cs b/src/Agent.Worker/Release/ReleaseTrackingManager.cs index 35a8e459ea..fb27caddfc 100644 --- a/src/Agent.Worker/Release/ReleaseTrackingManager.cs +++ b/src/Agent.Worker/Release/ReleaseTrackingManager.cs @@ -130,7 +130,7 @@ public void DisposeCollectedGarbage(IExecutionContext executionContext) } IEnumerable gcTrackingFiles = Directory.EnumerateFiles(gcDirectory, "*.json"); - if (gcTrackingFiles == null || gcTrackingFiles.Count() == 0) + if (gcTrackingFiles == null || !gcTrackingFiles.Any()) { executionContext.Output(StringUtil.Loc("GCReleaseDirIsEmpty", gcDirectory)); return; @@ -138,7 +138,7 @@ public void DisposeCollectedGarbage(IExecutionContext executionContext) Trace.Info($"Find {gcTrackingFiles.Count()} GC tracking files."); - if (gcTrackingFiles.Count() > 0) + if (gcTrackingFiles.Any()) { foreach (string gcFile in gcTrackingFiles) { diff --git a/src/Agent.Worker/TaskManager.cs b/src/Agent.Worker/TaskManager.cs index 5d289cce66..c8739a9a35 100644 --- a/src/Agent.Worker/TaskManager.cs +++ b/src/Agent.Worker/TaskManager.cs @@ -60,7 +60,7 @@ from task in tasks into taskGrouping select taskGrouping.First(); - if (uniqueTasks.Count() == 0) + if (!uniqueTasks.Any()) { executionContext.Debug("There is no required tasks need to download."); return; diff --git a/src/Test/L0/Listener/CommandSettingsL0.cs b/src/Test/L0/Listener/CommandSettingsL0.cs index 70219c9814..f789e08f13 100644 --- a/src/Test/L0/Listener/CommandSettingsL0.cs +++ b/src/Test/L0/Listener/CommandSettingsL0.cs @@ -1153,7 +1153,7 @@ public void ValidateCommands() var command = new CommandSettings(hc, args: new string[] { "badcommand" }); // Assert. - Assert.True(command.ParseErrors.Count() > 0); + Assert.True(command.ParseErrors.Any()); } } @@ -1168,7 +1168,7 @@ public void ValidateFlags() var command = new CommandSettings(hc, args: new string[] { "--badflag" }); // Assert. - Assert.True(command.ParseErrors.Count() > 0); + Assert.True(command.ParseErrors.Any()); } } @@ -1183,7 +1183,7 @@ public void ValidateArgs() var command = new CommandSettings(hc, args: new string[] { "--badargname", "bad arg value" }); // Assert. - Assert.True(command.ParseErrors.Count() > 0); + Assert.True(command.ParseErrors.Any()); } }