Merge 205a656 into ba585c4

paolosalvatori · Dec 28, 2019 · fd00660 · fd00660
2 parents ba585c4 + 205a656
commit fd00660
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 181 deletions.
diff --git a/src/Common/Helpers/ConfigurationParameters.cs b/src/Common/Helpers/ConfigurationParameters.cs
@@ -35,6 +35,7 @@ public static class ConfigurationParameters
         public const string SaveCheckpointsToFileParameter = "saveCheckpointsToFile";
         public const string SchemeParameter = "scheme";
         public const string MessageParameter = "message";
+        public const string MessageContentTypeParameter = "contentType";
         public const string FileParameter = "file";
         public const string LabelParameter = "label";
         public const string RetryCountParameter = "retryCount";

diff --git a/src/Common/Helpers/MainSettings.cs b/src/Common/Helpers/MainSettings.cs
@@ -56,6 +56,7 @@ public class MainSettings
         public string Label { get; set; }
         public string MessageFile { get; set; }
         public string MessageText { get; set; }
+        public string MessageContentType { get; set; }
 
         public List<string> SelectedEntities { get; set; }
 
@@ -107,6 +108,7 @@ public void SetDefault()
             Label = DefaultLabel;
             MessageFile = string.Empty;
             MessageText = string.Empty;
+            MessageContentType = string.Empty;
             SelectedEntities = ConfigurationHelper.Entities;
 
             MessageBodyType = BodyType.Stream.ToString();
@@ -141,6 +143,7 @@ public override bool Equals(object other)
             if (Label != otherProperties.Label) return false;
             if (MessageFile != otherProperties.MessageFile) return false;
             if (MessageText != otherProperties.MessageText) return false;
+            if (MessageContentType != otherProperties.MessageContentType) return false;
 
             if (!SelectedEntities.SequenceEqual(SelectedEntities)) return false;
 
@@ -228,6 +231,9 @@ public object GetValue(string setting)
                 case ConfigurationParameters.MessageParameter:
                     return MessageText;
 
+                case ConfigurationParameters.MessageContentTypeParameter:
+                    return MessageContentType;
+
                 case ConfigurationParameters.SelectedEntitiesParameter:
                     return SelectedEntities;
 

diff --git a/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs b/src/ServiceBusExplorer/Controls/TestQueueControl.Designer.cs
diff --git a/src/ServiceBusExplorer/Controls/TestQueueControl.cs b/src/ServiceBusExplorer/Controls/TestQueueControl.cs
@@ -377,6 +377,7 @@ private void InitializeControls()
                 txtReceiveBatchSize.Text = DefaulReceiveBatchSize;
                 txtSendTaskCount.Text = DefaultSenderTaskCount;
                 txtReceiveTaskCount.Text = DefaultReceiverTaskCount;
+                txtContentType.Text = mainForm.MessageContentType;
                 txtReceiveTimeout.Text = mainForm?.ReceiveTimeout.ToString(CultureInfo.InvariantCulture);
                 txtSessionTimeout.Text = mainForm?.ServerTimeout.ToString(CultureInfo.InvariantCulture);
                 txtPrefetchCount.Text = mainForm?.PrefetchCount.ToString(CultureInfo.InvariantCulture);
@@ -2152,6 +2153,14 @@ private void txtMessageText_TextChanged(object sender, FastColoredTextBoxNS.Text
             }
         }
 
+        private void txtContentType_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(txtContentType.Text))
+            {
+                mainForm.MessageContentType = txtContentType.Text;
+            }
+        }
+
         private void grouperMessageFormat_CustomPaint(PaintEventArgs e)
         {
             e.Graphics.DrawRectangle(new Pen(SystemColors.ActiveBorder, 1),

diff --git a/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs b/src/ServiceBusExplorer/Controls/TestTopicControl.Designer.cs
diff --git a/src/ServiceBusExplorer/Controls/TestTopicControl.cs b/src/ServiceBusExplorer/Controls/TestTopicControl.cs
@@ -369,6 +369,7 @@ private void InitializeControls()
                 txtReceiveBatchSize.Text = DefaulReceiveBatchSize;
                 txtSendTaskCount.Text = DefaultSenderTaskCount;
                 txtReceiveTaskCount.Text = DefaultReceiverTaskCount;
+                txtContentType.Text = mainForm.MessageContentType;
                 txtReceiveTimeout.Text = mainForm?.ReceiveTimeout.ToString(CultureInfo.InvariantCulture);
                 txtServerTimeout.Text = mainForm?.ServerTimeout.ToString(CultureInfo.InvariantCulture);
                 txtPrefetchCount.Text = mainForm?.PrefetchCount.ToString(CultureInfo.InvariantCulture);
@@ -2157,6 +2158,14 @@ private void txtMessageText_TextChanged(object sender, TextChangedEventArgs e)
             }
         }
 
+        private void txtContentType_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(txtContentType.Text))
+            {
+                mainForm.MessageContentType = txtContentType.Text;
+            }
+        }
+
         private void grouperMessageFormat_CustomPaint(PaintEventArgs e)
         {
             e.Graphics.DrawRectangle(new Pen(SystemColors.ActiveBorder, 1),

diff --git a/src/ServiceBusExplorer/Forms/MainForm.cs b/src/ServiceBusExplorer/Forms/MainForm.cs
@@ -208,6 +208,7 @@ public partial class MainForm : Form
         private readonly FieldInfo eventClickFieldInfo;
         private readonly PropertyInfo eventsPropertyInfo;
         private string messageText;
+        private string messageContentType;
         private string relayMessageText;
         private string messageFile;
         private string label;
@@ -394,6 +395,7 @@ private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
                 Label = label,
                 MessageFile = messageFile,
                 MessageText = messageText,
+                MessageContentType = messageContentType,
 
                 SelectedEntities = selectedEntites,
                 MessageBodyType = messageBodyType,
@@ -449,6 +451,7 @@ private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
                 label = optionForm.MainSettings.Label;
                 messageFile = optionForm.MainSettings.MessageFile;
                 messageText = optionForm.MainSettings.MessageText;
+                messageContentType = optionForm.MainSettings.MessageContentType;
 
                 selectedEntites = optionForm.MainSettings.SelectedEntities;
                 messageBodyType = optionForm.MainSettings.MessageBodyType;
@@ -3723,6 +3726,7 @@ void GetServiceBusNamespaceSettingsFromConfiguration()
                 Label = label,
                 MessageFile = messageFile,
                 MessageText = messageText,
+                MessageContentType = messageContentType,
                 SelectedEntities = selectedEntites,
                 MessageBodyType = messageBodyType,
                 ConnectivityMode = ServiceBusHelper.ConnectivityMode
@@ -3798,6 +3802,7 @@ void GetServiceBusNamespaceSettingsFromConfiguration()
             label = readSettings.Label;
 
             messageText = readSettings.MessageText;
+            messageContentType = readSettings.MessageContentType;
             messageFile = readSettings.MessageFile;
 
             selectedEntites = readSettings.SelectedEntities;
@@ -3908,6 +3913,18 @@ public string MessageText
             }
         }
 
+        public string MessageContentType
+        {
+            get
+            {
+                return messageContentType;
+            }
+            set
+            {
+                messageContentType = value;
+            }
+        }
+
         public string RelayMessageText
         {
             get