fix: CA1829, CA1834, CA1846, CA1847 (#338)

* CA1829

* CA1834

* CA1846, CA1847

* updated if statement condition

* added JSON002 as suggestion

* pr snapshot

* spdx elements count

* removed JSON22 suggestion

* if statement syntax update

Co-authored-by: Jamie Magee <[email protected]>

* updated if statement

* if statement

* removed extra '?'

* verifying snapshots early success

* short if statement syntax

Co-authored-by: Daniel Akili <[email protected]>
Co-authored-by: Jamie Magee <[email protected]>

Author: 3 people

.editorconfig

@@ -621,9 +621,6 @@ dotnet_diagnostic.CA1725.severity = suggestion
 # CA1805: Do not initialize unnecessarily
 dotnet_diagnostic.CA1805.severity = suggestion
 
-# CA1846: Prefer 'AsSpan' over 'Substring'
-dotnet_diagnostic.CA1846.severity = suggestion
-
 # CA1806: Do not ignore method results
 dotnet_diagnostic.CA1806.severity = suggestion
 
@@ -684,9 +681,6 @@ dotnet_diagnostic.CA1508.severity = suggestion
 # CA1823: Avoid unused private fields
 dotnet_diagnostic.CA1823.severity = suggestion
 
-# CA1829: Use Length/Count property instead of Count() when available
-dotnet_diagnostic.CA1829.severity = suggestion
-
 # CA2234: Pass system uri objects instead of strings
 dotnet_diagnostic.CA2234.severity = suggestion
 
@@ -699,9 +693,6 @@ dotnet_diagnostic.CA2219.severity = suggestion
 # CA2201: Exception type System.Exception is not sufficiently specific
 dotnet_diagnostic.CA2201.severity = suggestion
 
-# CA1847: Use char literal for a single character lookup
-dotnet_diagnostic.CA1847.severity = suggestion
-
 # CA1835: Prefer the 'Memory'-based overloads for 'ReadAsync' and 'WriteAsync'
 dotnet_diagnostic.CA1835.severity = suggestion
 
@@ -720,9 +711,6 @@ dotnet_diagnostic.CA1837.severity = suggestion
 # CA1024: Use properties where appropriate
 dotnet_diagnostic.CA1024.severity = suggestion
 
-# CA1834: Consider using 'StringBuilder.Append(char)' when applicable
-dotnet_diagnostic.CA1834.severity = suggestion
-
 # SA1202: Elements should be ordered by access
 dotnet_diagnostic.SA1202.severity = suggestion
 
@@ -786,3 +774,6 @@ dotnet_diagnostic.CA1852.severity = suggestion
 
 # CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method
 dotnet_diagnostic.CA1854.severity = suggestion
+
+# JSON002: Probable JSON string detected
+dotnet_diagnostic.JSON002.severity = suggestion

src/Microsoft.ComponentDetection.Detectors/spdx/Spdx22ComponentDetector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.IO;
@@ -91,7 +91,7 @@ private SpdxComponent ConvertJObjectToSbomComponent(ProcessRequest processReques
             var name = document["name"]?.ToString();
             var spdxVersion = document["spdxVersion"]?.ToString();
 
-            if (rootElements != null && rootElements.Count() > 1)
+            if (rootElements?.Length > 1)
             {
                 this.Logger.LogWarning($"SPDX file at {processRequest.ComponentStream.Location} has more than one element in documentDescribes, first will be selected as root element.");
             }

src/Microsoft.ComponentDetection.Detectors/yarn/Parsers/YarnLockParser.cs

@@ -117,7 +117,7 @@ private Func<string, string> GenerateBlockTitleNormalizer(YarnBlock block)
             //    resolved "https://registry.Yarnpkg.com/nyc/-/nyc-10.0.0.tgz#95bd4a2c3487f33e1e78f213c6d5a53d88074ce6"
             return blockTitleMember =>
             {
-                if (blockTitleMember.Contains("@"))
+                if (blockTitleMember.Contains('@'))
                 {
                     return blockTitleMember;
                 }
@@ -140,7 +140,7 @@ private bool TryReadNameAndSatisfiedVersion(string nameVersionPairing, out Tuple
             workingString = workingString.TrimEnd(':');
             workingString = workingString.Trim('\"');
             var startsWithAtSign = false;
-            if (workingString.StartsWith("@"))
+            if (workingString.StartsWith('@'))
             {
                 startsWithAtSign = true;
                 workingString = workingString.TrimStart('@');

test/Microsoft.ComponentDetection.Detectors.Tests/RustDependencySpecifierTest.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentAssertions;
 using Microsoft.ComponentDetection.Detectors.Rust;
 using Microsoft.ComponentDetection.Detectors.Rust.Contracts;

test/Microsoft.ComponentDetection.Detectors.Tests/SPDX22ComponentDetectorTests.cs

@@ -118,7 +118,7 @@ public async Task TestSbomDetector_SimpleSbom()
                 Encoding.UTF8.GetBytes(spdxFile))).Replace("-", string.Empty).ToLower();
 #pragma warning restore CA5350
 
-            Assert.AreEqual(1, components.Count());
+            Assert.AreEqual(1, components.Count);
             Assert.AreEqual(sbomComponent.Name, "Test 1.0.0");
             Assert.AreEqual(sbomComponent.RootElementId, "SPDXRef-RootPackage");
             Assert.AreEqual(sbomComponent.DocumentNamespace, new Uri("https://sbom.microsoft/Test/1.0.0/61de1a5-57cc-4732-9af5-edb321b4a7ee"));

test/Microsoft.ComponentDetection.Detectors.Tests/VcpkgComponentDetectorTests.cs

@@ -64,7 +64,7 @@ public async Task TestNlohmann()
                 throw new AssertFailedException($"{nameof(sbomComponent)} is null");
             }
 
-            Assert.AreEqual(1, components.Count());
+            Assert.AreEqual(1, components.Count);
             Assert.AreEqual("nlohmann-json", sbomComponent.Name);
             Assert.AreEqual("3.10.4", sbomComponent.Version);
             Assert.AreEqual(5, sbomComponent.PortVersion);
@@ -117,7 +117,7 @@ public async Task TestTinyxmlAndResource()
             var detectedComponents = componentRecorder.GetDetectedComponents();
             var components = detectedComponents.ToList();
 
-            Assert.AreEqual(2, components.Count());
+            Assert.AreEqual(2, components.Count);
             var sbomComponent = (VcpkgComponent)components.FirstOrDefault(c => ((VcpkgComponent)c?.Component).SPDXID.Equals("SPDXRef-binary")).Component;
             Assert.IsNotNull(sbomComponent);
             Assert.AreEqual("tinyxml2:x64-linux", sbomComponent.Name);

test/Microsoft.ComponentDetection.Detectors.Tests/YarnLockDetectorTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -859,7 +859,7 @@ public async Task MalformedYarnLockV1_Duplicate()
         private string CreatePackageJsonFileContent(IList<YarnTestComponentDefinition> components)
         {
             var builder = new StringBuilder();
-            builder.Append("{");
+            builder.Append('{');
             builder.Append(@"""name"": ""test"",");
             builder.Append(@"""version"": ""0.0.0"",");
             builder.Append(@"""dependencies"": {");
@@ -877,11 +877,11 @@ private string CreatePackageJsonFileContent(IList<YarnTestComponentDefinition> c
                 }
             }
 
-            builder.Append("}");
+            builder.Append('}');
 
             if (components.Any(component => component.IsDevDependency))
             {
-                builder.Append(",");
+                builder.Append(',');
                 builder.Append(@"""devDependencies"": {");
 
                 var dependencyComponents = components.Where(c => c.IsDevDependency).ToList();
@@ -899,8 +899,8 @@ private string CreatePackageJsonFileContent(IList<YarnTestComponentDefinition> c
                 }
             }
 
-            builder.Append("}");
-            builder.Append("}");
+            builder.Append('}');
+            builder.Append('}');
 
             return builder.ToString();
         }