From 315ba649d70a5ddb4abf1bac83d5b85af456f54b Mon Sep 17 00:00:00 2001 From: Carolina Oliveira <61292734+CarolinaOliiveira@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:41:23 +0100 Subject: [PATCH] Fix codacy issues Signed-off-by: Carolina Oliveira <61292734+CarolinaOliiveira@users.noreply.github.com> Signed-off-by: Carolina Oliveira <61292734+CarolinaOliiveira@users.noreply.github.com> --- .../Converters/v2_3/Helpers/Bom/Creators.cs | 7 +- .../Converters/v2_3/Helpers/Bom/Files.cs | 4 +- .../v2_3/Helpers/Component/Checksums.cs | 4 +- .../v2_3/Helpers/Component/ExternalRefs.cs | 64 ++++++++++--------- .../v2_3/Helpers/CycloneDXBomHelpers.cs | 8 +-- .../v2_3/Helpers/SpdxDocumentHelpers.cs | 4 +- .../Converters/v2_3/SpdxDocumentConverters.cs | 4 +- 7 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Creators.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Creators.cs index 7547909c..4cf8800a 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Creators.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Creators.cs @@ -66,10 +66,9 @@ public static void AddSpdxCreators(this Bom bom, List creators) var toolMatch = toolRegex.Match(creator); if (toolMatch.Success) { - if (bom.Metadata == null) bom.Metadata = new Metadata(); + if (bom.Metadata == null) { bom.Metadata = new Metadata(); } #pragma warning disable 618 - if (bom.Metadata?.Tools?.Tools == null) - bom.Metadata.Tools = new ToolChoices { Tools = new List() }; + if (bom.Metadata?.Tools?.Tools == null) { bom.Metadata.Tools = new ToolChoices { Tools = new List() }; } bom.Metadata.Tools.Tools.Add(new Tool { Name = toolMatch.Groups["name"].ToString(), Version = toolMatch.Groups["version"].ToString(), @@ -81,7 +80,7 @@ public static void AddSpdxCreators(this Bom bom, List creators) var nonToolMatch = nonToolRegex.Match(creator); if (nonToolMatch.Success) { - if (bom.Metadata.Authors == null) bom.Metadata.Authors = new List(); + if (bom.Metadata.Authors == null) { bom.Metadata.Authors = new List(); } bom.Metadata.Authors.Add(new OrganizationalContact { Name = nonToolMatch.Groups["name"].ToString(), diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Files.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Files.cs index a6bd10ef..df15b1c8 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Files.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Bom/Files.cs @@ -90,9 +90,7 @@ public static List GetSpdxFiles(this Bom bom) public static void AddSpdxFiles(this Bom bom, List files) { - if (files != null && files.Count > 0) - { - if (bom.Components == null) bom.Components = new List(); + if (files != null && files.Count > 0) { bom.Components = new List(); } foreach (var file in files) { var component = new Component diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/Checksums.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/Checksums.cs index 2761062a..a41ebf3e 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/Checksums.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/Checksums.cs @@ -175,8 +175,8 @@ public static void AddSpdxChecksums(this Component component, List che { if (checksums != null && checksums.Count > 0) { - if (component.Properties == null) component.Properties = new List(); - if (component.Hashes == null) component.Hashes = new List(); + if (component.Properties == null) { component.Properties = new List(); } + if (component.Hashes == null) {component.Hashes = new List();} foreach (var checksum in checksums) { switch (checksum.Algorithm) diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/ExternalRefs.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/ExternalRefs.cs index 5505a69c..554e78a9 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/ExternalRefs.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/ExternalRefs.cs @@ -40,36 +40,38 @@ public static List GetSpdxExternalRefs(this Component component) extRef.ReferenceCategory = ExternalRefCategory.OTHER; extRef.ReferenceType = extRefProp.Name.Substring(PropertyTaxonomy.EXTERNAL_REFERENCE_OTHER.Length + 1); } - else switch (extRefProp.Name) - { - case PropertyTaxonomy.EXTERNAL_REFERENCE_SECURITY_CPE22: - extRef.ReferenceCategory = ExternalRefCategory.SECURITY; - extRef.ReferenceType = "cpe22Type"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_SECURITY_CPE23: - extRef.ReferenceCategory = ExternalRefCategory.SECURITY; - extRef.ReferenceType = "cpe23Type"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_MAVEN_CENTRAL: - extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; - extRef.ReferenceType = "maven-central"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_NPM: - extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; - extRef.ReferenceType = "npm"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_NUGET: - extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; - extRef.ReferenceType = "nuget"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_BOWER: - extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; - extRef.ReferenceType = "bower"; - break; - case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_PURL: - extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; - extRef.ReferenceType = "purl"; - break; + else { + switch (extRefProp.Name) + { + case PropertyTaxonomy.EXTERNAL_REFERENCE_SECURITY_CPE22: + extRef.ReferenceCategory = ExternalRefCategory.SECURITY; + extRef.ReferenceType = "cpe22Type"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_SECURITY_CPE23: + extRef.ReferenceCategory = ExternalRefCategory.SECURITY; + extRef.ReferenceType = "cpe23Type"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_MAVEN_CENTRAL: + extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; + extRef.ReferenceType = "maven-central"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_NPM: + extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; + extRef.ReferenceType = "npm"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_NUGET: + extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; + extRef.ReferenceType = "nuget"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_BOWER: + extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; + extRef.ReferenceType = "bower"; + break; + case PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_PURL: + extRef.ReferenceCategory = ExternalRefCategory.PACKAGE_MANAGER; + extRef.ReferenceType = "purl"; + break; + } //TODO add this back in once the SPDX JSON schema is fixed https://github.com/spdx/spdx-spec/issues/612 //TODO and write corresponding code in AddExternalRefsToCDX // case PropertyTaxonomy.EXTERNAL_REFERENCE_PERSISTENT_ID_SWH: @@ -95,7 +97,7 @@ public static void AddSpdxExternalRefs(this Component component, List 0) { - if (component.Properties == null) component.Properties = new List(); + if (component.Properties == null) { component.Properties = new List(); } foreach (var extRef in externalRefs) { string refPropName = null; diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs index 15d3efcc..5b1690a4 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs @@ -29,7 +29,7 @@ public static class CycloneDXBomHelpers public static void AddSpdxPackages(this Bom bom, SpdxDocument doc) { if (doc.Packages == null || doc.Packages.Count == 0) { return; } - if (bom.Components == null) bom.Components = new List(); + if (bom.Components == null) { bom.Components = new List(); } foreach (var package in doc.Packages) { var component = new Component @@ -88,8 +88,8 @@ public static void AddSpdxPackages(this Bom bom, SpdxDocument doc) if (package.LicenseInfoFromFiles != null && package.LicenseInfoFromFiles.Count > 0) { - if (component.Evidence == null) component.Evidence = new Evidence(); - if (component.Evidence.Licenses == null) component.Evidence.Licenses = new List(); + if (component.Evidence == null) { component.Evidence = new Evidence(); } + if (component.Evidence.Licenses == null) { component.Evidence.Licenses = new List(); } foreach (var licenseInfo in package.LicenseInfoFromFiles) { if (licenseInfo.StartsWith("LicenseRef-") @@ -211,7 +211,7 @@ public static void AddSpdxPackages(this Bom bom, SpdxDocument doc) if (package.DownloadLocation != null) { - if (component.ExternalReferences == null) component.ExternalReferences = new List(); + if (component.ExternalReferences == null) { component.ExternalReferences = new List(); } component.ExternalReferences.Add(new ExternalReference { Type = ExternalReference.ExternalReferenceType.Distribution, diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/SpdxDocumentHelpers.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/SpdxDocumentHelpers.cs index baed3716..49b21d73 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/SpdxDocumentHelpers.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/SpdxDocumentHelpers.cs @@ -112,7 +112,7 @@ public static void AddCycloneDXComponents(this SpdxDocument doc, Bom bom) // LicenseInfoFromFiles if (component.Evidence?.Licenses != null && component.Evidence.Licenses.Count > 0) { - if (package.LicenseInfoFromFiles == null) package.LicenseInfoFromFiles = new List(); + if (package.LicenseInfoFromFiles == null) { package.LicenseInfoFromFiles = new List(); } foreach (var license in component.Evidence.Licenses) { if (license.Expression != null) @@ -128,7 +128,7 @@ public static void AddCycloneDXComponents(this SpdxDocument doc, Bom bom) } else { - if (doc.HasExtractedLicensingInfos == null) doc.HasExtractedLicensingInfos = new List(); + if (doc.HasExtractedLicensingInfos == null) { doc.HasExtractedLicensingInfos = new List(); } var extLicInfo = new ExtractedLicensingInfo { LicenseId = $"LicenseRef-{doc.HasExtractedLicensingInfos.Count + 1}", diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/SpdxDocumentConverters.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/SpdxDocumentConverters.cs index 1f447e68..28d96003 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/SpdxDocumentConverters.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/SpdxDocumentConverters.cs @@ -27,7 +27,7 @@ public static class SpdxDocumentConverters { public static SpdxDocument ToSpdx(this Bom bom) { - var doc = new SpdxDocument() + var doc = new SpdxDocument { CreationInfo = new CreationInfo(), }; @@ -90,7 +90,7 @@ public static SpdxDocument ToSpdx(this Bom bom) public static Bom ToCycloneDX(this SpdxDocument doc) { - var bom = new Bom() + var bom = new Bom { Metadata = new Metadata {