complete the apparently half completed process of ripping out Protocol from AmqpTcpEndpoint

Author: David R. MacIver

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

@@ -73,14 +73,6 @@ namespace RabbitMQ.Client
     ///</para>
     public class AmqpTcpEndpoint
     {
-        private IProtocol m_protocol;
-        ///<summary>Retrieve or set the IProtocol of this AmqpTcpEndpoint.</summary>
-        public IProtocol Protocol
-        {
-            get { return m_protocol; }
-            set { m_protocol = value; }
-        }
-
         private string m_hostName;
         ///<summary>Retrieve or set the hostname of this AmqpTcpEndpoint.</summary>
         public string HostName
@@ -91,11 +83,11 @@ public string HostName
 
         private int m_port;
         ///<summary>Retrieve or set the port number of this
-        ///AmqpTcpEndpoint. A port number of -1 causes the default
-        ///port number for the IProtocol to be used.</summary>
+        ///AmqpTcpEndpoint. -1 indicates the default value should be used.
+        ///</summary>
         public int Port
         {
-            get { return (m_port == -1) ? m_protocol.DefaultPort : m_port; }
+            get { return m_port; }
             set { m_port = value; }
         }
 
@@ -110,67 +102,37 @@ public SslOption Ssl
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, hostname, port number and ssl option. If the port 
+        ///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)
+        public AmqpTcpEndpoint(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 protocol, string hostName, int portOrMinusOne) :
-            this(protocol, hostName, portOrMinusOne, new SslOption())
-        {
-        }
-
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///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
+        /// hostname, and port number. 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)
+            this(hostName, portOrMinusOne, new SslOption())
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///hostname, using the IProtocol from
-        ///Protocols.FromEnvironment(), and the default port number of
-        ///that IProtocol.</summary>
+        ///hostname, using the default port for the
+        ///IProtocol.</summary>
         public AmqpTcpEndpoint(string hostName) :
-            this(Protocols.FromEnvironment(), hostName)
+            this(hostName, -1)
         {
         }
 
-        ///<summary>Construct an AmqpTcpEndpoint with a hostname of
-        ///"localhost", using the IProtocol from
-        ///Protocols.FromEnvironment(), and the default port number of
-        ///that IProtocol.</summary>
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///localhost" as the hostname, and the default port </summary>
         public AmqpTcpEndpoint() :
-            this(Protocols.FromEnvironment())
+            this("localhost", -1)
         {
         }
 
@@ -180,31 +142,19 @@ public AmqpTcpEndpoint() :
         /// 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)
+        public AmqpTcpEndpoint(Uri uri, SslOption ssl) :
+            this(uri.Host, uri.Port, ssl)
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///Uri, using the IProtocol from
-        ///Protocols.FromEnvironment().</summary>
+        ///Uri.</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)
+            this(uri.Host, uri.Port)
         {
         }
 
@@ -215,7 +165,7 @@ public AmqpTcpEndpoint(Uri uri) :
         ///</remarks>
         public override string ToString()
         {
-            return "amqp-" + Protocol + "://" + HostName + ":" + Port;
+            return "amqp://" + HostName + ":" + Port;
         }
 
         ///<summary>Compares this instance by value (protocol,
@@ -224,24 +174,22 @@ public override bool Equals(object obj)
         {
             AmqpTcpEndpoint other = obj as AmqpTcpEndpoint;
             if (other == null) return false;
-            if (other.Protocol != Protocol) return false;
             if (other.HostName != HostName) return false;
             if (other.Port != Port) return false;
             return true;
         }
 
-        ///<summary>Implementation of hash code depending on protocol,
+        ///<summary>Implementation of hash code depending on 
         ///hostname and port, to line up with the implementation of
         ///Equals()</summary>
         public override int GetHashCode()
         {
             return
-                Protocol.GetHashCode() ^
                 HostName.GetHashCode() ^
                 Port;
         }
 
-        ///<summary>Construct an instance from a protocol and an
+        ///<summary>Construct an instance from an
         ///address in "hostname:port" format.</summary>
         ///<remarks>
         /// If the address string passed in contains ":", it is split
@@ -250,15 +198,14 @@ public override int GetHashCode()
         /// is set to -1 (meaning the default number for the protocol
         /// variant specified).
         ///</remarks>
-        public static AmqpTcpEndpoint Parse(IProtocol protocol, string address) {
+        public static AmqpTcpEndpoint Parse(string address) {
             int index = address.IndexOf(':');
             if (index == -1) {
-                return new AmqpTcpEndpoint(protocol, address, -1);
+                return new AmqpTcpEndpoint(address, -1);
             } else {
                 string portStr = address.Substring(index + 1).Trim();
                 int portNum = (portStr.Length == 0) ? -1 : int.Parse(portStr);
-                return new AmqpTcpEndpoint(protocol,
-                                           address.Substring(0, index),
+                return new AmqpTcpEndpoint(address.Substring(0, index),
                                            portNum);
             }
         }
@@ -271,13 +218,13 @@ public static AmqpTcpEndpoint Parse(IProtocol protocol, string address) {
         /// optional, and returns a corresponding array of
         /// AmqpTcpEndpoints.
         ///</remarks>
-        public static AmqpTcpEndpoint[] ParseMultiple(IProtocol protocol, string addresses) {
+        public static AmqpTcpEndpoint[] ParseMultiple(string addresses) {
             string[] partsArr = addresses.Split(new char[] { ',' });
             ArrayList results = new ArrayList();
             foreach (string partRaw in partsArr) {
                 string part = partRaw.Trim();
                 if (part.Length > 0) {
-                    results.Add(Parse(protocol, part));
+                    results.Add(Parse(part));
                 }
             }
             return (AmqpTcpEndpoint[]) results.ToArray(typeof(AmqpTcpEndpoint));

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

@@ -103,14 +103,28 @@ namespace RabbitMQ.Client
     ///</remarks>
     public class ConnectionFactory
     {
-        public ConnectionParameters[] ConnectionParameters = { new ConnectionParameters() };
+        public ConnectionParameters[] ConnectionParameters;
 
         ///<summary>Constructs a ConnectionFactory with default values
         ///for Parameters.</summary>
-        public ConnectionFactory()
+        public ConnectionFactory(params ConnectionParameters[] parameters)
         {
+          this.ConnectionParameters = parameters;
         }
 
+        public ConnectionFactory(AMQPParameters amqpParameters, AmqpTcpEndpoint endpoint) : this(new ConnectionParameters(amqpParameters, endpoint)) 
+        {
+        }
+
+        public ConnectionFactory(AMQPParameters amqpParameters) : this(amqpParameters, new AmqpTcpEndpoint())
+        {
+        }
+
+        public ConnectionFactory(AmqpTcpEndpoint endpoint) : this(new AMQPParameters(), endpoint)
+        {
+        }
+        
+
         protected virtual IConnection FollowRedirectChain
             (int maxRedirects,
              IDictionary connectionAttempts,

projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

@@ -194,7 +194,7 @@ IProtocol IConnection.Protocol
         {
             get
             {
-                return Endpoint.Protocol;
+                return Parameters.Protocol;
             }
         }
 
@@ -204,7 +204,7 @@ public AbstractProtocolBase Protocol
         {
             get
             {
-                return (AbstractProtocolBase)Endpoint.Protocol;
+                return (AbstractProtocolBase)Parameters.Protocol;
             }
         }
 
@@ -982,7 +982,7 @@ public void Open(bool insist)
             string knownHosts = m_model0.ConnectionOpen(m_parameters.VirtualHost,
                                                         "", // FIXME: make configurable?
                                                         insist);
-            KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
+            KnownHosts = AmqpTcpEndpoint.ParseMultiple(knownHosts);
         }
 
         public override string ToString()

projects/client/RabbitMQ.Client/src/client/impl/RedirectException.cs

@@ -85,7 +85,7 @@ public RedirectException(IProtocol protocol,
                                  string host,
                                  string knownHosts)
             : this(ParseHost(protocol, host),
-                   AmqpTcpEndpoint.ParseMultiple(protocol, knownHosts))
+                   AmqpTcpEndpoint.ParseMultiple(knownHosts))
         {}
 
         public RedirectException(AmqpTcpEndpoint host, AmqpTcpEndpoint[] knownHosts)
@@ -108,9 +108,9 @@ public RedirectException(AmqpTcpEndpoint host, AmqpTcpEndpoint[] knownHosts)
         /// array.
         ///</remarks>
         public static AmqpTcpEndpoint ParseHost(IProtocol protocol, string host) {
-            AmqpTcpEndpoint[] addresses = AmqpTcpEndpoint.ParseMultiple(protocol, host);
+            AmqpTcpEndpoint[] addresses = AmqpTcpEndpoint.ParseMultiple(host);
             if (addresses.Length == 0) {
-                return AmqpTcpEndpoint.Parse(protocol, "");
+                return AmqpTcpEndpoint.Parse("");
                 // ^^ effectively, a (kind of useless) default or null result
             } else {
                 return addresses[0];

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs

@@ -69,12 +69,14 @@ public class SocketFrameHandler_0_9 : IFrameHandler
         // ^^ System.Net.Sockets.SocketError doesn't exist in .NET 1.1
 
         public AmqpTcpEndpoint m_endpoint;
+        public IProtocol Protocol;
         public TcpClient m_socket;
         public NetworkBinaryReader m_reader;
-        public NetworkBinaryWriter m_writer;
+        public NetworkBinaryWriter m_writer;        
 
-        public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint)
+        public SocketFrameHandler_0_9(IProtocol protocol, AmqpTcpEndpoint endpoint)
         {
+            Protocol = protocol;
             m_endpoint = endpoint;
             m_socket = new TcpClient();
             m_socket.Connect(endpoint.HostName, endpoint.Port);
@@ -121,8 +123,8 @@ public void SendHeader()
                 m_writer.Write(Encoding.ASCII.GetBytes("AMQP"));
                 m_writer.Write((byte)1);
                 m_writer.Write((byte)1);
-                m_writer.Write((byte)m_endpoint.Protocol.MajorVersion);
-                m_writer.Write((byte)m_endpoint.Protocol.MinorVersion);
+                m_writer.Write((byte)Protocol.MajorVersion);
+                m_writer.Write((byte)Protocol.MinorVersion);
                 m_writer.Flush();
             }
         }

projects/client/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs

@@ -62,7 +62,7 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 {
     public abstract class ProtocolBase: AbstractProtocolBase {
 
         public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) {
-            return new SocketFrameHandler_0_9(endpoint);
+            return new SocketFrameHandler_0_9(this, endpoint);
         }
 
         public override IModel CreateModel(ISession session) {

projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs

@@ -62,7 +62,8 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid {
     public abstract class ProtocolBase: AbstractProtocolBase {
 
         public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) {
-            return new SocketFrameHandler_0_9(endpoint);
+            //TODO: Query why we are creating a 0.9 frame handler for a 0.8 protocol
+            return new SocketFrameHandler_0_9(this, endpoint);
         }
 
         public override IModel CreateModel(ISession session) {

projects/client/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs

@@ -62,7 +62,7 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 {
     public abstract class ProtocolBase: AbstractProtocolBase {
 
         public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) {
-            return new SocketFrameHandler_0_9(endpoint);
+            return new SocketFrameHandler_0_9(this, endpoint);
         }
 
         public override IModel CreateModel(ISession session) {