remove ConnectionFactory parameters

David R. MacIver · David R. MacIver · commit 425372a04a6d · 2009-12-22T16:53:00.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs b/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs
@@ -78,7 +78,7 @@ public interface IProtocol
         ///<summary>Construct a connection from a given set of
         ///parameters and a frame handler. The "insist" parameter is
         ///passed on to the AMQP connection.open method.</summary>
-        IConnection CreateConnection(ConnectionFactory parameters,
+        IConnection CreateConnection(ConnectionFactory factory,
                                      bool insist,
                                      IFrameHandler frameHandler);
         ///<summary>Construct a protocol model atop a given session.</summary>
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs
@@ -66,7 +66,7 @@ public abstract class AbstractProtocolBase: IProtocol {
         public abstract int DefaultPort { get; }
 
         public abstract IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
-        public abstract IConnection CreateConnection(ConnectionFactory parameters,
+        public abstract IConnection CreateConnection(ConnectionFactory factory,
                                                      bool insist,
                                                      IFrameHandler frameHandler);
         public abstract IModel CreateModel(ISession session);
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -89,7 +89,7 @@ public abstract class ConnectionBase : IConnection
         ///(milliseconds)</summary>
         public static int ConnectionCloseTimeout = 10000;
 
-        public ConnectionFactory m_parameters;
+        public ConnectionFactory m_factory;
         public IFrameHandler m_frameHandler;
         public uint m_frameMax = 0;
         public ushort m_heartbeat = 0;
@@ -119,11 +119,11 @@ public abstract class ConnectionBase : IConnection
         
         public IList m_shutdownReport = ArrayList.Synchronized(new ArrayList());
 
-        public ConnectionBase(ConnectionFactory parameters,
+        public ConnectionBase(ConnectionFactory factory,
                               bool insist,
                               IFrameHandler frameHandler)
         {
-            m_parameters = parameters;
+            m_factory = factory;
             m_frameHandler = frameHandler;
 
             m_sessionManager = new SessionManager(this);
@@ -218,7 +218,7 @@ public ConnectionFactory Parameters
         {
             get
             {
-                return m_parameters;
+                return m_factory;
             }
         }
 
@@ -959,27 +959,27 @@ public void Open(bool insist)
             ConnectionTuneDetails connectionTune =
                 m_model0.ConnectionStartOk(BuildClientPropertiesTable(),
                                            "PLAIN",
-                                           Encoding.UTF8.GetBytes("\0" + m_parameters.UserName +
-                                                                  "\0" + m_parameters.Password),
+                                           Encoding.UTF8.GetBytes("\0" + m_factory.UserName +
+                                                                  "\0" + m_factory.Password),
                                            "en_US");
 
-            ushort channelMax = (ushort) NegotiatedMaxValue(m_parameters.RequestedChannelMax,
+            ushort channelMax = (ushort) NegotiatedMaxValue(m_factory.RequestedChannelMax,
                                                             connectionTune.m_channelMax);
             ChannelMax = channelMax;
 
-            uint frameMax = NegotiatedMaxValue(m_parameters.RequestedFrameMax,
+            uint frameMax = NegotiatedMaxValue(m_factory.RequestedFrameMax,
                                                connectionTune.m_frameMax);
             FrameMax = frameMax;
 
-            ushort heartbeat = (ushort) NegotiatedMaxValue(m_parameters.RequestedHeartbeat,
+            ushort heartbeat = (ushort) NegotiatedMaxValue(m_factory.RequestedHeartbeat,
                                                            connectionTune.m_heartbeat);
             Heartbeat = heartbeat;
 
             m_model0.ConnectionTuneOk(channelMax,
                                       frameMax,
                                       heartbeat);
 
-            string knownHosts = m_model0.ConnectionOpen(m_parameters.VirtualHost,
+            string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
                                                         "", // FIXME: make configurable?
                                                         insist);
             KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_8 {
     public class Connection: ConnectionBase {
-        public Connection(ConnectionFactory parameters, bool insist, IFrameHandler frameHandler)
-            : base(parameters, insist, frameHandler) {}
+        public Connection(ConnectionFactory factory, bool insist, IFrameHandler frameHandler)
+            : base(factory, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs
@@ -69,11 +69,11 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(ConnectionFactory parameters,
+        public override IConnection CreateConnection(ConnectionFactory factory,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
-            return new Connection(parameters, insist, frameHandler);
+            return new Connection(factory, insist, frameHandler);
         }
 
         public override void CreateConnectionClose(ushort reasonCode,
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_8qpid {
     public class Connection: ConnectionBase {
-        public Connection(ConnectionFactory parameters, bool insist, IFrameHandler frameHandler)
-            : base(parameters, insist, frameHandler) {}
+        public Connection(ConnectionFactory factory , bool insist, IFrameHandler frameHandler)
+            : base(factory, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs
@@ -69,11 +69,11 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(ConnectionFactory parameters,
+        public override IConnection CreateConnection(ConnectionFactory factory,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
-            return new Connection(parameters, insist, frameHandler);
+            return new Connection(factory, insist, frameHandler);
         }
 
         public override void CreateConnectionClose(ushort reasonCode,
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_9 {
     public class Connection: ConnectionBase {
-        public Connection(ConnectionFactory parameters, bool insist, IFrameHandler frameHandler)
-            : base(parameters, insist, frameHandler) {}
+        public Connection(ConnectionFactory factory, bool insist, IFrameHandler frameHandler)
+            : base(factory, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs
@@ -69,11 +69,11 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(ConnectionFactory parameters,
+        public override IConnection CreateConnection(ConnectionFactory factory,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
-            return new Connection(parameters, insist, frameHandler);
+            return new Connection(factory, insist, frameHandler);
         }
 
         public override void CreateConnectionClose(ushort reasonCode,

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`
`60`	`60`	`namespace RabbitMQ.Client.Framing.Impl.v0_8 {`
`61`	`61`	`public class Connection: ConnectionBase {`
`62`		`- public Connection(ConnectionFactory parameters, bool insist, IFrameHandler frameHandler)`
`63`		`- : base(parameters, insist, frameHandler) {}`
	`62`	`+ public Connection(ConnectionFactory factory, bool insist, IFrameHandler frameHandler)`
	`63`	`+ : base(factory, insist, frameHandler) {}`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ public override IModel CreateModel(ISession session) {`
`69`	`69`	`return new Model(session);`
`70`	`70`	`}`
`71`	`71`
`72`		`- public override IConnection CreateConnection(ConnectionFactory parameters,`
	`72`	`+ public override IConnection CreateConnection(ConnectionFactory factory,`
`73`	`73`	`bool insist,`
`74`	`74`	`IFrameHandler frameHandler)`
`75`	`75`	`{`
`76`		`- return new Connection(parameters, insist, frameHandler);`
	`76`	`+ return new Connection(factory, insist, frameHandler);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public override void CreateConnectionClose(ushort reasonCode,`