From 1dc3261f451744a12656b8c828fc0b94b248ef95 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Thu, 7 Dec 2023 11:52:43 +0530 Subject: [PATCH] sonar qube fixes --- .../ConanPackageDownloader.cs | 25 ------------------- src/LCT.SW360PackageCreator/Program.cs | 3 +-- src/LCT.SW360PackageCreator/URLHelper.cs | 7 ++++++ 3 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 src/LCT.SW360PackageCreator/ConanPackageDownloader.cs diff --git a/src/LCT.SW360PackageCreator/ConanPackageDownloader.cs b/src/LCT.SW360PackageCreator/ConanPackageDownloader.cs deleted file mode 100644 index e394965c..00000000 --- a/src/LCT.SW360PackageCreator/ConanPackageDownloader.cs +++ /dev/null @@ -1,25 +0,0 @@ -using LCT.Common.Model; -using LCT.SW360PackageCreator.Interfaces; -using LCT.SW360PackageCreator.Model; -using log4net; -using System.Collections.Generic; -using System.Reflection; -using System.Threading.Tasks; - -namespace LCT.SW360PackageCreator -{ - - public class ConanPackageDownloader: IPackageDownloader - { - public async Task DownloadPackage(ComparisonBomData component, string localPathforDownload) - { - string path = Download(component, localPathforDownload); - await Task.Delay(10); - return path; - } - private static string Download(ComparisonBomData component, string downloadPath) - { - return ""; - } - } -} diff --git a/src/LCT.SW360PackageCreator/Program.cs b/src/LCT.SW360PackageCreator/Program.cs index 0a29c66c..81fe28be 100644 --- a/src/LCT.SW360PackageCreator/Program.cs +++ b/src/LCT.SW360PackageCreator/Program.cs @@ -107,8 +107,7 @@ private static async Task InitiatePackageCreatorProcess(CommonAppSettings appSet { { "NPM", new PackageDownloader() }, { "NUGET", new PackageDownloader() }, - { "DEBIAN", new DebianPackageDownloader(debianPatcher) }, - { "CONAN", new ConanPackageDownloader() } + { "DEBIAN", new DebianPackageDownloader(debianPatcher) } }; ICreatorHelper creatorHelper = new CreatorHelper(_packageDownloderList); diff --git a/src/LCT.SW360PackageCreator/URLHelper.cs b/src/LCT.SW360PackageCreator/URLHelper.cs index c0fd44de..f2524640 100644 --- a/src/LCT.SW360PackageCreator/URLHelper.cs +++ b/src/LCT.SW360PackageCreator/URLHelper.cs @@ -32,6 +32,7 @@ using Microsoft.Web.Administration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using YamlDotNet.Core; using YamlDotNet.Core.Tokens; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; @@ -197,6 +198,12 @@ public async Task GetSourceUrlForConanPackage(string componentName, stri $"Exclude if it is an internal component or manually update the SRC url"); Logger.Debug($"GetSourceUrlForConanPackage()", ex); } + catch(YamlException ex) + { + Logger.Warn($"Identification of SRC url failed for {componentName}, " + + $"Exclude if it is an internal component or manually update the SRC url"); + Logger.Debug($"GetSourceUrlForConanPackage()", ex); + } catch (ArgumentNullException ex) { Logger.Debug($"GetSourceUrlForConanPackage()", ex);