forked from mtconnect/dot_net_sdk
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added TCP Connection class * Added extra logs * Additional logging and refactoring - Added cancellation token to starting adapters - Refactored code that adds DataItems to the Adapter into an extension class - Created `IAdapterDataModel` to help differentiate data models from Adapter service classes (see example) - Updated signature for `DataReceivedHandler` to send a type of `IAdapterDataModel` - The `Adapter` now consumes this type explicitly for tracking DataItems - Updated asynchronous programming in TCP adapter to use tasks instead of deprecated Thread programming - Updated `TcpAdapter` to manage client connection with custom class `TcpConnection`.
- Loading branch information
Showing
13 changed files
with
587 additions
and
341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| using Mtconnect.AdapterInterface.Contracts.Attributes; | ||
| using Mtconnect.AdapterInterface.DataItems; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
|
|
||
| namespace Mtconnect | ||
| { | ||
| public static class AdapterExtensions | ||
| { | ||
| /// <summary> | ||
| /// Attempts to add a <paramref name="dataItem"/> to the <paramref name="adapter"/> if the adapter does not already contain such a <see cref="DataItem"/>. | ||
| /// </summary> | ||
| /// <param name="adapter">Reference to the adapter to add the data item onto.</param> | ||
| /// <param name="dataItem">Reference to the data item to be added.</param> | ||
| /// <returns>Flag for whether or not the data item has been added. Returns true if the data item has already been added.</returns> | ||
| public static bool TryAddDataItem(this Adapter adapter, DataItem dataItem) | ||
| { | ||
| if (adapter.Contains(dataItem)) return true; | ||
|
|
||
| adapter.AddDataItem(dataItem); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Adds Data Items from properties in the <paramref name="model"/> that are decorated with the <see cref="DataItemAttribute"/>. | ||
| /// </summary> | ||
| /// <param name="adapter">Reference to the MTConnect <see cref="Adapter"/> to add the data items onto.</param> | ||
| /// <param name="model">Reference to a data model containing <see cref="DataItemAttribute"/>s.</param> | ||
| /// <returns>Flag for whether or not all decorated <see cref="DataItemAttribute"/>s were added to the adapter.</returns> | ||
| public static bool TryAddDataItems(this Adapter adapter, IAdapterDataModel model) | ||
| { | ||
| return adapter.TryAddDataItems(model.GetType()); | ||
| } | ||
| private static PropertyInfo[] GetDataItemProperties(Type type) | ||
| { | ||
| return type.GetProperties(BindingFlags.Instance | BindingFlags.Public) | ||
| .Where(o => o.GetCustomAttribute(typeof(DataItemAttribute)) != null) | ||
| .ToArray(); | ||
| } | ||
| private static Dictionary<Type, PropertyInfo[]> _dataItemProperties = new Dictionary<Type, PropertyInfo[]>(); | ||
| private static bool TryAddDataItems(this Adapter adapter, Type dataModelType, string dataItemNamePrefix = "") | ||
| { | ||
| if (_dataItemProperties.TryGetValue(dataModelType, out PropertyInfo[] dataItemProperties)) return true; | ||
|
|
||
| dataItemProperties = GetDataItemProperties(dataModelType); | ||
| _dataItemProperties.Add(dataModelType, dataItemProperties); | ||
| bool allDataItemsAdded = true; | ||
|
|
||
|
|
||
| foreach (var property in dataItemProperties) | ||
| { | ||
| bool dataItemAdded = false; | ||
| var dataItemAttribute = property.GetCustomAttribute<DataItemAttribute>(); | ||
| string dataItemName = dataItemNamePrefix + dataItemAttribute.Name; | ||
|
|
||
| switch (dataItemAttribute) | ||
| { | ||
| case DataItemPartialAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItems(property.PropertyType, dataItemName); | ||
| break; | ||
| case EventAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItem(new Event(dataItemName)); | ||
| break; | ||
| case SampleAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItem(new Sample(dataItemName)); | ||
| break; | ||
| case ConditionAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItem(new Condition(dataItemName)); | ||
| break; | ||
| case TimeSeriesAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItem(new TimeSeries(dataItemName)); | ||
| break; | ||
| case MessageAttribute _: | ||
| dataItemAdded = adapter.TryAddDataItem(new Message(dataItemName)); | ||
| break; | ||
| default: | ||
| dataItemAdded = false; | ||
| break; | ||
| } | ||
|
|
||
| if (!dataItemAdded) allDataItemsAdded = false; | ||
| } | ||
|
|
||
| return allDataItemsAdded; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Attempts to update the <see cref="DataItem"/>s of the <paramref name="adapter"/>. | ||
| /// </summary> | ||
| /// <param name="adapter">Reference to the MTConnect <see cref="Adapter"/> to update the data items from.</param> | ||
| /// <param name="model">Reference to the data model to update the <paramref name="adapter"/>s <see cref="DataItem"/>s from.</param> | ||
| /// <returns>Flag for whether or not all <see cref="DataItem"/> values were updated from the <paramref name="model"/>.</returns> | ||
| public static bool TryUpdateValues(this Adapter adapter, IAdapterDataModel model) | ||
| { | ||
| return TryUpdateValues(adapter, model, string.Empty); | ||
| } | ||
| private static bool TryUpdateValues(this Adapter adapter, object model, string dataItemPrefix) | ||
| { | ||
| bool allDataItemsUpdated = true; | ||
|
|
||
| Type sourceType = model.GetType(); | ||
|
|
||
| if (!_dataItemProperties.TryGetValue(sourceType, out PropertyInfo[] dataItemProperties)) | ||
| { | ||
| dataItemProperties = GetDataItemProperties(sourceType); | ||
| } | ||
| foreach (var property in dataItemProperties) | ||
| { | ||
| bool dataItemUpdated = true; | ||
|
|
||
| var dataItemAttribute = property.GetCustomAttribute<DataItemAttribute>(); | ||
| string dataItemName = dataItemPrefix + dataItemAttribute.Name; | ||
| switch (dataItemAttribute) | ||
| { | ||
| case DataItemPartialAttribute _: | ||
| dataItemUpdated = adapter.TryUpdateValues(property.GetValue(model), dataItemName); | ||
| break; | ||
| case EventAttribute _: | ||
| case SampleAttribute _: | ||
| case ConditionAttribute _: | ||
| case TimeSeriesAttribute _: | ||
| case MessageAttribute _: | ||
| adapter[dataItemName].Value = property.GetValue(model); | ||
| break; | ||
| default: | ||
| dataItemUpdated = false; | ||
| break; | ||
| } | ||
|
|
||
| if (!dataItemUpdated) allDataItemsUpdated = false; | ||
| } | ||
|
|
||
| return allDataItemsUpdated; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| using System.Threading; | ||
|
|
||
| namespace Mtconnect | ||
| { | ||
| /// <summary> | ||
| /// A generic interface for instantiating a source for a MTConnect Adapter. | ||
| /// </summary> | ||
| public interface IAdapterDataModel | ||
| { | ||
| } | ||
| } |
Oops, something went wrong.