Replace URI with hostname and port in WCF

Author: Emile Joubert

docs/RabbitMQ Service Model.doc

@@ -42,15 +42,17 @@
     <bindings>
       <rabbitMQBinding>
         <binding 
-          name="rabbitMQConfig" 
-          broker="amqp://localhost:5672/"
+          name="rabbitMQConfig"
+          hostname="localhost"
+          port="5672"
           protocolversion="AMQP_0_9_1" />
       </rabbitMQBinding>
     </bindings>
   </system.serviceModel>
 
   <appSettings>
-    <add key="manual-test-broker-uri" value="amqp://localhost:5672/"/>
+    <add key="manual-test-broker-hostname" value="localhost"/>
+    <add key="manual-test-broker-port" value="5672"/>
     <add key="manual-test-broker-protocol" value="AMQP_0_9_1"/>
   </appSettings>
 </configuration>

docs/RabbitMQ Service Model.docx

@@ -53,8 +53,9 @@ class Program
     {
         public static Binding GetBinding() {
             //return new WSHttpBinding();
-
-            return new RabbitMQBinding(System.Configuration.ConfigurationManager.AppSettings["manual-test-broker-uri"],
+            
+            return new RabbitMQBinding(System.Configuration.ConfigurationManager.AppSettings["manual-test-broker-hostname"],
+                                       int.Parse(System.Configuration.ConfigurationManager.AppSettings["manual-test-broker-port"]),
                                        RabbitMQ.Client.Protocols.FromConfiguration("manual-test-broker-protocol"));
         }
 

docs/RabbitMQ Service Model.pdf

@@ -14,7 +14,8 @@
       <rabbitMQBinding>
         <binding name="rabbitMQConfig" 
 		 protocolversion="AMQP_0_9_1"
-                 broker="amqp://localhost:5672/"  />
+                 hostname="localhost"
+                 port="5672" />
       </rabbitMQBinding>
     </bindings>
 

projects/examples/wcf/Test/App.config

@@ -20,9 +20,10 @@
     <bindings>
       <rabbitMQBinding>
         <binding name="rabbitMQConfig"
-		 broker="amqp://localhost:5672/"
-		 protocolversion="AMQP_0_9_1"
-          	 oneWay="false"/>
+                 hostname="localhost"
+                 port="5672"
+                 protocolversion="AMQP_0_9_1"
+                 oneWay="false"/>
       </rabbitMQBinding>
     </bindings>
 

projects/examples/wcf/Test/Program.cs

@@ -54,7 +54,8 @@ namespace RabbitMQ.ServiceModel
     /// </summary>
     public sealed class RabbitMQBinding : Binding
     {
-        private Uri m_broker;
+        private String m_host;
+        private int m_port;
         private IProtocol m_brokerProtocol;
         private CompositeDuplexBindingElement m_compositeDuplex;
         private MessageEncodingBindingElement m_encoding;
@@ -79,19 +80,21 @@ public RabbitMQBinding()
         /// Uri.
         /// </summary>
         /// <param name="broker">The address of the broker to connect to</param>
-        public RabbitMQBinding(Uri broker)
-            : this(broker, Protocols.DefaultProtocol)
+        public RabbitMQBinding(String hostname, int port)
+            : this(hostname, port, Protocols.DefaultProtocol)
         { }
 
         /// <summary>
         /// Uses the broker and protocol specified
         /// </summary>
-        /// <param name="broker">The address of the broker to connect to</param>
+        /// <param name="hostname">The hostname of the broker to connect to</param>
+        /// <param name="port">The port of the broker to connect to</param> 
         /// <param name="protocol">The protocol version to use</param>
-        public RabbitMQBinding(Uri broker, IProtocol protocol)
+        public RabbitMQBinding(String hostname, int port, IProtocol protocol)
             : this(protocol)
         {
-            this.Broker = broker;
+            this.HostName = hostname;
+            this.Port = port;
         }
 
         /// <summary>
@@ -109,26 +112,10 @@ public RabbitMQBinding(IProtocol protocol)
             this.TransactionFlow = true;
         }
 
-        /// <summary>
-        /// Uses the default protocol and the broker whose address is specified.
-        /// </summary>
-        /// <param name="brokerUri">The address of the broker to connect to</param>
-        public RabbitMQBinding(string brokerUri)
-            : this(new Uri(brokerUri))
-        { }
-
-        /// <summary>
-        /// Uses the broker and protocol specified
-        /// </summary>
-        /// <param name="brokerUri">The address of the broker to connect to</param>
-        /// <param name="protocol">The protocol version to use</param>
-        public RabbitMQBinding(string brokerUri, IProtocol protocol)
-            : this(new Uri(brokerUri), protocol)
-        { }
-
         public override BindingElementCollection CreateBindingElements()
         {
-            m_transport.Broker = this.Broker;
+            m_transport.HostName = this.HostName;
+            m_transport.Port = this.Port;
             m_transport.BrokerProtocol = this.BrokerProtocol;
             BindingElementCollection elements = new BindingElementCollection();
 
@@ -173,13 +160,23 @@ public override string Scheme
         }
 
         /// <summary>
-        /// Specifies the broker that the binding should connect to.
+        /// Specifies the hostname of the RabbitMQ Server
+        /// </summary>
+        [ConfigurationProperty("hostname")]
+        public String HostName
+        {
+            get { return m_host; }
+            set { m_host = value; }
+        }
+
+        /// <summary>
+        /// Specifies the RabbitMQ Server port
         /// </summary>
-        [ConfigurationProperty("broker")]
-        public Uri Broker
+        [ConfigurationProperty("port")]
+        public int Port
         {
-            get { return m_broker; }
-            set { m_broker = value; }
+            get { return m_port; }
+            set { m_port = value; }
         }
 
         /// <summary>

projects/examples/wcf/configDemo/Client/App.config

@@ -81,7 +81,8 @@ protected override void InitializeFrom(Binding binding)
             RabbitMQBinding rabbind = binding as RabbitMQBinding;
             if (rabbind != null)
             {
-                this.Broker = rabbind.Broker;
+                this.HostName = rabbind.HostName;
+                this.Port = rabbind.Port;
                 this.OneWayOnly = rabbind.OneWayOnly;
                 this.TransactionFlowEnabled = rabbind.TransactionFlow;
                 this.VirtualHost = rabbind.Transport.ConnectionFactory.VirtualHost;
@@ -104,7 +105,8 @@ protected override void OnApplyConfiguration(Binding binding)
                         binding.GetType().AssemblyQualifiedName));
             }
 
-            rabbind.Broker = this.Broker;
+            rabbind.HostName = this.HostName;
+            rabbind.Port = this.Port;
             rabbind.BrokerProtocol = this.Protocol;
             rabbind.OneWayOnly = this.OneWayOnly;
             rabbind.TransactionFlow = this.TransactionFlowEnabled;
@@ -114,13 +116,23 @@ protected override void OnApplyConfiguration(Binding binding)
         }
 
         /// <summary>
-        /// Specifies the broker that the binding should connect to.
+        /// Specifies the hostname of the broker that the binding should connect to.
         /// </summary>
-        [ConfigurationProperty("broker", IsRequired=true)]
-        public Uri Broker
+        [ConfigurationProperty("hostname", IsRequired = true)]
+        public String HostName
         {
-            get { return ((Uri)base["broker"]); }
-            set { base["broker"] = value; }
+            get { return ((String)base["hostname"]); }
+            set { base["hostname"] = value; }
+        }
+
+        /// <summary>
+        /// Specifies the port of the broker that the binding should connect to.
+        /// </summary>
+        [ConfigurationProperty("port", DefaultValue = AmqpTcpEndpoint.UseDefaultPort)]
+        public int Port
+        {
+            get { return ((int)base["port"]); }
+            set { base["port"] = value; }
         }
 
         /// <summary>