Changed usage of BrokerNamesProvider

Author: Roberto Paterlini

src/providers/WorkflowCore.QueueProviders.SqlServer/Services/BrokerNamesProvider.cs

@@ -2,11 +2,29 @@
 
 using System;
 using System.Linq;
+using WorkflowCore.Interface;
 
 #endregion
 
 namespace WorkflowCore.QueueProviders.SqlServer.Services
 {
+    public class BrokerNames
+    {
+        public BrokerNames(string msgType, string initiatorService, string targetService, string contractName, string queueName)
+        {
+            MsgType = msgType;
+            InitiatorService = initiatorService;
+            TargetService = targetService;
+            ContractName = contractName;
+            QueueName = queueName;
+        }
+
+        public string MsgType { get; }
+        public string InitiatorService { get; }
+        public string TargetService { get; }
+        public string ContractName { get; }
+        public string QueueName { get; }
+    }
     /// <summary>
     /// Build names for SSSB objects
     /// </summary>
@@ -15,46 +33,46 @@ namespace WorkflowCore.QueueProviders.SqlServer.Services
     /// </remarks>
     public class BrokerNamesProvider : IBrokerNamesProvider
     {
+        readonly BrokerNames _workFlowNames;
+        readonly BrokerNames _eventNames;
+
         /// <summary>
         /// ctor
         /// </summary>
         /// <param name="workflowHostName"></param>
         public BrokerNamesProvider(string workflowHostName)
         {
-            WorkflowMessageType = "//workflow-core/workflow";
-            EventMessageType = "//workflow-core/event";
+            var workflowMessageType = "//workflow-core/workflow";
+            var eventMessageType = "//workflow-core/event";
 
-            EventContractName = "//workflow-core/eventContract";
-            WorkflowContractName = "//workflow-core/workflowContract";
+            var eventContractName = "//workflow-core/eventContract";
+            var workflowContractName = "//workflow-core/workflowContract";
 
-            InitiatorEventServiceName = $"//workflow-core/{workflowHostName}/initiatorEventService";
-            TargetEventServiceName = $"//workflow-core/{workflowHostName}/targetEventService";
+            var initiatorEventServiceName = $"//workflow-core/{workflowHostName}/initiatorEventService";
+            var targetEventServiceName = $"//workflow-core/{workflowHostName}/targetEventService";
 
-            InitiatorWorkflowServiceName = $"//workflow-core/{workflowHostName}/initiatorWorkflowService";
-            TargetWorkflowServiceName = $"//workflow-core/{workflowHostName}/targetWorkflowService";
+            var initiatorWorkflowServiceName = $"//workflow-core/{workflowHostName}/initiatorWorkflowService";
+            var targetWorkflowServiceName = $"//workflow-core/{workflowHostName}/targetWorkflowService";
 
-            EventQueueName = $"//workflow-core/{workflowHostName}/eventQueue";
-            WorkflowQueueName = $"//workflow-core/{workflowHostName}/workflowQueue";
+            var eventQueueName = $"//workflow-core/{workflowHostName}/eventQueue";
+            var workflowQueueName = $"//workflow-core/{workflowHostName}/workflowQueue";
+            
+            _workFlowNames = new BrokerNames(workflowMessageType, initiatorWorkflowServiceName, targetWorkflowServiceName, workflowContractName, eventQueueName);
+            _eventNames = new BrokerNames(eventMessageType, initiatorEventServiceName, targetEventServiceName, eventContractName, workflowQueueName);
         }
 
-        public string WorkflowContractName { get; }
-
-        public string TargetEventServiceName { get; }
-
-        public string InitiatorEventServiceName { get; }
-
-        public string WorkflowQueueName { get; }
-
-        public string EventQueueName { get; }
-
-        public string TargetWorkflowServiceName { get; }
-
-        public string InitiatorWorkflowServiceName { get; }
-
-        public string EventContractName { get; }
-
-        public string EventMessageType { get; }
+        public BrokerNames GetByQueue(QueueType queue)
+        {
+            switch (queue)
+            {
+                case QueueType.Workflow:
+                    return _workFlowNames;
+                case QueueType.Event:
+                    return _eventNames;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(queue), queue, null);
+            }
 
-        public string WorkflowMessageType { get; }
+        }
     }
 }

src/providers/WorkflowCore.QueueProviders.SqlServer/Services/IBrokerNamesProvider.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Linq;
+using WorkflowCore.Interface;
 
 #endregion
 
@@ -12,15 +13,6 @@ namespace WorkflowCore.QueueProviders.SqlServer.Services
     /// </summary>
     public interface IBrokerNamesProvider
     {
-        string WorkflowContractName { get; }
-        string TargetEventServiceName { get; }
-        string InitiatorEventServiceName { get; }
-        string WorkflowQueueName { get; }
-        string EventQueueName { get; }
-        string TargetWorkflowServiceName { get; }
-        string InitiatorWorkflowServiceName { get; }
-        string EventContractName { get; }
-        string EventMessageType { get; }
-        string WorkflowMessageType { get; }
+        BrokerNames GetByQueue(QueueType queue);
     }
 }

src/providers/WorkflowCore.QueueProviders.SqlServer/Services/SqlServerQueueProvider.cs

@@ -96,29 +96,16 @@ public async Task QueueWork(string id, QueueType queue)
             SqlConnection cn = null;
             try
             {
-                string msgType, initiatorService, targetService, contractName;
-                if (queue == QueueType.Workflow)
-                {
-                    msgType = _names.WorkflowMessageType;
-                    initiatorService = _names.InitiatorWorkflowServiceName;
-                    targetService = _names.TargetWorkflowServiceName;
-                    contractName = _names.WorkflowContractName;
-                } else
-                {
-                    msgType = _names.EventMessageType;
-                    initiatorService = _names.InitiatorEventServiceName;
-                    targetService = _names.TargetEventServiceName;
-                    contractName = _names.EventContractName;
-                }
-
+                var par = _names.GetByQueue(queue);
+                
                 cn = new SqlConnection(_connectionString);
                 cn.Open();
                 using (var cmd = _sqlCommandExecutor.CreateCommand(cn, null, _queueWork))
                 {
-                    cmd.Parameters.AddWithValue("@initiatorService", initiatorService);
-                    cmd.Parameters.AddWithValue("@targetService", targetService);
-                    cmd.Parameters.AddWithValue("@contractName", contractName);
-                    cmd.Parameters.AddWithValue("@msgType", msgType);
+                    cmd.Parameters.AddWithValue("@initiatorService", par.InitiatorService);
+                    cmd.Parameters.AddWithValue("@targetService", par.TargetService);
+                    cmd.Parameters.AddWithValue("@contractName", par.ContractName);
+                    cmd.Parameters.AddWithValue("@msgType", par.MsgType);
                     cmd.Parameters.AddWithValue("@RequestMessage", id);
                     await cmd.ExecuteNonQueryAsync();
                 }
@@ -140,9 +127,9 @@ public async Task<string> DequeueWork(QueueType queue, CancellationToken cancell
             SqlConnection cn = null;
             try
             {
-                var queueName = queue == QueueType.Workflow ? _names.WorkflowQueueName : _names.EventQueueName;
-
-                var sql = _dequeueWork.Replace("{queueName}", queueName);
+                var par = _names.GetByQueue(queue);
+                
+                var sql = _dequeueWork.Replace("{queueName}", par.QueueName);
 
                 cn = new SqlConnection(_connectionString);
                 cn.Open();

src/providers/WorkflowCore.QueueProviders.SqlServer/Services/SqlServerQueueProviderMigrator.cs

@@ -4,6 +4,7 @@
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text.RegularExpressions;
+using WorkflowCore.Interface;
 
 #endregion
 
@@ -17,9 +18,9 @@ public interface ISqlServerQueueProviderMigrator
 
     public class SqlServerQueueProviderMigrator : ISqlServerQueueProviderMigrator
     {
-        readonly string _connectionString;
+        private readonly string _connectionString;
 
-        readonly IBrokerNamesProvider _names;
+        private readonly IBrokerNamesProvider _names;
         private readonly ISqlCommandExecutor _sqlCommandExecutor;
 
         public SqlServerQueueProviderMigrator(string connectionString, IBrokerNamesProvider names, ISqlCommandExecutor sqlCommandExecutor)
@@ -41,21 +42,24 @@ public void MigrateDb()
                 cn.Open();
                 var tx = cn.BeginTransaction();
 
-                CreateMessageType(cn, tx, _names.WorkflowMessageType);
-                CreateMessageType(cn, tx, _names.EventMessageType);
-
-                CreateContract(cn, tx, _names.EventContractName, _names.EventMessageType);
-                CreateContract(cn, tx, _names.WorkflowContractName, _names.WorkflowMessageType);
+                var n = new[]
+                {
+                    _names.GetByQueue(QueueType.Workflow),
+                    _names.GetByQueue(QueueType.Event)
+                };
 
-                CreateQueue(cn, tx, _names.EventQueueName);
-                CreateQueue(cn, tx, _names.WorkflowQueueName);
+                foreach (var item in n)
+                {
+                    CreateMessageType(cn, tx, item.MsgType);
 
-                CreateService(cn, tx, _names.InitiatorEventServiceName, _names.EventQueueName, _names.EventContractName);
-                CreateService(cn, tx, _names.TargetEventServiceName, _names.EventQueueName, _names.EventContractName);
+                    CreateContract(cn, tx, item.ContractName, item.MsgType);
 
-                CreateService(cn, tx, _names.InitiatorWorkflowServiceName, _names.WorkflowQueueName, _names.WorkflowContractName);
-                CreateService(cn, tx, _names.TargetWorkflowServiceName, _names.WorkflowQueueName, _names.WorkflowContractName);
+                    CreateQueue(cn, tx, item.QueueName);
 
+                    CreateService(cn, tx, item.InitiatorService, item.QueueName, item.ContractName);
+                    CreateService(cn, tx, item.TargetService, item.QueueName, item.ContractName);
+                }
+                
                 tx.Commit();
             } finally
             {