Fix: Resolved most of the SonarCloud Issues

jcapellman · Aug 13, 2024 · 229c9cb · 229c9cb
1 parent 9b760b4
commit 229c9cb
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 38 deletions.
diff --git a/src/MLIDS.UnitTests/lib/DAL/CSVFileDAL.cs b/src/MLIDS.UnitTests/lib/DAL/CSVFileDAL.cs
@@ -14,7 +14,7 @@ public class CSVFileDAL
         [ExpectedException(typeof(ArgumentNullException))]
         public async Task CSVFileDAL_NullTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             await csvDal.GetHostPacketsAsync(null);
         }
@@ -23,7 +23,7 @@ public async Task CSVFileDAL_NullTestAsync()
         [ExpectedException(typeof(FileNotFoundException))]
         public async Task CSVFileDAL_StringTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             await csvDal.GetHostPacketsAsync("test");
         }
@@ -32,7 +32,7 @@ public async Task CSVFileDAL_StringTestAsync()
         [ExpectedException(typeof(ArgumentNullException))]
         public async Task CSVFileDAL_WriteNullTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var result = await csvDal.WritePacketAsync(null);
 
@@ -43,7 +43,7 @@ public async Task CSVFileDAL_WriteNullTestAsync()
         [ExpectedException(typeof(NullReferenceException))]
         public async Task CSVFileDAL_WriteEmptyTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var result = await csvDal.WritePacketAsync(new MLIDS.lib.ML.Objects.PayloadItem());
 
@@ -54,7 +54,7 @@ public async Task CSVFileDAL_WriteEmptyTestAsync()
         [ExpectedException(typeof(NullReferenceException))]
         public async Task CSVFileDAL_WriteNotEmptyTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var result = await csvDal.WritePacketAsync(new MLIDS.lib.ML.Objects.PayloadItem
             {
@@ -81,7 +81,7 @@ public async Task CSVFileDAL_WriteNotEmptyTestAsync()
         [TestMethod]
         public async Task CSVFileDAL_GetTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var initResult = csvDal.Initialize();
 
@@ -115,7 +115,7 @@ public async Task CSVFileDAL_GetTestAsync()
         [TestMethod]
         public async Task CSVFileDAL_QueryResultsAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var initResult = csvDal.Initialize();
 
@@ -150,7 +150,7 @@ public async Task CSVFileDAL_QueryResultsAsync()
         [ExpectedException(typeof(ArgumentNullException))]
         public async Task CSVFileDAL_QueryNullTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var result = await csvDal.QueryPacketsAsync(null);
 
@@ -160,7 +160,7 @@ public async Task CSVFileDAL_QueryNullTestAsync()
         [TestMethod]
         public async Task CSVFileDAL_QueryEmptyTestAsync()
         {
-            var csvDal = new MLIDS.lib.DAL.CSVFileDAL(new MLIDS.lib.Containers.SettingsItem());
+            var csvDal = new MLIDS.lib.DAL.CsvFileDal(new MLIDS.lib.Containers.SettingsItem());
 
             var result = await csvDal.QueryPacketsAsync(a => a.Label);
 

diff --git a/src/MLIDS.lib.Windows/ViewModels/BaseViewModel.cs b/src/MLIDS.lib.Windows/ViewModels/BaseViewModel.cs
@@ -25,9 +25,9 @@ public abstract class BaseViewModel : INotifyPropertyChanged
 
         public event EventHandler<string> OnFailedDAL;
 
-        private List<BaseDAL> _dataLayers;
+        private List<BaseDal> _dataLayers;
 
-        public List<BaseDAL> DataLayers
+        public List<BaseDal> DataLayers
         {
             get => _dataLayers;
 
@@ -39,9 +39,9 @@ public List<BaseDAL> DataLayers
             }
         }
 
-        private BaseDAL _selectedDataLayer;
+        private BaseDal _selectedDataLayer;
 
-        public BaseDAL SelectedDataLayer
+        public BaseDal SelectedDataLayer
         {
             get => _selectedDataLayer;
 
@@ -194,7 +194,7 @@ protected BaseViewModel()
 
             DataLayers = DALHelper.GetAvailableDALs(Settings);
 
-            SelectedDataLayer = DataLayers.FirstOrDefault(a => !a.IsSelectable);
+            SelectedDataLayer = DataLayers.First(a => !a.IsSelectable);
         }
 
         /// <exception cref="System.ArgumentNullException">JSON or Filename is null</exception>

diff --git a/src/MLIDS.lib/DAL/Base/BaseDAL.cs b/src/MLIDS.lib/DAL/Base/BaseDAL.cs
@@ -7,14 +7,11 @@
 
 namespace MLIDS.lib.DAL.Base
 {
-    public abstract class BaseDAL
+    public abstract class BaseDal
     {
         protected SettingsItem settingsItem;
 
-        protected BaseDAL(SettingsItem settingsItem)
-        {
-            this.settingsItem = settingsItem ?? throw new ArgumentNullException(nameof(settingsItem));
-        }
+        protected BaseDal(SettingsItem settingsItem) => this.settingsItem = settingsItem ?? throw new ArgumentNullException(nameof(settingsItem));
 
         public abstract string Description { get; }
 

diff --git a/src/MLIDS.lib/DAL/CSVFileDAL.cs b/src/MLIDS.lib/DAL/CSVFileDAL.cs
@@ -13,7 +13,7 @@
 
 namespace MLIDS.lib.DAL
 {
-    public class CSVFileDAL : BaseDAL
+    public class CsvFileDal : BaseDal
     {
         public class CSVWriter
         {
@@ -41,7 +41,7 @@ public async Task WriteToFileAsync(string text)
 
         private string _fileName;
 
-        public CSVFileDAL(SettingsItem settingsItem) : base(settingsItem)
+        public CsvFileDal(SettingsItem settingsItem) : base(settingsItem)
         {
         }
 

diff --git a/src/MLIDS.lib/DAL/EmptyDAL.cs b/src/MLIDS.lib/DAL/EmptyDAL.cs
@@ -9,7 +9,7 @@
 
 namespace MLIDS.lib.DAL
 {
-    public class EmptyDAL : BaseDAL
+    public class EmptyDAL : BaseDal
     {
         public override string Description => "--Select a Data Layer--";
 

diff --git a/src/MLIDS.lib/DAL/JsonFileDAL.cs b/src/MLIDS.lib/DAL/JsonFileDAL.cs
@@ -12,7 +12,7 @@
 
 namespace MLIDS.lib.DAL
 {
-    public class JsonFileDAL : BaseDAL
+    public class JsonFileDAL : BaseDal
     {
         private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
 

diff --git a/src/MLIDS.lib/DAL/LiteDBDAL.cs b/src/MLIDS.lib/DAL/LiteDBDAL.cs
@@ -12,7 +12,7 @@
 
 namespace MLIDS.lib.DAL
 {
-    public class LiteDBDAL : BaseDAL
+    public class LiteDBDAL : BaseDal
     {
         private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
 
@@ -73,7 +73,7 @@ public override bool Initialize()
                 return true;
             } catch (Exception ex)
             {
-                Log.Error($"LiteDBDAL::Initialize - Exception when loading: {ex}");
+                Log.Error("LiteDBDAL::Initialize - Exception when loading: {ex}", ex);
 
                 return false;
             }

diff --git a/src/MLIDS.lib/DAL/MongoDAL.cs b/src/MLIDS.lib/DAL/MongoDAL.cs
@@ -10,7 +10,7 @@
 
 namespace MLIDS.lib.DAL
 {
-    public class MongoDAL : BaseDAL
+    public class MongoDAL : BaseDal
     {
         private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
 

diff --git a/src/MLIDS.lib/Helpers/DALHelper.cs b/src/MLIDS.lib/Helpers/DALHelper.cs
@@ -9,16 +9,16 @@ namespace MLIDS.lib.Helpers
 {
     public static class DALHelper
     {
-        public static List<BaseDAL> GetAvailableDALs(SettingsItem settings)
+        public static List<BaseDal> GetAvailableDALs(SettingsItem settings)
         {
             if (settings == null)
             {
                 throw new ArgumentNullException(nameof(settings));
             }
 
-            return typeof(DALHelper).Assembly.GetTypes().Where(a => typeof(BaseDAL) ==
+            return typeof(DALHelper).Assembly.GetTypes().Where(a => typeof(BaseDal) ==
                 a.BaseType && !a.IsAbstract).Select(b =>
-                (BaseDAL)Activator.CreateInstance(b, settings)).OrderByDescending(c =>
+                (BaseDal)Activator.CreateInstance(b, settings)).OrderByDescending(c =>
                 !c.IsSelectable).ThenBy(d => d.Description).ToList();
         }             
     }

diff --git a/src/MLIDS.lib/ML/Trainer.cs b/src/MLIDS.lib/ML/Trainer.cs
@@ -41,7 +41,7 @@ public Trainer()
             return (_mlContext.Data.TrainTestSplit(trainingDataView, seed: Constants.ML_SEED), cleanDataLength, maliciousDataLength);
         }
 
-        private static void ValidateArguments(BaseDAL storage, string modelFileName)
+        private static void ValidateArguments(BaseDal storage, string modelFileName)
         {
             if (storage == null)
             {
@@ -65,7 +65,7 @@ private static void ValidateArguments(BaseDAL storage, string modelFileName)
             }
         }
 
-        public async Task<ModelMetrics> GenerateModel(BaseDAL storage, string modelFileName)
+        public async Task<ModelMetrics> GenerateModel(BaseDal storage, string modelFileName)
         {
             ValidateArguments(storage, modelFileName);
 

diff --git a/src/MLIDS.lib/Models/Base/BaseModelRunner.cs b/src/MLIDS.lib/Models/Base/BaseModelRunner.cs
@@ -7,6 +7,6 @@ public abstract class BaseModelRunner
     {
         public abstract string ModelTypeName { get; }
 
-        protected abstract bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem);
+        protected abstract bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem);
     }
 }
diff --git a/src/MLIDS.lib/Models/FastTreeRunner.cs b/src/MLIDS.lib/Models/FastTreeRunner.cs
@@ -10,7 +10,7 @@ public class FastTreeRunner : BaseModelRunner
     {
         public override string ModelTypeName => "FastTree";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new NotImplementedException();
         }

diff --git a/src/MLIDS.lib/Models/GamBinaryRunner.cs b/src/MLIDS.lib/Models/GamBinaryRunner.cs
@@ -10,7 +10,7 @@ public class GamBinaryRunner : BaseModelRunner
     {
         public override string ModelTypeName => "GAM (Binary)";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new NotImplementedException();
         }

diff --git a/src/MLIDS.lib/Models/KMeansRunner.cs b/src/MLIDS.lib/Models/KMeansRunner.cs
@@ -10,7 +10,7 @@ public class KMeansRunner : BaseModelRunner
     {
         public override string ModelTypeName => "K-Means";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new NotImplementedException();
         }

diff --git a/src/MLIDS.lib/Models/LightGBMBinaryRunner.cs b/src/MLIDS.lib/Models/LightGBMBinaryRunner.cs
@@ -8,7 +8,7 @@ public class LightGBMBinaryRunner : BaseModelRunner
     {
         public override string ModelTypeName => "LightGBM (Binary)";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new System.NotImplementedException();
         }

diff --git a/src/MLIDS.lib/Models/RandomizedPCARunner.cs b/src/MLIDS.lib/Models/RandomizedPCARunner.cs
@@ -10,7 +10,7 @@ public class RandomizedPCARunner : BaseModelRunner
     {
         public override string ModelTypeName => "Randomized PCA";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new NotImplementedException();
         }

diff --git a/src/MLIDS.lib/Models/TensorFlowRunner.cs b/src/MLIDS.lib/Models/TensorFlowRunner.cs
@@ -10,7 +10,7 @@ public class TensorFlowRunner : BaseModelRunner
     {
         public override string ModelTypeName => "TensorFlow";
 
-        protected override bool Run(string modelFile, BaseDAL dataLayer, SettingsItem settingsItem)
+        protected override bool Run(string modelFile, BaseDal dataLayer, SettingsItem settingsItem)
         {
             throw new NotImplementedException();
         }