fix API to provide parameterless CreateConnection

Author: David R. MacIver

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

@@ -73,6 +73,9 @@ namespace RabbitMQ.Client
     ///</para>
     public class AmqpTcpEndpoint
     {
+        ///<summary>Indicates that the default port for the protocol should be used</summary>
+        public const int UseDefaultPort = -1;
+
         private IProtocol m_protocol;
         ///<summary>Retrieve or set the IProtocol of this AmqpTcpEndpoint.</summary>
         public IProtocol Protocol
@@ -95,7 +98,7 @@ public string HostName
         ///port number for the IProtocol to be used.</summary>
         public int Port
         {
-            get { return (m_port == -1) ? m_protocol.DefaultPort : m_port; }
+            get { return (m_port == UseDefaultPort) ? m_protocol.DefaultPort : m_port; }
             set { m_port = value; }
         }
 

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

@@ -78,12 +78,11 @@ namespace RabbitMQ.Client
     ///     factory.UserName = ConnectionFactory.DefaultUser;
     ///     factory.Password = ConnectionFactory.DefaultPass;
     ///     factory.VirtualHost = ConnectionFactory.DefaultVHost;
-    ///     factory.Protocol = Protocols.DefaultProtocol;
+    ///     factory.Protocol = Protocols.FromEnvironment();
     ///     factory.HostName = hostName;
-    //      factory.PortNumber = portNumber;
+    //      factory.PortNumber = AmqpTcpEndpoint.UseDefaultPort;
     ///     //
-    ///     IProtocol protocol = Protocols.DefaultProtocol;
-    ///     IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
+    ///     IConnection conn = factory.CreateConnection();
     ///     //
     ///     IModel ch = conn.CreateModel();
     ///     //
@@ -148,6 +147,31 @@ public class ConnectionFactory
         ///<summary>Ssl options setting</summary>
         public SslOption Ssl = new SslOption();
 
+        ///<summary>The host to connect to</summary>
+        public String HostName = "localhost";
+
+        ///<summary>The port to connect on. AmqpTcpEndpoint.UseDefaultPort indicates the 
+        /// default for the protocol should be used.</summary>
+        public int Port = AmqpTcpEndpoint.UseDefaultPort;
+
+        ///<summary>The AMQP protocol to be used</summary>
+        public IProtocol Protocol = Protocols.FromEnvironment();
+
+
+        public AmqpTcpEndpoint Endpoint
+        { 
+          get
+          { 
+              return new AmqpTcpEndpoint(Protocol, HostName, Port); 
+          }
+          set
+          {
+              Protocol = value.Protocol;
+              Port = value.Port;
+              HostName = value.HostName;
+          }
+        }
+
         ///<summary>Construct a fresh instance, with all fields set to
         ///their respective defaults.</summary>
         public ConnectionFactory() { }
@@ -262,79 +286,25 @@ protected virtual IConnection CreateConnection(int maxRedirects,
         ///endpoint in the list provided. Up to a maximum of
         ///maxRedirects broker-originated redirects are permitted for
         ///each endpoint tried.</summary>
-        public virtual IConnection CreateConnection(int maxRedirects,
-                                                    params AmqpTcpEndpoint[] endpoints)
+        public virtual IConnection CreateConnection(int maxRedirects)
         {
             IDictionary connectionAttempts = new Hashtable();
             IDictionary connectionErrors = new Hashtable();
             IConnection conn = CreateConnection(maxRedirects,
                                                 connectionAttempts,
                                                 connectionErrors,
-                                                endpoints);
+                                                new AmqpTcpEndpoint[]{Endpoint});
             if (conn != null) {
                 return conn;
             }
             throw new BrokerUnreachableException(connectionAttempts, connectionErrors);
         }
 
-        ///<summary>Create a connection to the first available
-        ///endpoint in the list provided. No broker-originated
-        ///redirects are permitted.</summary>
-        public virtual IConnection CreateConnection(params AmqpTcpEndpoint[] endpoints)
+        ///<summary>Create a connection to the specified endpoint
+        ///No broker-originated redirects are permitted.</summary>
+        public virtual IConnection CreateConnection()
         {
-            return CreateConnection(0, endpoints);
-        }
-
-        ///<summary>Create a connection to the endpoint specified.</summary>
-        ///<exception cref="ArgumentException"/>
-        public IConnection CreateConnection(IProtocol version,
-                                            string hostName,
-                                            int portNumber)
-        {
-            return CreateConnection(new AmqpTcpEndpoint(version,
-                                                        hostName,
-                                                        portNumber,
-                                                        this.Ssl));
-        }
-
-        ///<summary>Create a connection to the endpoint specified. The
-        ///port used is the default for the protocol.</summary>
-        ///<exception cref="ArgumentException"/>
-        public IConnection CreateConnection(IProtocol version, string hostName)
-        {
-            return CreateConnection(new AmqpTcpEndpoint(version, hostName));
-        }
-
-        ///<summary>Create a connection to the endpoint specified.</summary>
-        ///<remarks>
-        /// Please see the class overview documentation for
-        /// information about the Uri format in use.
-        ///</remarks>
-        ///<exception cref="ArgumentException"/>
-        public IConnection CreateConnection(IProtocol version, Uri uri)
-        {
-            return CreateConnection(new AmqpTcpEndpoint(version, uri));
-        }
-
-        ///<summary>Create a connection to the endpoint specified,
-        ///with the IProtocol from
-        ///Protocols.FromEnvironment().</summary>
-        ///<remarks>
-        /// Please see the class overview documentation for
-        /// information about the Uri format in use.
-        ///</remarks>
-        public IConnection CreateConnection(Uri uri)
-        {
-            return CreateConnection(new AmqpTcpEndpoint(uri));
-        }
-
-        ///<summary>Create a connection to the host (and optional
-        ///port) specified, with the IProtocol from
-        ///Protocols.FromEnvironment(). The format of the address
-        ///string is the same as that accepted by
-        ///AmqpTcpEndpoint.Parse().</summary>
-        public IConnection CreateConnection(string address) {
-            return CreateConnection(AmqpTcpEndpoint.Parse(Protocols.FromEnvironment(), address));
+            return CreateConnection(0);
         }
     }
 }