#pragma warning disable ...

#pragma warning restore ...
This commit is contained in:
Mike Phares 2022-02-15 09:30:23 -07:00
parent 5132a8a02d
commit 8ef7fca67a
42 changed files with 160 additions and 8318 deletions

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": 13824
"processId": 1796
}
]
}

View File

@ -6,6 +6,11 @@ namespace Adaptation.Eaf.Core;
public class Backbone
{
#pragma warning disable CA1822
#pragma warning disable CA2254
#pragma warning disable IDE0060
public const string STATE_ERROR = "Error";
public const string STATE_OFFLINE = "Offline";
public const string STATE_RUNNING = "Running";
@ -44,4 +49,5 @@ public class Backbone
protected void CloseConnectionOfComponents(List<BackboneComponent> components) { }
protected virtual void StopAllComponents() { }
protected void StopComponents(List<BackboneComponent> components) { }
}

View File

@ -4,6 +4,10 @@ namespace Adaptation.Eaf.Core.Smtp;
public class EmailMessage
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public EmailMessage() { }
public EmailMessage(string subject, string body, MailPriority priority = MailPriority.Normal) { }

View File

@ -6,6 +6,11 @@ namespace Adaptation.Eaf.EquipmentCore.DataCollection.Reporting;
public class ParameterValue
{
#pragma warning disable CA1822
#pragma warning disable CA2254
#pragma warning disable IDE0060
public ParameterValue(EquipmentParameter definition, object value) { }
public ParameterValue(EquipmentParameter definition, object value, DateTime timestamp) { }
@ -16,4 +21,5 @@ public class ParameterValue
public virtual ParameterValue Clone(EquipmentParameter newDefinition) => throw new NotImplementedException();
public override string ToString() => base.ToString();
}

View File

@ -4,6 +4,10 @@ namespace Adaptation.Eaf.EquipmentCore.SelfDescription.ElementDescription;
public class EquipmentParameter
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public EquipmentParameter(EquipmentParameter source, ParameterTypeDefinition typeDefinition) { }
public EquipmentParameter(string name, ParameterTypeDefinition typeDefinition, string description, bool isTransient = false, bool isReadOnly = true) { }
public EquipmentParameter(string id, string name, ParameterTypeDefinition typeDefinition, string description, bool isTransient = false, bool isReadOnly = true) { }
@ -19,4 +23,5 @@ public class EquipmentParameter
public override string ToString() => base.ToString();
public string ToStringWithDetails() => base.ToString();
}

View File

@ -2,10 +2,15 @@
public class Field
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public Field(string name, string description, bool canBeNull, ParameterTypeDefinition typeDefinition) { }
public string Name { get; }
public string Description { get; }
public ParameterTypeDefinition TypeDefinition { get; }
public bool CanBeNull { get; }
}

View File

@ -2,10 +2,15 @@
public abstract class ParameterTypeDefinition
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public ParameterTypeDefinition(string name, string description) { }
public string Name { get; }
public string Description { get; }
public override string ToString() => base.ToString();
}

View File

@ -5,7 +5,12 @@ namespace Adaptation.Eaf.EquipmentCore.SelfDescription.ParameterTypes;
public class StructuredType : ParameterTypeDefinition
{
#pragma warning disable CA1822
#pragma warning disable CA2254
#pragma warning disable IDE0060
public StructuredType(string name, string description, IList<Field> fields) : base(name, description) { }
public IList<Field> Fields { get; }
}

View File

@ -5,6 +5,10 @@ namespace Adaptation.Eaf.Management.ConfigurationData.CellAutomation;
[System.Runtime.Serialization.DataContractAttribute(IsReference = true)]
public class ModelObjectParameterDefinition : IConfigurationObject
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public ModelObjectParameterDefinition() { }
public ModelObjectParameterDefinition(string name, ModelObjectParameterType valueType, object defaultValue) { }
public ModelObjectParameterDefinition(string name, Type enumType, object defaultValue) { }
@ -22,4 +26,5 @@ public class ModelObjectParameterDefinition : IConfigurationObject
public virtual ModelObjectParameterDefinition Clone() => null;
public virtual bool IsValidValue(string value) => false;
}

View File

@ -10,8 +10,10 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
namespace Adaptation.FileHandlers.DownloadRsMFile;
@ -19,7 +21,7 @@ public class FileRead : Shared.FileRead, IFileRead
{
private readonly Timer _Timer;
private readonly WebClient _WebClient;
private readonly HttpClient _HttpClient;
private readonly string _StaticFileServer;
public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) :
@ -34,7 +36,7 @@ public class FileRead : Shared.FileRead, IFileRead
throw new Exception(cellInstanceConnectionName);
if (_IsDuplicator)
throw new Exception(cellInstanceConnectionName);
_WebClient = new WebClient();
_HttpClient = new();
_StaticFileServer = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".StaticFileServer"));
if (!Debugger.IsAttached && fileConnectorConfiguration.PreProcessingMode != FileConnectorConfiguration.PreProcessingModeEnum.Process)
_Timer = new Timer(Callback, null, (int)(fileConnectorConfiguration.FileScanningIntervalInSeconds * 1000), Timeout.Infinite);
@ -123,15 +125,16 @@ public class FileRead : Shared.FileRead, IFileRead
throw new Exception(string.Concat("See ", nameof(Callback)));
}
private void DownloadRsMFile()
private async Task DownloadRsMFileAsync()
{
if (_WebClient is null)
if (_HttpClient is null)
throw new Exception();
if (string.IsNullOrEmpty(_StaticFileServer))
throw new Exception();
string logText;
string runJson;
string rootJson;
string targetJson;
string[] logLines;
string runFileName;
string[] logSegments;
@ -159,13 +162,13 @@ public class FileRead : Shared.FileRead, IFileRead
_ => throw new Exception(),
};
}
rootJson = _WebClient.DownloadString(string.Concat("http://", _StaticFileServer));
rootJson = await _HttpClient.GetStringAsync(string.Concat("http://", _StaticFileServer));
rootNginxFileSystemCollection = JsonSerializer.Deserialize<NginxFileSystem[]>(rootJson, propertyNameCaseInsensitiveJsonSerializerOptions);
foreach (NginxFileSystem rootNginxFileSystem in rootNginxFileSystemCollection)
{
if (!(from l in _FileConnectorConfiguration.SourceFileFilters where rootNginxFileSystem.Name == l select false).Any())
continue;
logText = _WebClient.DownloadString(string.Concat("http://", _StaticFileServer, '/', rootNginxFileSystem.Name));
logText = await _HttpClient.GetStringAsync(string.Concat("http://", _StaticFileServer, '/', rootNginxFileSystem.Name));
logLines = logText.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
foreach (string logLine in logLines)
{
@ -184,7 +187,7 @@ public class FileRead : Shared.FileRead, IFileRead
runFullFileNameSegments = runFullFileName.Split('\\').ToList();
runFileName = runFullFileNameSegments[runFullFileNameSegments.Count - 1];
runFullFileNameSegments.RemoveAt(runFullFileNameSegments.Count - 1);
runJson = _WebClient.DownloadString(string.Concat("http://", _StaticFileServer, '/', string.Join("/", runFullFileNameSegments)));
runJson = await _HttpClient.GetStringAsync(string.Concat("http://", _StaticFileServer, '/', string.Join("/", runFullFileNameSegments)));
runFullFileNameSegments.Add(runFileName);
runNginxFileSystemCollection = JsonSerializer.Deserialize<NginxFileSystem[]>(runJson, propertyNameCaseInsensitiveJsonSerializerOptions);
foreach (NginxFileSystem matchNginxFileSystem in runNginxFileSystemCollection)
@ -224,7 +227,8 @@ public class FileRead : Shared.FileRead, IFileRead
File.Delete(alternateFileInfo.FullName);
if (targetFileInfo.Exists)
File.Delete(targetFileInfo.FullName);
_WebClient.DownloadFile(targetFileName, targetFileInfo.FullName);
targetJson = await _HttpClient.GetStringAsync(targetFileName);
File.WriteAllText(targetFileInfo.FullName, targetJson);
targetFileInfo.LastWriteTime = matchNginxFileSystemDateTime;
File.Copy(targetFileInfo.FullName, alternateFileInfo.FullName);
}
@ -235,7 +239,7 @@ public class FileRead : Shared.FileRead, IFileRead
try
{
if (_IsEAFHosted)
DownloadRsMFile();
_ = DownloadRsMFileAsync();
}
catch (Exception exception)
{

View File

@ -164,7 +164,7 @@ public class FileRead : Shared.FileRead, IFileRead
void IFileRead.Callback(object state) => Callback(state);
protected List<pcl.Description> GetDescriptions(JsonElement[] jsonElements)
protected static List<pcl.Description> GetDescriptions(JsonElement[] jsonElements)
{
List<pcl.Description> results = new();
pcl.Description description;

View File

@ -247,7 +247,7 @@ public class Description : IDescription
return results;
}
private Description GetDisplayNames()
private static Description GetDisplayNames()
{
Description result = new();
return result;

View File

@ -247,7 +247,7 @@ public class Description : IDescription, Shared.Properties.IDescription
return results;
}
private Description GetDisplayNames()
private static Description GetDisplayNames()
{
Description result = new();
return result;

View File

@ -3,10 +3,15 @@
[System.Runtime.Serialization.DataContractAttribute]
public class ConnectionSetting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public ConnectionSetting(string name, string value) { }
[System.Runtime.Serialization.DataMemberAttribute]
public string Name { get; set; }
[System.Runtime.Serialization.DataMemberAttribute]
public string Value { get; set; }
}

View File

@ -5,6 +5,10 @@ namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.Component;
public class File
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
public File(string filePath) => throw new NotImplementedException();
public File(string filePath, DateTime timeFileFound) => throw new NotImplementedException();
@ -15,4 +19,5 @@ public class File
public File UpdateContentParameters(Dictionary<string, string> contentParameters) => throw new NotImplementedException();
public File UpdateParsingStatus(bool isErrorFile) => throw new NotImplementedException();
}

View File

@ -6,6 +6,11 @@ namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.Component;
public class FilePathGenerator
{
#pragma warning disable CA1822
#pragma warning disable CA2254
#pragma warning disable IDE0060
public const char PLACEHOLDER_IDENTIFIER = '%';
public const char PLACEHOLDER_SEPARATOR = ':';
public const string PLACEHOLDER_NOT_AVAILABLE = "NA";
@ -31,4 +36,5 @@ public class FilePathGenerator
protected virtual string GetSubFolder(string folderPattern, string subFolderPath) => throw new NotImplementedException();
protected virtual string PrepareFolderPath(string targetFolderPath, string subFolderPath) => throw new NotImplementedException();
protected string ReplacePlaceholder(string inputPath) => throw new NotImplementedException();
}

View File

@ -6,8 +6,14 @@ namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.SelfDescription;
public class FileConnectorParameterTypeDefinitionProvider
{
#pragma warning disable CA1822
#pragma warning disable CA2254
#pragma warning disable IDE0060
public FileConnectorParameterTypeDefinitionProvider() { }
public IEnumerable<ParameterTypeDefinition> GetAllParameterTypeDefinition() => null;
public ParameterTypeDefinition GetParameterTypeDefinition(string name) => null;
}

View File

@ -112,13 +112,13 @@ public class Description : IDescription, Properties.IDescription
return results;
}
private Description GetDisplayNames()
private static Description GetDisplayNames()
{
Description result = new();
return result;
}
private Description GetDefault(IFileRead fileRead, Logistics logistics)
private static Description GetDefault(IFileRead fileRead, Logistics logistics)
{
Description result = new()
{

View File

@ -9,6 +9,8 @@ namespace Adaptation.Shared.Metrology;
public partial class WS
{
#pragma warning disable CA1847
public static Tuple<string, Results> SendData(string url, object payload, int timeoutSeconds = 120)
{
Results results = new();

View File

@ -10,6 +10,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_36_1;
[TestClass]
public class CDE2 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE2 EAFLoggingUnitTesting { get; private set; }
public CDE2() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_36_1;
[TestClass]
public class CDE3_EQPT : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE3_EQPT EAFLoggingUnitTesting { get; private set; }
public CDE3_EQPT() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_36_1;
[TestClass]
public class CDE3 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE3 EAFLoggingUnitTesting { get; private set; }
public CDE3() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -15,6 +15,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_36_1;
[TestClass]
public class CDE5 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE5 EAFLoggingUnitTesting { get; private set; }
public CDE5() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_36_1;
[TestClass]
public class MET08RESIMAPCDE : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
public MET08RESIMAPCDE() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -10,6 +10,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_39_0;
[TestClass]
public class CDE2 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE2 EAFLoggingUnitTesting { get; private set; }
public CDE2() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_39_0;
[TestClass]
public class CDE3_EQPT : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE3_EQPT EAFLoggingUnitTesting { get; private set; }
public CDE3_EQPT() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_39_0;
[TestClass]
public class CDE3 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE3 EAFLoggingUnitTesting { get; private set; }
public CDE3() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -15,6 +15,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_39_0;
[TestClass]
public class CDE5 : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static CDE5 EAFLoggingUnitTesting { get; private set; }
public CDE5() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -12,6 +12,10 @@ namespace _Tests.CreateSelfDescription.Staging.v2_39_0;
[TestClass]
public class MET08RESIMAPCDE : EAFLoggingUnitTesting
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; }
public MET08RESIMAPCDE() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false)

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_36_1;
public class CDE3_EQPT
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_36_1.CDE3_EQPT _CDE3_EQPT;
[ClassInitialize]

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_36_1;
public class CDE3
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_36_1.CDE3 _CDE3;
[ClassInitialize]

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_36_1;
public class MET08RESIMAPCDE
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_36_1.MET08RESIMAPCDE _MET08RESIMAPCDE;
[ClassInitialize]

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_39_0;
public class CDE3_EQPT
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_39_0.CDE3_EQPT _CDE3_EQPT;
[ClassInitialize]

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_39_0;
public class CDE3
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_39_0.CDE3 _CDE3;
[ClassInitialize]

View File

@ -14,6 +14,9 @@ namespace _Tests.Extract.Staging.v2_39_0;
public class MET08RESIMAPCDE
{
#pragma warning disable CA2254
#pragma warning disable IDE0060
private static CreateSelfDescription.Staging.v2_39_0.MET08RESIMAPCDE _MET08RESIMAPCDE;
[ClassInitialize]

View File

@ -19,6 +19,10 @@ public class EAFLoggingUnitTesting : LoggingUnitTesting, IDisposable
_AdaptationTesting = new AdaptationTesting(testContext, skipEquipmentDictionary);
}
public new void Dispose() => base.Dispose();
public new void Dispose()
{
base.Dispose();
GC.SuppressFinalize(this);
}
}

View File

@ -102,6 +102,10 @@ public class LoggingUnitTesting : UnitTesting, IDisposable
return result;
}
public void Dispose() => _LoggerFactory.Dispose();
public void Dispose()
{
_LoggerFactory.Dispose();
GC.SuppressFinalize(this);
}
}

View File

@ -9,6 +9,8 @@
public partial class CellInstanceVersion
{
#pragma warning disable IDE1006 // Naming Styles
private string createdByField;
private System.DateTime creationDateField;

View File

@ -11,6 +11,8 @@
public partial class EquipmentDictionaryVersion
{
#pragma warning disable IDE1006 // Naming Styles
private EquipmentDictionaryVersionAlarms alarmsField;
private string createdByField;

View File

@ -9,6 +9,8 @@
public partial class EquipmentTypeVersion
{
#pragma warning disable IDE1006 // Naming Styles
private string createdByField;
private System.DateTime creationDateField;

View File

@ -80,7 +80,7 @@ public class UnitTesting
AppendLine(" \"name\": \".NET Core Attach\",").
AppendLine(" \"type\": \"coreclr\",").
AppendLine(" \"request\": \"attach\",").
AppendLine($" \"processId\": {Process.GetCurrentProcess().Id}").
AppendLine($" \"processId\": {Environment.ProcessId}").
AppendLine(" }").
AppendLine(" ]").
AppendLine("}");