fix(json-cppagent): emit cppagent v2 header fields on every envelope

libraries/MTConnect.NET-Common/Agents/MTConnectAgent.cs

@@ -1112,54 +1112,76 @@ private Device NormalizeDevice(IDevice device)
                     obj.Compositions = NormalizeCompositions(device.Compositions, obj, obj);
                     obj.Components = NormalizeComponents(device.Components, obj, obj);
 
+                    // Required DataItem backfill: enumerate `obj.DataItems` once
+                    // into a List<IDataItem> and project the type set into a HashSet
+                    // so each required-type lookup is O(1) instead of O(n) and we
+                    // avoid the per-required-type ToList() allocation. Preserves the
+                    // existing behavior pinned by NormalizeDeviceRequiredDataItemsTests.
+                    var dataItemList = obj.DataItems != null
+                        ? new List<IDataItem>(obj.DataItems)
+                        : new List<IDataItem>();
+#if NET472_OR_GREATER || NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_0_OR_GREATER
+                    var dataItemTypes = new HashSet<string>(dataItemList.Count);
+#else
+                    var dataItemTypes = new HashSet<string>();
+#endif
+                    for (var i = 0; i < dataItemList.Count; i++)
+                    {
+                        var t = dataItemList[i]?.Type;
+                        if (t != null) dataItemTypes.Add(t);
+                    }
+
                     // Add Required Availability DataItem
-                    if (obj.DataItems.IsNullOrEmpty() || !obj.DataItems.Any(o => o.Type == AvailabilityDataItem.TypeId))
+                    if (!dataItemTypes.Contains(AvailabilityDataItem.TypeId))
                     {
                         var availability = new AvailabilityDataItem(obj.Id);
                         availability.Device = obj;
                         availability.Container = obj;
                         availability.Name = AvailabilityDataItem.NameId;
-                        var x = obj.DataItems.ToList();
-                        x.Add(availability);
-                        obj.DataItems = x;
+                        dataItemList.Add(availability);
+                        dataItemTypes.Add(AvailabilityDataItem.TypeId);
                     }
 
                     // Add Required AssetChanged DataItem
-                    if (obj.DataItems.IsNullOrEmpty() || !obj.DataItems.Any(o => o.Type == AssetChangedDataItem.TypeId))
+                    if (!dataItemTypes.Contains(AssetChangedDataItem.TypeId))
                     {
                         var assetChanged = new AssetChangedDataItem(obj.Id);
                         assetChanged.Device = obj;
                         assetChanged.Container = obj;
                         assetChanged.Name = AssetChangedDataItem.NameId;
-                        var x = obj.DataItems.ToList();
-                        x.Add(assetChanged);
-                        obj.DataItems = x;
+                        dataItemList.Add(assetChanged);
+                        dataItemTypes.Add(AssetChangedDataItem.TypeId);
                     }
 
                     // Add Required AssetRemoved DataItem
-                    if (obj.DataItems.IsNullOrEmpty() || !obj.DataItems.Any(o => o.Type == AssetRemovedDataItem.TypeId))
+                    if (!dataItemTypes.Contains(AssetRemovedDataItem.TypeId))
                     {
                         var assetRemoved = new AssetRemovedDataItem(obj.Id);
                         assetRemoved.Device = obj;
                         assetRemoved.Container = obj;
                         assetRemoved.Name = AssetRemovedDataItem.NameId;
-                        var x = obj.DataItems.ToList();
-                        x.Add(assetRemoved);
-                        obj.DataItems = x;
+                        dataItemList.Add(assetRemoved);
+                        dataItemTypes.Add(AssetRemovedDataItem.TypeId);
                     }
 
                     // Add Required AssetCount DataItem
-                    if (obj.DataItems.IsNullOrEmpty() || !obj.DataItems.Any(o => o.Type == AssetCountDataItem.TypeId))
+                    if (!dataItemTypes.Contains(AssetCountDataItem.TypeId))
                     {
                         var assetcount = new AssetCountDataItem(obj.Id);
                         assetcount.Device = obj;
                         assetcount.Container = obj;
                         assetcount.Name = AssetCountDataItem.NameId;
-                        var x = obj.DataItems.ToList();
-                        x.Add(assetcount);
-                        obj.DataItems = x;
+                        // ASSET_COUNT is a DATA_SET representation per MTConnect Part 2
+                        // (UML _19_0_3_68e0225_1640602520420_217627_44). The generated
+                        // AssetCountDataItem still defaults Representation to VALUE; override
+                        // it here so the auto-injected DataItem matches the spec.
+                        assetcount.Representation = DataItemRepresentation.DATA_SET;
+                        dataItemList.Add(assetcount);
+                        dataItemTypes.Add(AssetCountDataItem.TypeId);
                     }
 
+                    obj.DataItems = dataItemList;
+
 
                     // Generic Components
                     var genericComponents = obj.GetComponents()?.Where(o => o.GetType() == typeof(Component));

libraries/MTConnect.NET-Common/Headers/IMTConnectAssestsHeader.cs

@@ -22,6 +22,12 @@ public interface IMTConnectAssetsHeader
         /// </summary>
         string Version { get; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        string SchemaVersion { get; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-Common/Headers/IMTConnectDevicesHeader.cs

@@ -22,6 +22,12 @@ public interface IMTConnectDevicesHeader
         /// </summary>
         string Version { get; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        string SchemaVersion { get; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-Common/Headers/IMTConnectStreamsHeader.cs

@@ -22,6 +22,12 @@ public interface IMTConnectStreamsHeader
         /// </summary>
         string Version { get; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        string SchemaVersion { get; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-Common/Headers/MTConnectAssestsHeader.cs

@@ -22,6 +22,12 @@ public class MTConnectAssetsHeader : IMTConnectAssetsHeader
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        public string SchemaVersion { get; set; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-Common/Headers/MTConnectDevicesHeader.cs

@@ -22,6 +22,12 @@ public class MTConnectDevicesHeader : IMTConnectDevicesHeader
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        public string SchemaVersion { get; set; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-Common/Headers/MTConnectStreamsHeader.cs

@@ -22,6 +22,12 @@ public class MTConnectStreamsHeader : IMTConnectStreamsHeader
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        public string SchemaVersion { get; set; }
+
         /// <summary>
         /// An identification defining where the Agent that published the Response Document is installed or hosted.
         /// </summary>

libraries/MTConnect.NET-JSON-cppagent/Assets/JsonAssetsHeader.cs

@@ -15,6 +15,13 @@ public class JsonAssetsHeader
         [JsonPropertyName("version")]
         public string Version { get; set; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        [JsonPropertyName("schemaVersion")]
+        public string SchemaVersion { get; set; }
+
         [JsonPropertyName("sender")]
         public string Sender { get; set; }
 
@@ -30,6 +37,13 @@ public class JsonAssetsHeader
         [JsonPropertyName("testIndicator")]
         public bool TestIndicator { get; set; }
 
+        /// <summary>
+        /// Indicates if the MTConnect Agent is validating against the normative model.
+        /// Mirrors the cppagent v2 wire shape that emits `validation` on every Header.
+        /// </summary>
+        [JsonPropertyName("validation")]
+        public bool Validation { get; set; }
+
         [JsonPropertyName("creationTime")]
         public DateTime CreationTime { get; set; }
 
@@ -42,11 +56,13 @@ public JsonAssetsHeader(IMTConnectAssetsHeader header)
             {
                 InstanceId = header.InstanceId;
                 Version = header.Version;
+                SchemaVersion = header.SchemaVersion;
                 Sender = header.Sender;
                 AssetBufferSize = header.AssetBufferSize;
                 AssetCount = header.AssetCount;
                 DeviceModelChangeTime = header.DeviceModelChangeTime;
                 TestIndicator = header.TestIndicator;
+                Validation = header.Validation;
                 CreationTime = header.CreationTime;
             }
         }
@@ -57,11 +73,13 @@ public virtual IMTConnectAssetsHeader ToAssetsHeader()
             var header = new MTConnectAssetsHeader();
             header.InstanceId = InstanceId;
             header.Version = Version;
+            header.SchemaVersion = SchemaVersion;
             header.Sender = Sender;
             header.AssetBufferSize = AssetBufferSize;
             header.AssetCount = AssetCount;
             header.DeviceModelChangeTime = DeviceModelChangeTime;
             header.TestIndicator = TestIndicator;
+            header.Validation = Validation;
             header.CreationTime = CreationTime;
             return header;
         }

libraries/MTConnect.NET-JSON-cppagent/Devices/JsonDevicesHeader.cs

@@ -36,6 +36,13 @@ public class JsonDevicesHeader
         [JsonPropertyName("testIndicator")]
         public bool TestIndicator { get; set; }
 
+        /// <summary>
+        /// Indicates if the MTConnect Agent is validating against the normative model.
+        /// Mirrors the cppagent v2 wire shape that emits `validation` on every Header.
+        /// </summary>
+        [JsonPropertyName("validation")]
+        public bool Validation { get; set; }
+
         [JsonPropertyName("creationTime")]
         public DateTime CreationTime { get; set; }
 
@@ -48,12 +55,14 @@ public JsonDevicesHeader(IMTConnectDevicesHeader header)
             {
                 InstanceId = header.InstanceId;
                 Version = header.Version;
+                SchemaVersion = header.SchemaVersion;
                 Sender = header.Sender;
                 BufferSize = header.BufferSize;
                 AssetBufferSize = header.AssetBufferSize;
                 AssetCount = header.AssetCount;
                 DeviceModelChangeTime = header.DeviceModelChangeTime;
                 TestIndicator = header.TestIndicator;
+                Validation = header.Validation;
                 CreationTime = header.CreationTime;
             }
         }
@@ -64,12 +73,14 @@ public IMTConnectDevicesHeader ToDevicesHeader()
             var header = new MTConnectDevicesHeader();
             header.InstanceId = InstanceId;
             header.Version = Version;
+            header.SchemaVersion = SchemaVersion;
             header.Sender = Sender;
             header.BufferSize = BufferSize;
             header.AssetBufferSize = AssetBufferSize;
             header.AssetCount = AssetCount;
             header.DeviceModelChangeTime = DeviceModelChangeTime;
             header.TestIndicator = TestIndicator;
+            header.Validation = Validation;
             header.CreationTime = CreationTime;
             return header;
         }

libraries/MTConnect.NET-JSON-cppagent/Streams/JsonStreamsHeader.cs

@@ -15,6 +15,13 @@ public class JsonStreamsHeader
         [JsonPropertyName("version")]
         public string Version { get; set; }
 
+        /// <summary>
+        /// The major and minor number of the MTConnect Standard schema the Response Document conforms to (for example "2.7").
+        /// Mirrors the cppagent v2 wire shape that emits `schemaVersion` on every Header.
+        /// </summary>
+        [JsonPropertyName("schemaVersion")]
+        public string SchemaVersion { get; set; }
+
         [JsonPropertyName("sender")]
         public string Sender { get; set; }
 
@@ -36,6 +43,13 @@ public class JsonStreamsHeader
         [JsonPropertyName("testIndicator")]
         public bool TestIndicator { get; set; }
 
+        /// <summary>
+        /// Indicates if the MTConnect Agent is validating against the normative model.
+        /// Mirrors the cppagent v2 wire shape that emits `validation` on every Header.
+        /// </summary>
+        [JsonPropertyName("validation")]
+        public bool Validation { get; set; }
+
         [JsonPropertyName("creationTime")]
         public DateTime CreationTime { get; set; }
 
@@ -48,13 +62,15 @@ public JsonStreamsHeader(IMTConnectStreamsHeader header)
             {
                 InstanceId = header.InstanceId;
                 Version = header.Version;
+                SchemaVersion = header.SchemaVersion;
                 Sender = header.Sender;
                 BufferSize = header.BufferSize;
                 FirstSequence = header.FirstSequence;
                 LastSequence = header.LastSequence;
                 NextSequence = header.NextSequence;
                 DeviceModelChangeTime = header.DeviceModelChangeTime;
                 TestIndicator = header.TestIndicator;
+                Validation = header.Validation;
                 CreationTime = header.CreationTime;
             }
         }
@@ -65,13 +81,15 @@ public virtual IMTConnectStreamsHeader ToStreamsHeader()
             var header = new MTConnectStreamsHeader();
             header.InstanceId = InstanceId;
             header.Version = Version;
+            header.SchemaVersion = SchemaVersion;
             header.Sender = Sender;
             header.BufferSize = BufferSize;
             header.FirstSequence = FirstSequence;
             header.LastSequence = LastSequence;
             header.NextSequence = NextSequence;
             header.DeviceModelChangeTime = DeviceModelChangeTime;
             header.TestIndicator = TestIndicator;
+            header.Validation = Validation;
             header.CreationTime = CreationTime;
             return header;
         }