delete ConnectionParameters and replace references to it with ConnectionFactory

Author: David R. MacIver

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

@@ -103,9 +103,9 @@ protected override void InitializeFrom(Binding binding)
                 this.Broker = rabbind.Broker;
                 this.OneWayOnly = rabbind.OneWayOnly;
                 this.TransactionFlowEnabled = rabbind.TransactionFlow;
-                this.VirtualHost = rabbind.Transport.ConnectionParameters.VirtualHost;
-                this.Username = rabbind.Transport.ConnectionParameters.UserName;
-                this.Password = rabbind.Transport.ConnectionParameters.Password;
+                this.VirtualHost = rabbind.Transport.ConnectionFactory.VirtualHost;
+                this.Username = rabbind.Transport.ConnectionFactory.UserName;
+                this.Password = rabbind.Transport.ConnectionFactory.Password;
             }
         }
 
@@ -127,9 +127,9 @@ protected override void OnApplyConfiguration(Binding binding)
             rabbind.BrokerProtocol = this.Protocol;
             rabbind.OneWayOnly = this.OneWayOnly;
             rabbind.TransactionFlow = this.TransactionFlowEnabled;
-            rabbind.Transport.ConnectionParameters.Password = this.Password;
-            rabbind.Transport.ConnectionParameters.UserName = this.Username;
-            rabbind.Transport.ConnectionParameters.VirtualHost = this.VirtualHost;
+            rabbind.Transport.ConnectionFactory.Password = this.Password;
+            rabbind.Transport.ConnectionFactory.UserName = this.Username;
+            rabbind.Transport.ConnectionFactory.VirtualHost = this.VirtualHost;
         }
 
         /// <summary>
@@ -156,7 +156,7 @@ public bool OneWayOnly
         /// <summary>
         /// Password to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("password", DefaultValue = ConnectionParameters.DefaultPass)]
+        [ConfigurationProperty("password", DefaultValue = ConnectionFactory.DefaultPass)]
         public string Password
         {
             get { return ((string)base["password"]); }
@@ -176,7 +176,7 @@ public bool TransactionFlowEnabled
         /// <summary>
         /// The username  to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("username", DefaultValue = ConnectionParameters.DefaultUser)]
+        [ConfigurationProperty("username", DefaultValue = ConnectionFactory.DefaultUser)]
         public string Username
         {
             get { return ((string)base["username"]); }
@@ -220,7 +220,7 @@ public IProtocol Protocol
         /// <summary>
         /// The virtual host to access.
         /// </summary>
-        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionParameters.DefaultVHost)]
+        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionFactory.DefaultVHost)]
         public string VirtualHost
         {
             get { return ((string)base["virtualHost"]); }

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

@@ -198,7 +198,7 @@ public IProtocol BrokerProtocol
             set { m_brokerProtocol = value; }
         }
 
-        public ConnectionParameters ConnectionParameters
+        public ConnectionFactory ConnectionFactory
         {
             get { return m_connectionFactory.Parameters; }
         }

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

@@ -83,9 +83,9 @@ public override void ApplyConfiguration(BindingElement bindingElement)
 
             rabbind.Broker = this.Broker;
             rabbind.BrokerProtocol = this.Protocol;
-            rabbind.ConnectionParameters.Password = this.Password;
-            rabbind.ConnectionParameters.UserName = this.Username;
-            rabbind.ConnectionParameters.VirtualHost = this.VirtualHost;
+            rabbind.ConnectionFactory.Password = this.Password;
+            rabbind.ConnectionFactory.UserName = this.Username;
+            rabbind.ConnectionFactory.VirtualHost = this.VirtualHost;
         }
 
         public override void CopyFrom(ServiceModelExtensionElement from)
@@ -132,9 +132,9 @@ protected override void InitializeFrom(System.ServiceModel.Channels.BindingEleme
 
             this.Broker = rabbind.Broker;
             this.ProtocolVersion = rabbind.BrokerProtocol.ApiName;
-            this.Password = rabbind.ConnectionParameters.Password;
-            this.Username = rabbind.ConnectionParameters.UserName;
-            this.VirtualHost = rabbind.ConnectionParameters.VirtualHost;
+            this.Password = rabbind.ConnectionFactory.Password;
+            this.Username = rabbind.ConnectionFactory.UserName;
+            this.VirtualHost = rabbind.ConnectionFactory.VirtualHost;
         }
 
         public override System.Type BindingElementType
@@ -155,7 +155,7 @@ public Uri Broker
         /// <summary>
         /// Password to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("password", DefaultValue = ConnectionParameters.DefaultPass)]
+        [ConfigurationProperty("password", DefaultValue = ConnectionFactory.DefaultPass)]
         public string Password
         {
             get { return ((string)base["password"]); }
@@ -165,7 +165,7 @@ public string Password
         /// <summary>
         /// The username  to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("username", DefaultValue = ConnectionParameters.DefaultUser)]
+        [ConfigurationProperty("username", DefaultValue = ConnectionFactory.DefaultUser)]
         public string Username
         {
             get { return ((string)base["username"]); }
@@ -208,7 +208,7 @@ private IProtocol GetProtocol()
         /// <summary>
         /// The virtual host to access.
         /// </summary>
-        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionParameters.DefaultVHost)]
+        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionFactory.DefaultVHost)]
         public string VirtualHost
         {
             get { return ((string)base["virtualHost"]); }