From 817934a2556d2f73221ecb3b236758f0bd45a2b8 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 14 Feb 2022 15:24:57 -0700 Subject: [PATCH] CA1834 CA1837 CA1825 CA1829 CA1847 cSpell --- Adaptation/.vscode/settings.json | 22 +++++++++++++++++++ .../FileHandlers/DownloadRsMFile/FileRead.cs | 2 +- .../FileHandlers/MET08RESIMAPCDE/FileRead.cs | 4 ++-- Adaptation/FileHandlers/RsM/FileRead.cs | 2 +- Adaptation/FileHandlers/RsM/ProcessData.cs | 2 +- Adaptation/FileHandlers/pcl/FileRead.cs | 2 +- Adaptation/FileHandlers/pcl/ProcessData.cs | 6 ++--- Adaptation/Shared/Metrology/WS.cs | 2 +- .../Shared/ProcessDataStandardFormat.cs | 16 +++++++------- Adaptation/_Tests/Shared/UnitTesting.cs | 2 +- 10 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 Adaptation/.vscode/settings.json diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json new file mode 100644 index 0000000..bc4b5b1 --- /dev/null +++ b/Adaptation/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "cSpell.words": [ + "datauniqueid", + "Epuipment", + "EQPT", + "headerid", + "Idrv", + "ipdsf", + "Irng", + "ISMTP", + "JOBID", + "pdsf", + "pdsfc", + "PPID", + "Rcpe", + "RESIMAPCDE", + "Rsens", + "Smpl", + "Villach", + "Vrng" + ] +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs index 20072f9..49e122d 100644 --- a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs +++ b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs @@ -94,7 +94,7 @@ public class FileRead : Shared.FileRead, IFileRead DateTime dateTime = DateTime.Now; results = GetExtractResult(reportFullPath, dateTime); if (results.Item3 is null) - results = new Tuple>(results.Item1, new Test[] { }, JsonSerializer.Deserialize("[]"), results.Item4); + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); if (results.Item3.Length > 0 && _IsEAFHosted) WritePDSF(this, results.Item3); UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs index 70c7603..a135ecd 100644 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs +++ b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs @@ -140,7 +140,7 @@ public class FileRead : Shared.FileRead, IFileRead DateTime dateTime = DateTime.Now; results = GetExtractResult(reportFullPath, dateTime); if (results.Item3 is null) - results = new Tuple>(results.Item1, new Test[] { }, JsonSerializer.Deserialize("[]"), results.Item4); + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); if (results.Item3.Length > 0 && _IsEAFHosted) WritePDSF(this, results.Item3); UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); @@ -427,7 +427,7 @@ public class FileRead : Shared.FileRead, IFileRead foreach (KeyValuePair keyValuePair in _CellNames) { monARessource = keyValuePair.Key; - if (!keyValuePair.Value.Contains(@"\")) + if (!keyValuePair.Value.Contains('\\')) continue; foreach (string sourceFileFilter in _FileConnectorConfiguration.SourceFileFilter.Split('|')) { diff --git a/Adaptation/FileHandlers/RsM/FileRead.cs b/Adaptation/FileHandlers/RsM/FileRead.cs index a1cc015..8373c80 100644 --- a/Adaptation/FileHandlers/RsM/FileRead.cs +++ b/Adaptation/FileHandlers/RsM/FileRead.cs @@ -77,7 +77,7 @@ public class FileRead : Shared.FileRead, IFileRead DateTime dateTime = DateTime.Now; results = GetExtractResult(reportFullPath, dateTime); if (results.Item3 is null) - results = new Tuple>(results.Item1, new Test[] { }, JsonSerializer.Deserialize("[]"), results.Item4); + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); if (results.Item3.Length > 0 && _IsEAFHosted) WritePDSF(this, results.Item3); UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); diff --git a/Adaptation/FileHandlers/RsM/ProcessData.cs b/Adaptation/FileHandlers/RsM/ProcessData.cs index 0529cb9..63a1940 100644 --- a/Adaptation/FileHandlers/RsM/ProcessData.cs +++ b/Adaptation/FileHandlers/RsM/ProcessData.cs @@ -185,7 +185,7 @@ public class ProcessData : IProcessData DataReject = segments[6]; } - private Detail GetRData(string[] segments) + private static Detail GetRData(string[] segments) { Detail result = new(); if (segments.Length > 0 && float.TryParse(segments[0], out float r)) diff --git a/Adaptation/FileHandlers/pcl/FileRead.cs b/Adaptation/FileHandlers/pcl/FileRead.cs index fc460eb..93a3cde 100644 --- a/Adaptation/FileHandlers/pcl/FileRead.cs +++ b/Adaptation/FileHandlers/pcl/FileRead.cs @@ -77,7 +77,7 @@ public class FileRead : Shared.FileRead, IFileRead DateTime dateTime = DateTime.Now; results = GetExtractResult(reportFullPath, dateTime); if (results.Item3 is null) - results = new Tuple>(results.Item1, new Test[] { }, JsonSerializer.Deserialize("[]"), results.Item4); + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); if (results.Item3.Length > 0 && _IsEAFHosted) WritePDSF(this, results.Item3); UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); diff --git a/Adaptation/FileHandlers/pcl/ProcessData.cs b/Adaptation/FileHandlers/pcl/ProcessData.cs index c1e7645..c87cac0 100644 --- a/Adaptation/FileHandlers/pcl/ProcessData.cs +++ b/Adaptation/FileHandlers/pcl/ProcessData.cs @@ -175,7 +175,7 @@ public class ProcessData : IProcessData return IsNullOrWhiteSpace((num > -1 ? _Data.Substring(_I, num - _I) : _Data.Substring(_I))); } - private bool IsNullOrWhiteSpace(string text) + private static bool IsNullOrWhiteSpace(string text) { bool flag; int num = 0; @@ -319,7 +319,7 @@ public class ProcessData : IProcessData detail = new Detail() { Pt = GetToken() }; if (detail.Pt.Contains("Avg")) break; - else if (!detail.Pt.Contains(":")) + else if (!detail.Pt.Contains(':')) { detail.R = GetToken(); detail.T = GetToken(); @@ -359,7 +359,7 @@ public class ProcessData : IProcessData _ = GetBefore(": "); for (string i = GetToken(); !string.IsNullOrEmpty(i); i = GetToken()) { - if (!i.Contains(":")) + if (!i.Contains(':')) { detail = new Detail(); int num1 = num + 1; diff --git a/Adaptation/Shared/Metrology/WS.cs b/Adaptation/Shared/Metrology/WS.cs index b5ebf4e..e65032c 100644 --- a/Adaptation/Shared/Metrology/WS.cs +++ b/Adaptation/Shared/Metrology/WS.cs @@ -16,7 +16,7 @@ public partial class WS try { string json = JsonSerializer.Serialize(payload, payload.GetType()); - if (string.IsNullOrEmpty(url) || !url.Contains(":") || !url.Contains(".")) + if (string.IsNullOrEmpty(url) || !url.Contains(':') || !url.Contains('.')) throw new Exception("Invalid URL"); using (HttpClient httpClient = new()) { diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index c7fbe62..251d1b4 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -45,7 +45,7 @@ public class ProcessDataStandardFormat foreach (JsonProperty jsonProperty in jsonElements[0].EnumerateObject()) { columns += 1; - _ = stringBuilder.Append("\"").Append(jsonProperty.Name).Append("\"").Append('\t'); + _ = stringBuilder.Append('"').Append(jsonProperty.Name).Append('"').Append('\t'); } break; } @@ -55,8 +55,8 @@ public class ProcessDataStandardFormat { _ = stringBuilder.Clear(); _ = stringBuilder.Append("0.1").Append('\t'); - _ = stringBuilder.Append("1").Append('\t'); - _ = stringBuilder.Append("2").Append('\t'); + _ = stringBuilder.Append('1').Append('\t'); + _ = stringBuilder.Append('2').Append('\t'); foreach (JsonProperty jsonProperty in jsonElements[i].EnumerateObject()) _ = stringBuilder.Append(jsonProperty.Value).Append('\t'); _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); @@ -97,7 +97,7 @@ public class ProcessDataStandardFormat lines = File.ReadAllLines(reportFullPath); string[] segments; if (lines.Length < 7) - segments = new string[] { }; + segments = Array.Empty(); else segments = lines[6].Trim().Split('\t'); List columns = new(); @@ -120,7 +120,7 @@ public class ProcessDataStandardFormat } } bool lookForLogistics = false; - for (int r = 7; r < lines.Count(); r++) + for (int r = 7; r < lines.Length; r++) { if (lines[r].StartsWith("NUM_DATA_ROWS")) lookForLogistics = true; @@ -131,7 +131,7 @@ public class ProcessDataStandardFormat } if (lines[r].StartsWith("LOGISTICS_1")) { - for (int i = r; i < lines.Count(); i++) + for (int i = r; i < lines.Length; i++) { if (lines[r].StartsWith("END_HEADER")) break; @@ -176,7 +176,7 @@ public class ProcessDataStandardFormat if (string.IsNullOrEmpty(value)) _ = stringBuilder.Append('"').Append(columns[c]).Append("\":").Append(value).Append("null,"); else if (value.All(char.IsDigit)) - _ = stringBuilder.Append('"').Append(columns[c]).Append("\":").Append(value).Append(","); + _ = stringBuilder.Append('"').Append(columns[c]).Append("\":").Append(value).Append(','); else _ = stringBuilder.Append('"').Append(columns[c]).Append("\":\"").Append(value).Append("\","); } @@ -298,7 +298,7 @@ public class ProcessDataStandardFormat for (int r = 0; r < count; r++) { _ = line.Clear(); - _ = line.Append("!"); + _ = line.Append('!'); foreach (KeyValuePair> keyValuePair in keyValuePairs) { if (!names.Contains(keyValuePair.Key)) diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs index 18e3669..6276954 100644 --- a/Adaptation/_Tests/Shared/UnitTesting.cs +++ b/Adaptation/_Tests/Shared/UnitTesting.cs @@ -80,7 +80,7 @@ public class UnitTesting AppendLine(" \"name\": \".NET Core Attach\","). AppendLine(" \"type\": \"coreclr\","). AppendLine(" \"request\": \"attach\","). - AppendLine($" \"processId\": {System.Diagnostics.Process.GetCurrentProcess().Id}"). + AppendLine($" \"processId\": {Process.GetCurrentProcess().Id}"). AppendLine(" }"). AppendLine(" ]"). AppendLine("}");