Updated MQTT

- Added TopicPrefix configuration option
- Fixed issue with MTConnectMqttBroker start retry
- Consolidated source code of creating Mqtt Messages into new MTConnectMqttMessage class
- Fixed issue with Hierarchy Format (repeated DataItemId in Topic)

src/MTConnect.NET-Applications-Agents-MQTT/Configurations/IMqttAgentApplicationConfiguration.cs

@@ -3,9 +3,6 @@
 
 namespace MTConnect.Configurations
 {
-    /// <summary>
-    /// Configuration for an MTConnect Shdr > Http Agent
-    /// </summary>
     public interface IMqttAgentApplicationConfiguration : IAgentApplicationConfiguration, IMTConnectMqttClientConfiguration
     {
         bool RetainMessages { get; set; }

src/MTConnect.NET-Applications-Agents-MQTT/Configurations/MqttAgentApplicationConfiguration.cs

@@ -2,6 +2,7 @@
 // TrakHound Inc. licenses this file to you under the MIT license.
 
 using System.Text.Json.Serialization;
+using YamlDotNet.Serialization;
 
 namespace MTConnect.Configurations
 {
@@ -49,6 +50,10 @@ public class MqttAgentApplicationConfiguration : AgentApplicationConfiguration,
         [JsonPropertyName("mqttFormat")]
         public MTConnectMqttFormat MqttFormat { get; set; }
 
+        [JsonPropertyName("mqttTopicPrefix")]
+        [YamlMember(Alias = "mqttTopicPrefix")]
+        public string TopicPrefix { get; set; }
+
 
         public MqttAgentApplicationConfiguration()
         {

src/MTConnect.NET-Applications-Agents-MQTT/Configurations/ShdrMqttAgentApplicationConfiguration.cs

@@ -2,6 +2,7 @@
 // TrakHound Inc. licenses this file to you under the MIT license.
 
 using System.Text.Json.Serialization;
+using YamlDotNet.Serialization;
 
 namespace MTConnect.Configurations
 {
@@ -49,6 +50,10 @@ public class ShdrMqttAgentApplicationConfiguration : ShdrAgentApplicationConfigu
         [JsonPropertyName("mqttFormat")]
         public MTConnectMqttFormat MqttFormat { get; set; }
 
+        [JsonPropertyName("mqttTopicPrefix")]
+        [YamlMember(Alias = "mqttTopicPrefix")]
+        public string TopicPrefix { get; set; }
+
 
         public ShdrMqttAgentApplicationConfiguration()
         {

src/MTConnect.NET-Applications-Agents-MQTT/MTConnectMqttBrokerAgentApplication.cs

@@ -117,6 +117,9 @@ protected override async void OnStartAgentBeforeLoad(IEnumerable<DeviceConfigura
             _mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions);
 
             _mqttBroker = new MTConnectMqttBroker(Agent, _mqttServer);
+            _mqttBroker.Format = _configuration.MqttFormat;
+            _mqttBroker.RetainMessages = _configuration.RetainMessages;
+            _mqttBroker.TopicPrefix = _configuration.TopicPrefix;
             await _mqttBroker.StartAsync(CancellationToken.None);
         }
 

src/MTConnect.NET-MQTT/Configurations/IMTConnectMqttClientConfiguration.cs

@@ -26,5 +26,7 @@ public interface IMTConnectMqttClientConfiguration
         bool AllowUntrustedCertificates { get; set; }
 
         int RetryInterval { get; set; }
+
+        string TopicPrefix { get; set; }
     }
 }

src/MTConnect.NET-MQTT/Configurations/MTConnectMqttClientConfiguration.cs

@@ -40,6 +40,9 @@ public class MTConnectMqttClientConfiguration : IMTConnectMqttClientConfiguratio
         [JsonPropertyName("retryInterval")]
         public int RetryInterval { get; set; }
 
+        [JsonPropertyName("topicPrefix")]
+        public string TopicPrefix { get; set; }
+
 
         public MTConnectMqttClientConfiguration()
         {