Retain non-default binding configuration details via URI

Author: Emile Joubert

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -332,5 +332,24 @@ public AuthMechanismFactory AuthMechanismFactory(string[] mechs) {
 
             return null;
         }
+
+        public static explicit operator ConnectionFactory(Uri uri)
+        {
+            ConnectionFactory connFactory = new ConnectionFactory();
+            if (uri.UserInfo.Length > 0)
+            {
+                String[] userInfo = uri.UserInfo.Split(":".ToCharArray());
+                connFactory.UserName = Uri.UnescapeDataString(userInfo[0]);
+                if (userInfo.Length > 1)
+                {
+                    connFactory.Password = Uri.UnescapeDataString(userInfo[1]);
+                }
+            }
+            connFactory.VirtualHost = Uri.UnescapeDataString(uri.AbsolutePath.Remove(0, 1));
+            connFactory.Port = uri.Port;
+            connFactory.HostName = uri.Host;
+            return connFactory;
+        }
+
     }
 }

projects/examples/wcf/Test/App.config

@@ -43,14 +43,14 @@
       <rabbitMQBinding>
         <binding 
           name="rabbitMQConfig" 
-          broker="amqp://localhost:5672/"
+          broker="amqp://localhost:5672/%2F"
           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-uri" value="amqp://localhost:5672/%2F"/>
     <add key="manual-test-broker-protocol" value="AMQP_0_9_1"/>
   </appSettings>
 </configuration>

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

@@ -20,7 +20,7 @@
     <bindings>
       <rabbitMQBinding>
         <binding name="rabbitMQConfig"
-		 broker="amqp://localhost:5672/"
+		 broker="amqp://localhost:5672/%2F"
 		 protocolversion="AMQP_0_9_1"
           	 oneWay="false"/>
       </rabbitMQBinding>

projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportBindingElement.cs

@@ -57,7 +57,6 @@ public sealed class RabbitMQTransportBindingElement : TransportBindingElement
     {
         private ConnectionFactory m_connectionFactory;
         private IConnection m_connection;
-        private bool m_hasBroker = false;
 
         /// <summary>
         /// Creates a new instance of the RabbitMQTransportBindingElement Class using the default protocol.
@@ -72,12 +71,8 @@ private RabbitMQTransportBindingElement(RabbitMQTransportBindingElement other)
         {
             Broker = other.Broker;
             BrokerProtocol = other.BrokerProtocol;
-
-            m_connectionFactory.UserName = other.ConnectionFactory.UserName;
-            m_connectionFactory.Password = other.ConnectionFactory.Password;
-            m_connectionFactory.VirtualHost = other.ConnectionFactory.VirtualHost;
+            m_connectionFactory = (ConnectionFactory) other.Broker;
         }
-
 
         public override IChannelFactory<TChannel> BuildChannelFactory<TChannel>(BindingContext context)
         {
@@ -159,29 +154,18 @@ public override string Scheme
         }
 
 
+        private Uri m_broker;
         /// <summary>
         /// Specifies the address of the RabbitMQ Server
         /// </summary>
         [ConfigurationProperty("broker")]
         public Uri Broker
         {
-            get 
-            { 
-                if(!m_hasBroker) return null;                
-                UriBuilder build = new UriBuilder();
-                build.Host = m_connectionFactory.HostName;
-                build.Port = m_connectionFactory.Port;
-                return build.Uri; 
-            }
+            get { return m_broker; }
             set 
             { 
-                if(value == null) m_hasBroker = false;
-                else 
-                {
-                    m_hasBroker = true;	
-                    m_connectionFactory.HostName = value.Host;
-                    m_connectionFactory.Port = value.Port;  
-                }
+                m_broker = value;
+                m_connectionFactory = (ConnectionFactory) value;
             }
         }