IDE code cleanup run

PBIXInspectorCLI/Program.cs

@@ -1,15 +1,13 @@
 using PBIXInspectorLibrary;
-using PBIXInspectorLibrary.Output;
 using PBIXInspectorWinLibrary;
-using PBIXInspectorWinLibrary.Drawing;
 using PBIXInspectorWinLibrary.Utils;
 
 internal partial class Program
 {
     private static Args _parsedArgs = null;
 
     private static void Main(string[] args)
-    { 
+    {
 #if DEBUG
         Console.WriteLine("Attach debugger to process? Press any key to continue.");
         Console.ReadLine();
@@ -20,7 +18,7 @@ private static void Main(string[] args)
             _parsedArgs = ArgsUtils.ParseArgs(args);
 
             Welcome();
-            
+
             PBIXInspectorWinLibrary.Main.WinMessageIssued += Main_MessageIssued;
             PBIXInspectorWinLibrary.Main.Run(_parsedArgs);
 
@@ -76,7 +74,7 @@ private static String FormatConsoleMessage(MessageTypeEnum messageType, string m
         string template = _parsedArgs.ADOOutput ? Constants.ADOLogIssueTemplate : "{0}";
         string msgType = _parsedArgs.ADOOutput ? messageType.ToString().ToLower() : messageType.ToString();
         string msgSeparator = _parsedArgs.ADOOutput ? "" : ": ";
-        string messageTypeFormat = string.Format(template,msgType);
+        string messageTypeFormat = string.Format(template, msgType);
 
         return string.Concat(messageTypeFormat, msgSeparator, message);
     }

PBIXInspectorLibrary/CustomRules/CountRule.cs

@@ -16,7 +16,7 @@ public class CountRule : Json.Logic.Rule
 
         public CountRule(Json.Logic.Rule input)
         {
-            Input = input; 
+            Input = input;
         }
 
         /// <summary>

PBIXInspectorLibrary/CustomRules/DrillVariableRule.cs

@@ -1,9 +1,8 @@
 using Json.Logic;
+using Json.Pointer;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using Json.Pointer;
-using System.Net.Http.Headers;
 
 namespace PBIXInspectorLibrary.CustomRules;
 
@@ -67,7 +66,7 @@ internal DrillVariableRule(Json.Logic.Rule path, Json.Logic.Rule defaultValue)
                 {
                     //remove single quotes from beginning and end of string if any.
                     string strVal;
-                    if  (val.ToString()!.StartsWith("'") && val.ToString()!.EndsWith("'"))
+                    if (val.ToString()!.StartsWith("'") && val.ToString()!.EndsWith("'"))
                     {
                         strVal = val.ToString()!.Substring(1, val.ToString()!.Length - 2);
                     }

PBIXInspectorLibrary/CustomRules/RectangleOverlap.cs

@@ -1,7 +1,7 @@
 using Json.Logic;
 using System.Drawing;
-using System.Text.Json.Nodes;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 namespace PBIXInspectorLibrary.CustomRules

PBIXInspectorLibrary/Exceptions/PbiFileEntryNotFoundException.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PBIXInspectorLibrary.Exceptions
+namespace PBIXInspectorLibrary.Exceptions
 {
     internal class PbiFileEntryNotFoundException : Exception
     {

PBIXInspectorLibrary/Inspector.cs

@@ -4,9 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PBIXInspectorLibrary.Output;
-using System.Linq.Expressions;
 using System.Text;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace PBIXInspectorLibrary
@@ -39,7 +37,7 @@ public Inspector(string pbiFilePath, InspectionRules inspectionRules) : base(pbi
             this._inspectionRules = inspectionRules;
             AddCustomRulesToRegistry();
         }
-        
+
         /// <summary>
         /// 
         /// </summary>
@@ -49,7 +47,7 @@ public Inspector(string pbiFilePath, string rulesFilePath) : base(pbiFilePath, r
         {
             this._pbiFilePath = pbiFilePath;
             this._rulesFilePath = rulesFilePath;
-            
+
             try
             {
                 var inspectionRules = this.DeserialiseRules<InspectionRules>(rulesFilePath);
@@ -83,19 +81,19 @@ private PbiFile InitPbiFile(string pbiFilePath)
             //}
             //else
             //{
-                switch (PbiFile.PBIFileType(pbiFilePath))
-                {
-                    case PbiFile.PBIFileTypeEnum.PBIX:
-                        return new PbixFile(pbiFilePath);
-                        break;
-                    case PbiFile.PBIFileTypeEnum.PBIP:
-                        return new PbipFile(pbiFilePath);
-                        break;
-                    case PbiFile.PBIFileTypeEnum.PBIPReport:
-                        return new PbipReportFile(pbiFilePath);
-                    default:
-                        throw new PBIXInspectorException(string.Format("Could not determine the extension of PBI file with path \"{0}\".", pbiFilePath));
-                }
+            switch (PbiFile.PBIFileType(pbiFilePath))
+            {
+                case PbiFile.PBIFileTypeEnum.PBIX:
+                    return new PbixFile(pbiFilePath);
+                    break;
+                case PbiFile.PBIFileTypeEnum.PBIP:
+                    return new PbipFile(pbiFilePath);
+                    break;
+                case PbiFile.PBIFileTypeEnum.PBIPReport:
+                    return new PbipReportFile(pbiFilePath);
+                default:
+                    throw new PBIXInspectorException(string.Format("Could not determine the extension of PBI file with path \"{0}\".", pbiFilePath));
+            }
             //}
         }
 
@@ -135,7 +133,7 @@ public IEnumerable<TestResult> Inspect()
                 {
                     string pbiEntryPath;
 
-                    switch  (pbiFile.FileType)
+                    switch (pbiFile.FileType)
                     {
                         case PbiFile.PBIFileTypeEnum.PBIX:
                             pbiEntryPath = entry.PbixEntryPath;
@@ -211,7 +209,7 @@ public IEnumerable<TestResult> Inspect()
 
                                                 var forEachDisplayName = !string.IsNullOrEmpty(rule.ForEachPathDisplayName) ? ExecuteTokensPath((JObject?)forEachToken, rule.Name, rule.ForEachPathDisplayName, rule.PathErrorWhenNoMatch) : null;
                                                 var strForEachDisplayName = forEachDisplayName != null ? forEachDisplayName[0].ToString() : string.Empty;
-                                                
+
                                                 try
                                                 {
                                                     var tokens = ExecuteTokensPath(forEachToken, rule.Name, rule.Path, rule.PathErrorWhenNoMatch);
@@ -289,7 +287,7 @@ public IEnumerable<TestResult> Inspect()
                 }
             }
 
-            return testResults; 
+            return testResults;
         }
 
         private MessageTypeEnum ConvertRuleLogType(string ruleLogType)
@@ -516,7 +514,7 @@ private JsonArray ConvertToJsonArray(List<JToken>? tokens)
                         {
                             if (item.Value is JsonValue)
                             {
-                                
+
                                 var value = item.Value.AsValue().Stringify();
                                 //TODO: enable navigation to parent path
                                 //while (value.StartsWith("."))

PBIXInspectorLibrary/MessageIssuedEventArgs.cs

@@ -10,7 +10,7 @@ public MessageIssuedEventArgs(string message, MessageTypeEnum messageType)
 
         public string Message { get; private set; }
         public MessageTypeEnum MessageType { get; private set; }
-        public bool DialogOKResponse { get;  set;}
+        public bool DialogOKResponse { get; set; }
     }
 
     public enum MessageTypeEnum

PBIXInspectorLibrary/PbiFile.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PBIXInspectorLibrary
+namespace PBIXInspectorLibrary
 {
     internal abstract class PbiFile : IDisposable
     {

PBIXInspectorLibrary/PbixFile.cs

@@ -1,11 +1,10 @@
-using System.Data;
-using System.IO.Compression;
+using System.IO.Compression;
 
 namespace PBIXInspectorLibrary
 {
     internal class PbixFile : PbiFile, IDisposable
     {
-     
+
         private ZipArchive _za = null;
         private bool disposedValue;
 
@@ -63,7 +62,7 @@ protected virtual void Dispose(bool disposing)
                     }
                 }
 
-                
+
                 // TODO: set large fields to null
                 disposedValue = true;
             }
@@ -76,6 +75,6 @@ public override void Dispose()
             GC.SuppressFinalize(this);
         }
 
-      
+
     }
 }

PBIXInspectorTests/CLIArgsUtilsTest.cs

@@ -109,12 +109,12 @@ public void TestCLIArgsUtilsDefaults()
 
             parsedArgs = ArgsUtils.ParseArgs(args);
 
-            Assert.IsTrue(parsedArgs.CONSOLEOutput 
-                && !parsedArgs.Verbose 
-                && parsedArgs.DeleteOutputDirOnExit 
+            Assert.IsTrue(parsedArgs.CONSOLEOutput
+                && !parsedArgs.Verbose
+                && parsedArgs.DeleteOutputDirOnExit
                 && !string.IsNullOrEmpty(parsedArgs.OutputDirPath)
-                && !parsedArgs.HTMLOutput 
-                && !parsedArgs.JSONOutput 
+                && !parsedArgs.HTMLOutput
+                && !parsedArgs.JSONOutput
                 && !parsedArgs.PNGOutput);
         }
 
@@ -262,8 +262,8 @@ public void TestCLIArgsUtilsSuccess_VerboseOptionFalse2()
             Assert.True(parsedArgs.PBIFilePath.Equals("pbipPath", StringComparison.OrdinalIgnoreCase) && parsedArgs.RulesFilePath.Equals("rulesPath", StringComparison.OrdinalIgnoreCase) && !parsedArgs.Verbose);
         }
 
-        
+
     }
 }
 
-#pragma warning restore CS8602 
+#pragma warning restore CS8602

PBIXInspectorTests/CustomRulesTests.cs

@@ -1,5 +1,5 @@
-using System.Text.Json.Nodes;
-using PBIXInspectorLibrary.CustomRules;
+using PBIXInspectorLibrary.CustomRules;
+using System.Text.Json.Nodes;
 
 namespace PBIXInspectorTests
 {

PBIXInspectorTests/ImageUtilsTest.cs

@@ -1,6 +1,5 @@
 using PBIXInspectorLibrary.Output;
 using PBIXInspectorWinLibrary.Drawing;
-using PBIXInspectorWinLibrary.Utils;
 
 namespace PBIXInspectorTests
 {
@@ -11,7 +10,7 @@ internal class ImageUtilsTest
         public void ConvertBitmapToBase64Test()
         {
             var bitmapPath = string.Empty;
-            
+
             ArgumentException ex = Assert.Throws<ArgumentException>(
                 () => ImageUtils.ConvertBitmapToBase64(bitmapPath));
         }

PBIXInspectorTests/JsonAssert.cs

@@ -20,8 +20,8 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-using System.Text.Json.Nodes;
 using Json.More;
+using System.Text.Json.Nodes;
 
 namespace PBIXInspectorTests
 {

PBIXInspectorWinLibrary/Drawing/ImageUtils.cs

@@ -1,7 +1,6 @@
-using System.Drawing;
+using PBIXInspectorLibrary.Output;
+using System.Drawing;
 using System.Text.Json.Nodes;
-using PBIXInspectorLibrary;
-using PBIXInspectorLibrary.Output;
 
 namespace PBIXInspectorWinLibrary.Drawing
 {

PBIXInspectorWinLibrary/Drawing/ReportPage.cs

@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Drawing.Imaging;
-using static PBIXInspectorWinLibrary.Drawing.ReportPage;
 
 #pragma warning disable CA1416 // Validate platform compatibility
 namespace PBIXInspectorWinLibrary.Drawing
@@ -77,11 +76,11 @@ public void Draw()
                     }
 
                     g.DrawRectangle(pen, rect);
-                    
+
                     var iconSize = (from s in iconSizes where s <= Math.Max(rect.Width, rect.Height) / 2 orderby s descending select s).FirstOrDefault();
                     using (Icon ico = new(ICONPATH, iconSize, iconSize))
                     {
-                        if (!vc.Pass) { g.DrawIcon(ico, rect.X + VISOFFSET + (rect.Width - iconSize) / 2, rect.Y + VISOFFSET +(rect.Height - iconSize) / 2); };
+                        if (!vc.Pass) { g.DrawIcon(ico, rect.X + VISOFFSET + (rect.Width - iconSize) / 2, rect.Y + VISOFFSET + (rect.Height - iconSize) / 2); };
 
                     }
 

PBIXInspectorWinLibrary/Main.cs

@@ -1,5 +1,5 @@
-using PBIXInspectorLibrary.Output;
-using PBIXInspectorLibrary;
+using PBIXInspectorLibrary;
+using PBIXInspectorLibrary.Output;
 using PBIXInspectorWinLibrary.Drawing;
 using PBIXInspectorWinLibrary.Utils;
 using System.Text.Json;
@@ -104,8 +104,8 @@ public static void Run(Args args)
                 if (!_args.ADOOutput && (_args.PNGOutput || _args.HTMLOutput))
                 {
                     _fieldMapInsp = new Inspector(_args.PBIFilePath, Constants.ReportPageFieldMapFilePath);
-                     _fieldMapResults = _fieldMapInsp.Inspect();
- 
+                    _fieldMapResults = _fieldMapInsp.Inspect();
+
                     var outputPNGDirPath = Path.Combine(_args.OutputDirPath, Constants.PNGOutputDir);
 
                     if (Directory.Exists(outputPNGDirPath))

PBIXInspectorWinLibrary/Utils/Args.cs

@@ -18,8 +18,8 @@ public string OutputPath
                 }
                 else
                 {
-                    OutputDirPath = Path.Combine(Path.GetTempPath(), String.Concat(Constants.DefaultVisOpsFolder, Guid.NewGuid().ToString())) ;
-                    DeleteOutputDirOnExit = true; 
+                    OutputDirPath = Path.Combine(Path.GetTempPath(), String.Concat(Constants.DefaultVisOpsFolder, Guid.NewGuid().ToString()));
+                    DeleteOutputDirOnExit = true;
                 }
             }
         }
@@ -53,7 +53,7 @@ public string FormatsString
 
         public bool PNGOutput { get; private set; }
 
-        public bool HTMLOutput { get; private set;  }
+        public bool HTMLOutput { get; private set; }
 
         public bool JSONOutput { get; private set; }
 

PBIXInspectorWinLibrary/Utils/ArgsUtils.cs

@@ -9,7 +9,7 @@ public static Args ParseArgs(string[] args)
             const string TRUE = "true";
             const string FALSE = "false";
             string[] validOptions = { PBIX, PBIP, PBIPREPORT, RULES, OUTPUT, FORMATS, VERBOSE };
-            
+
             int index = 0;
             int maxindex = args.Length - 2;
             var dic = new Dictionary<string, string>();
@@ -41,13 +41,13 @@ public static Args ParseArgs(string[] args)
             var verboseString = dic.ContainsKey(VERBOSE) ? dic[VERBOSE] : FALSE;
             var formatsString = dic.ContainsKey(FORMATS) ? dic[FORMATS] : string.Empty;
 
-            return new Args { PBIFilePath = pbiFilePath, RulesFilePath = rulesPath, OutputPath = outputPath, FormatsString = formatsString,  VerboseString = verboseString};
+            return new Args { PBIFilePath = pbiFilePath, RulesFilePath = rulesPath, OutputPath = outputPath, FormatsString = formatsString, VerboseString = verboseString };
         }
 
         public static string? ResolvePbiFilePathInput(string pbiFilePath)
         {
-            var resolvedPath = !string.IsNullOrEmpty(pbiFilePath) && pbiFilePath.ToLower().EndsWith(Constants.PBIPReportJsonFileName) 
-                               ? Path.GetDirectoryName(pbiFilePath) 
+            var resolvedPath = !string.IsNullOrEmpty(pbiFilePath) && pbiFilePath.ToLower().EndsWith(Constants.PBIPReportJsonFileName)
+                               ? Path.GetDirectoryName(pbiFilePath)
                                : pbiFilePath;
 
             return resolvedPath;