fix code analysis suggestions

Kentico · Nov 15, 2023 · 1689beb · 1689beb
1 parent 9a4824c
commit 1689beb
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/KenticoInspector.Core/AbstractModule.cs b/KenticoInspector.Core/AbstractModule.cs
@@ -28,7 +28,7 @@ public ModuleMetadata<T> Metadata
         {
             get
             {
-                return metadata ?? (metadata = moduleMetadataService.GetModuleMetadata<T>(Codename));
+                return metadata ??= moduleMetadataService.GetModuleMetadata<T>(Codename);
             }
         }
 
@@ -44,7 +44,7 @@ private static string GetDirectParentNamespace(Type reportType)
             var fullNameSpace = reportType.Namespace;
             var indexAfterLastPeriod = fullNameSpace.LastIndexOf('.') + 1;
 
-            return fullNameSpace.Substring(indexAfterLastPeriod, fullNameSpace.Length - indexAfterLastPeriod);
+            return fullNameSpace[indexAfterLastPeriod..];
         }
     }
 }
diff --git a/KenticoInspector.Core/Constants/ActionTags.cs b/KenticoInspector.Core/Constants/ActionTags.cs
@@ -1,6 +1,6 @@
 namespace KenticoInspector.Core.Constants
 {
-    public class ActionTags
+    public static class ActionTags
     {
         public const string Reset = "Reset";
         public const string User = "User";

diff --git a/KenticoInspector.Core/Helpers/DirectoryHelper.cs b/KenticoInspector.Core/Helpers/DirectoryHelper.cs
@@ -5,18 +5,14 @@ namespace KenticoInspector.Core.Helpers
 {
     public static class DirectoryHelper
     {
-        private const string filePrefix = "file:\\";
-
         /// <summary>
         /// Gets the executing directory of the application.
         /// </summary>
         /// <returns>A string that contains the path of the executing directory, and does not end with a backslash (\).</returns>
         public static string GetExecutingDirectory()
         {
-            var assemblyPath = Assembly.GetExecutingAssembly().CodeBase;
-            var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
-
-            return assemblyDirectory.Substring(filePrefix.Length);
+            var assemblyPath = Assembly.GetExecutingAssembly().Location;
+            return Path.GetDirectoryName(assemblyPath);
         }
     }
 }
diff --git a/KenticoInspector.Core/Helpers/VersionHelper.cs b/KenticoInspector.Core/Helpers/VersionHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 
 namespace KenticoInspector.Core.Helpers
 {
@@ -22,12 +23,13 @@ public static Version GetVersionFromShortString(string version)
 
         public static string ExpandVersionString(string version)
         {
+            var sb = new StringBuilder(version);
             for (int i = 0; i < 2; i++)
             {
-                version += ".0";
+                sb.Append(".0");
             }
 
-            return version;
+            return sb.ToString();
         }
     }
 }
diff --git a/KenticoInspector.Core/Services/Interfaces/IModuleService.cs b/KenticoInspector.Core/Services/Interfaces/IModuleService.cs
@@ -10,13 +10,14 @@ public interface IModuleService : IService
     {
         IReport GetReport(string codename);
 
-        ReportResults GetReportResults(string reportCodename, Guid instanceGuid);
+        ReportResults GetReportResults(string codename, Guid instanceGuid);
 
         IEnumerable<IReport> GetReports(Guid instanceGuid);
 
         IEnumerable<IAction> GetActions(Guid instanceGuid);
 
         IAction GetAction(string codename);
-        ActionResults ExecuteAction(string actionCodename, Guid instanceGuid, string optionsJson);
+
+        ActionResults ExecuteAction(string codename, Guid instanceGuid, string optionsJson);
     }
 }
diff --git a/KenticoInspector.Infrastructure/Services/CmsFileService.cs b/KenticoInspector.Infrastructure/Services/CmsFileService.cs
@@ -10,9 +10,14 @@ public class CmsFileService : ICmsFileService
     {
         public Dictionary<string, string> GetResourceStringsFromResx(string instanceRoot, string relativeResxFilePath = DefaultKenticoPaths.PrimaryResxFile)
         {
+            var results = new Dictionary<string, string>();
             var resourceXml = GetXmlDocument(instanceRoot, relativeResxFilePath);
             var resourceStringNodes = resourceXml?.SelectNodes("/root/data");
-            var results = new Dictionary<string, string>();
+            if (resourceStringNodes is null)
+            {
+                return results;
+            }
+
             foreach (XmlNode resourceStringNode in resourceStringNodes)
             {
                 var key = resourceStringNode.Attributes["name"].InnerText.ToLowerInvariant();

diff --git a/KenticoInspector.Infrastructure/Services/ModuleService.cs b/KenticoInspector.Infrastructure/Services/ModuleService.cs
@@ -42,9 +42,9 @@ public IEnumerable<IAction> GetActions(Guid instanceGuid)
 
         public IReport GetReport(string codename) => reportRepository.GetReport(codename);
 
-        public ReportResults GetReportResults(string reportCodename, Guid instanceGuid)
+        public ReportResults GetReportResults(string codename, Guid instanceGuid)
         {
-            var report = reportRepository.GetReport(reportCodename);
+            var report = reportRepository.GetReport(codename);
             var instance = instanceService.SetCurrentInstance(instanceGuid);
 
             databaseService.Configure(instance.DatabaseSettings);

diff --git a/KenticoInspector.Reports/ContentTreeConsistencyAnalysis/Models/CmsClassItem.cs b/KenticoInspector.Reports/ContentTreeConsistencyAnalysis/Models/CmsClassItem.cs
@@ -53,7 +53,7 @@ private List<CmsClassField> GetFieldsFromXml()
             foreach (XmlNode field in fieldsXml)
             {
                 var isIdColumnRaw = field.Attributes["isPK"]?.Value;
-                var isIdColumn = !string.IsNullOrWhiteSpace(isIdColumnRaw) ? bool.Parse(isIdColumnRaw) : false;
+                var isIdColumn = !string.IsNullOrWhiteSpace(isIdColumnRaw) && bool.Parse(isIdColumnRaw);
 
                 fields.Add(new CmsClassField
                 {

diff --git a/...coInspector.Reports/ContentTreeConsistencyAnalysis/Models/VersionHistoryMismatchResult.cs b/...coInspector.Reports/ContentTreeConsistencyAnalysis/Models/VersionHistoryMismatchResult.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Globalization;
+using System.Text;
 
 namespace KenticoInspector.Reports.ContentTreeConsistencyAnalysis.Models
 {
@@ -74,13 +75,13 @@ private void ProcessDecimalValues(string versionHistoryXmlValue, object coupledD
 
             var versionHistoryValue = decimal.Parse(versionHistoryXmlValue);
 
-            var formatting = "0.";
+            var formatting = new StringBuilder("0.");
             for (int i = 0; i < precision; i++)
             {
-                formatting += "0";
+                formatting.Append('0');
             }
 
-            VersionHistoryValue = versionHistoryValue.ToString(formatting);
+            VersionHistoryValue = versionHistoryValue.ToString(formatting.ToString());
         }
 
         private void ProcessDateTimeValues(string versionHistoryXmlValue, object coupledDataColumnValue)

diff --git a/KenticoInspector.Reports/PageTypeFieldAnalysis/Models/Data/CmsPageTypeField.cs b/KenticoInspector.Reports/PageTypeFieldAnalysis/Models/Data/CmsPageTypeField.cs
@@ -11,11 +11,6 @@ public class CmsPageTypeField
         public override bool Equals(object obj)
         {
             var comparingField = obj as CmsPageTypeField;
-            if (comparingField == null)
-            {
-                return base.Equals(obj);
-            }
-
             var fieldsAreEqual = comparingField.FieldName == FieldName && comparingField.FieldDataType == FieldDataType;
 
             return fieldsAreEqual;

diff --git a/KenticoInspector.WebApplication/Controllers/ActionsController.cs b/KenticoInspector.WebApplication/Controllers/ActionsController.cs
@@ -32,11 +32,9 @@ public Task<IEnumerable<IAction>> Get(Guid instanceGuid)
         [HttpPost("{codename}/execute/{instanceGuid}")]
         public async Task<ActionResults> Excecute(string codename, Guid instanceGuid)
         {
-            using (StreamReader reader = new StreamReader(Request.Body, Encoding.UTF8))
-            {
-                var optionsJson = await reader.ReadToEndAsync();
-                return moduleService.ExecuteAction(codename, instanceGuid, optionsJson);
-            }
+            using StreamReader reader = new(Request.Body, Encoding.UTF8);
+            var optionsJson = await reader.ReadToEndAsync();
+            return moduleService.ExecuteAction(codename, instanceGuid, optionsJson);
         }
     }
 }