@@ -75,9 +75,9 @@ namespace RabbitMQ.Client
7575 /// ConnectionFactory factory = new ConnectionFactory();
7676 /// //
7777 /// // The next three lines are optional:
78- /// factory.Parameters.UserName = ConnectionParameters .DefaultUser;
79- /// factory.Parameters.Password = ConnectionParameters .DefaultPass;
80- /// factory.Parameters.VirtualHost = ConnectionParameters .DefaultVHost;
78+ /// factory.Parameters.UserName = AMQPParameters .DefaultUser;
79+ /// factory.Parameters.Password = AMQPParameters .DefaultPass;
80+ /// factory.Parameters.VirtualHost = AMQPParameters .DefaultVHost;
8181 /// //
8282 /// IProtocol protocol = Protocols.DefaultProtocol;
8383 /// IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
@@ -103,17 +103,8 @@ namespace RabbitMQ.Client
103103 ///</remarks>
104104 public class ConnectionFactory
105105 {
106- private ConnectionParameters m_parameters = new ConnectionParameters ( ) ;
107- ///<summary>Retrieve the parameters this factory uses to
108- ///construct IConnection instances.</summary>
109- public ConnectionParameters Parameters
110- {
111- get
112- {
113- return m_parameters ;
114- }
115- }
116-
106+ public ConnectionParameters [ ] ConnectionParameters = { new ConnectionParameters ( ) } ;
107+
117108 ///<summary>Constructs a ConnectionFactory with default values
118109 ///for Parameters.</summary>
119110 public ConnectionFactory ( )
@@ -124,10 +115,10 @@ protected virtual IConnection FollowRedirectChain
124115 ( int maxRedirects ,
125116 IDictionary connectionAttempts ,
126117 IDictionary connectionErrors ,
127- ref AmqpTcpEndpoint [ ] mostRecentKnownHosts ,
128- AmqpTcpEndpoint endpoint )
118+ ref ConnectionParameters [ ] mostRecentKnownHosts ,
119+ ConnectionParameters endpoint )
129120 {
130- AmqpTcpEndpoint candidate = endpoint ;
121+ ConnectionParameters candidate = endpoint ;
131122 try {
132123 while ( true ) {
133124 int attemptCount =
@@ -138,13 +129,13 @@ protected virtual IConnection FollowRedirectChain
138129 bool insist = attemptCount >= maxRedirects ;
139130
140131 try {
141- IProtocol p = candidate . Protocol ;
142- IFrameHandler fh = p . CreateFrameHandler ( candidate ) ;
132+ IProtocol p = candidate . AMQP . Protocol ;
133+ IFrameHandler fh = p . CreateFrameHandler ( candidate . TCP ) ;
143134 // At this point, we may be able to create
144135 // and fully open a successful connection,
145136 // in which case we're done, and the
146137 // connection should be returned.
147- return p . CreateConnection ( m_parameters , insist , fh ) ;
138+ return p . CreateConnection ( candidate . AMQP , insist , fh ) ;
148139 } catch ( RedirectException re ) {
149140 if ( insist ) {
150141 // We've been redirected, but we insisted that
@@ -160,9 +151,12 @@ protected virtual IConnection FollowRedirectChain
160151 // mostRecentKnownHosts (in case the chain
161152 // runs out), and updating candidate for the
162153 // next time round the loop.
163- connectionErrors [ candidate ] = re ;
164- mostRecentKnownHosts = re . KnownHosts ;
165- candidate = re . Host ;
154+ connectionErrors [ candidate ] = re ;
155+ mostRecentKnownHosts = new ConnectionParameters [ re . KnownHosts . Length ] ;
156+ for ( int i = 0 ; i < re . KnownHosts . Length ; i ++ ) {
157+ mostRecentKnownHosts [ i ] = new ConnectionParameters ( candidate . AMQP , re . KnownHosts [ i ] ) ;
158+ }
159+ candidate = new ConnectionParameters ( candidate . AMQP , re . Host ) ;
166160 }
167161 }
168162 }
@@ -175,13 +169,14 @@ protected virtual IConnection FollowRedirectChain
175169 protected virtual IConnection CreateConnection ( int maxRedirects ,
176170 IDictionary connectionAttempts ,
177171 IDictionary connectionErrors ,
178- params AmqpTcpEndpoint [ ] endpoints )
172+ ConnectionParameters [ ] endpoints )
179173 {
180- foreach ( AmqpTcpEndpoint endpoint in endpoints )
174+ foreach ( ConnectionParameters endpoint in endpoints )
181175 {
182- AmqpTcpEndpoint [ ] mostRecentKnownHosts = new AmqpTcpEndpoint [ 0 ] ;
176+ ConnectionParameters [ ] mostRecentKnownHosts = new ConnectionParameters [ 0 ] ;
183177 // ^^ holds a list of known-hosts that came back with
184- // a connection.redirect. If, once we reach the end of
178+ // a connection.redirect, together with the AMQPParameters
179+ // used for that connection attempt. If, once we reach the end of
185180 // a chain of redirects, we still haven't managed to
186181 // get a usable connection, we recurse on
187182 // mostRecentKnownHosts, trying each of those in
@@ -230,15 +225,14 @@ protected virtual IConnection CreateConnection(int maxRedirects,
230225 ///endpoint in the list provided. Up to a maximum of
231226 ///maxRedirects broker-originated redirects are permitted for
232227 ///each endpoint tried.</summary>
233- public virtual IConnection CreateConnection ( int maxRedirects ,
234- params AmqpTcpEndpoint [ ] endpoints )
228+ public virtual IConnection CreateConnection ( int maxRedirects )
235229 {
236230 IDictionary connectionAttempts = new Hashtable ( ) ;
237231 IDictionary connectionErrors = new Hashtable ( ) ;
238232 IConnection conn = CreateConnection ( maxRedirects ,
239233 connectionAttempts ,
240234 connectionErrors ,
241- endpoints ) ;
235+ ConnectionParameters ) ;
242236 if ( conn != null ) {
243237 return conn ;
244238 }
@@ -248,61 +242,9 @@ public virtual IConnection CreateConnection(int maxRedirects,
248242 ///<summary>Create a connection to the first available
249243 ///endpoint in the list provided. No broker-originated
250244 ///redirects are permitted.</summary>
251- public virtual IConnection CreateConnection ( params AmqpTcpEndpoint [ ] endpoints )
245+ public virtual IConnection CreateConnection ( )
252246 {
253- return CreateConnection ( 0 , endpoints ) ;
254- }
255-
256- ///<summary>Create a connection to the endpoint specified.</summary>
257- ///<exception cref="ArgumentException"/>
258- public IConnection CreateConnection ( IProtocol version ,
259- string hostName ,
260- int portNumber )
261- {
262- return CreateConnection ( new AmqpTcpEndpoint ( version ,
263- hostName ,
264- portNumber ,
265- m_parameters . Ssl ) ) ;
266- }
267-
268- ///<summary>Create a connection to the endpoint specified. The
269- ///port used is the default for the protocol.</summary>
270- ///<exception cref="ArgumentException"/>
271- public IConnection CreateConnection ( IProtocol version , string hostName )
272- {
273- return CreateConnection ( new AmqpTcpEndpoint ( version , hostName ) ) ;
274- }
275-
276- ///<summary>Create a connection to the endpoint specified.</summary>
277- ///<remarks>
278- /// Please see the class overview documentation for
279- /// information about the Uri format in use.
280- ///</remarks>
281- ///<exception cref="ArgumentException"/>
282- public IConnection CreateConnection ( IProtocol version , Uri uri )
283- {
284- return CreateConnection ( new AmqpTcpEndpoint ( version , uri ) ) ;
285- }
286-
287- ///<summary>Create a connection to the endpoint specified,
288- ///with the IProtocol from
289- ///Protocols.FromEnvironment().</summary>
290- ///<remarks>
291- /// Please see the class overview documentation for
292- /// information about the Uri format in use.
293- ///</remarks>
294- public IConnection CreateConnection ( Uri uri )
295- {
296- return CreateConnection ( new AmqpTcpEndpoint ( uri ) ) ;
297- }
298-
299- ///<summary>Create a connection to the host (and optional
300- ///port) specified, with the IProtocol from
301- ///Protocols.FromEnvironment(). The format of the address
302- ///string is the same as that accepted by
303- ///AmqpTcpEndpoint.Parse().</summary>
304- public IConnection CreateConnection ( string address ) {
305- return CreateConnection ( AmqpTcpEndpoint . Parse ( Protocols . FromEnvironment ( ) , address ) ) ;
247+ return CreateConnection ( 0 ) ;
306248 }
307249 }
308250}
0 commit comments