merging in from bug 21531

Author: Matthew Sackman

src/client/api/AmqpTcpEndpoint.cs

@@ -63,6 +63,14 @@ namespace RabbitMQ.Client
     ///<summary>Represents a TCP-addressable AMQP peer, including the
     ///protocol variant to use, and a host name and port
     ///number.</summary>
+    ///<para>
+    /// Some of the constructors take, as a convenience, a System.Uri
+    /// instance representing an AMQP server address. The use of Uri
+    /// here is not standardised - Uri is simply a convenient
+    /// container for internet-address-like components. In particular,
+    /// the Uri "Scheme" property is ignored: only the "Host" and
+    /// "Port" properties are extracted.
+    ///</para>
     public class AmqpTcpEndpoint
     {
         private IProtocol m_protocol;
@@ -101,25 +109,103 @@ public SslOption Ssl
             set { m_ssl = value; }
         }
 
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, hostname, port number and ssl option. If the port 
+        ///number is -1, the default port number for the IProtocol 
+        ///will be used.</summary>
+        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne, SslOption ssl)
+        {
+            m_protocol = protocol;
+            m_hostName = hostName;
+            m_port = portOrMinusOne;
+            m_ssl = ssl;
+        }
+
         ///<summary>Construct an AmqpTcpEndpoint with the given
         ///IProtocol, hostname, and port number. If the port number is
         ///-1, the default port number for the IProtocol will be
         ///used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocolVariant, string hostname, int portOrMinusOne):
-            this(protocolVariant, hostname, portOrMinusOne, new SslOption())
+        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne) :
+            this(protocol, hostName, portOrMinusOne, new SslOption())
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, hostname, port number and Ssl option. If the port 
-        ///number is -1, the default port number for the IProtocol 
-        ///will be used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocolVariant, string hostname, int portOrMinusOne, SslOption ssl)
+        ///IProtocol and hostname, using the default port for the
+        ///IProtocol.</summary>
+        public AmqpTcpEndpoint(IProtocol protocol, string hostName) :
+            this(protocol, hostName, -1)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, "localhost" as the hostname, and using the
+        ///default port for the IProtocol.</summary>
+        public AmqpTcpEndpoint(IProtocol protocol) :
+            this(protocol, "localhost", -1)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///hostname and port number, using the IProtocol from
+        ///Protocols.FromEnvironment(). If the port number is
+        ///-1, the default port number for the IProtocol will be
+        ///used.</summary>
+        public AmqpTcpEndpoint(string hostName, int portOrMinusOne) :
+            this(Protocols.FromEnvironment(), hostName, portOrMinusOne)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///hostname, using the IProtocol from
+        ///Protocols.FromEnvironment(), and the default port number of
+        ///that IProtocol.</summary>
+        public AmqpTcpEndpoint(string hostName) :
+            this(Protocols.FromEnvironment(), hostName)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with a hostname of
+        ///"localhost", using the IProtocol from
+        ///Protocols.FromEnvironment(), and the default port number of
+        ///that IProtocol.</summary>
+        public AmqpTcpEndpoint() :
+            this(Protocols.FromEnvironment())
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, Uri and ssl options.</summary>
+        ///<remarks>
+        /// Please see the class overview documentation for
+        /// information about the Uri format in use.
+        ///</remarks>
+        public AmqpTcpEndpoint(IProtocol protocol, Uri uri, SslOption ssl) :
+            this(protocol, uri.Host, uri.Port, ssl)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol and Uri.</summary>
+        ///<remarks>
+        /// Please see the class overview documentation for
+        /// information about the Uri format in use.
+        ///</remarks>
+        public AmqpTcpEndpoint(IProtocol protocol, Uri uri) :
+            this(protocol, uri.Host, uri.Port)
+        {
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///Uri, using the IProtocol from
+        ///Protocols.FromEnvironment().</summary>
+        ///<remarks>
+        /// Please see the class overview documentation for
+        /// information about the Uri format in use.
+        ///</remarks>
+        public AmqpTcpEndpoint(Uri uri) :
+            this(Protocols.FromEnvironment(), uri)
         {
-            m_protocol = protocolVariant;
-            m_hostName = hostname;
-            m_port = portOrMinusOne;
-            m_ssl = ssl;
         }
 
         ///<summary>Returns a URI-like string of the form

src/client/api/ConnectionFactory.cs

@@ -259,17 +259,18 @@ public IConnection CreateConnection(IProtocol version,
                                             string hostName,
                                             int portNumber)
         {
-            return CreateConnection(new AmqpTcpEndpoint[] {
-                                        new AmqpTcpEndpoint(version, hostName, portNumber, m_parameters.Ssl)
-                                    });
+            return CreateConnection(new AmqpTcpEndpoint(version,
+                                                        hostName,
+                                                        portNumber,
+                                                        m_parameters.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(version, hostName, -1);
+            return CreateConnection(new AmqpTcpEndpoint(version, hostName));
         }
 
         ///<summary>Create a connection to the endpoint specified.</summary>
@@ -280,7 +281,7 @@ public IConnection CreateConnection(IProtocol version, string hostName)
         ///<exception cref="ArgumentException"/>
         public IConnection CreateConnection(IProtocol version, Uri uri)
         {
-            return CreateConnection(version, uri.Host, uri.Port);
+            return CreateConnection(new AmqpTcpEndpoint(version, uri));
         }
 
         ///<summary>Create a connection to the endpoint specified,
@@ -292,7 +293,7 @@ public IConnection CreateConnection(IProtocol version, Uri uri)
         ///</remarks>
         public IConnection CreateConnection(Uri uri)
         {
-            return CreateConnection(Protocols.FromEnvironment(), uri.Host, uri.Port);
+            return CreateConnection(new AmqpTcpEndpoint(uri));
         }
 
         ///<summary>Create a connection to the host (and optional