merge bug26133 into bug26135

Author: michaelklishin

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

@@ -54,7 +54,7 @@ private Protocols() {}
         ///<summary>Protocol version 0-9-1 as modified by Pivotal.</summary>
         public static IProtocol AMQP_0_9_1
         {
-            get { return new RabbitMQ.Client.Framing.v0_9_1.Protocol(); }
+            get { return (IProtocol)new RabbitMQ.Client.Framing.v0_9_1.Protocol(); }
         }
 
         ///<summary>Retrieve the current default protocol variant

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

@@ -49,6 +49,7 @@
 // changes.
 using CommonFraming = RabbitMQ.Client.Framing.v0_9_1;
 using System.Diagnostics;
+using RabbitMQ.Client.Framing.Impl.v0_9_1;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -62,12 +63,12 @@ public enum AssemblyState
 
     public class CommandAssembler
     {
-        public AbstractProtocolBase m_protocol;
+        public ProtocolBase m_protocol;
         public AssemblyState m_state;
         public Command m_command;
         public ulong m_remainingBodyBytes;
 
-        public CommandAssembler(AbstractProtocolBase protocol)
+        public CommandAssembler(ProtocolBase protocol)
         {
             m_protocol = protocol;
             Reset();

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

@@ -55,6 +55,7 @@
 // the versions we support*. Obviously we may need to revisit this if
 // that ever changes.
 using CommonFraming = RabbitMQ.Client.Framing.v0_9_1;
+using RabbitMQ.Client.Framing.Impl.v0_9_1;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -222,11 +223,11 @@ IProtocol IConnection.Protocol
 
         ///<summary>Another overload of a Protocol property, useful
         ///for exposing a tighter type.</summary>
-        public AbstractProtocolBase Protocol
+        public ProtocolBase Protocol
         {
             get
             {
-                return (AbstractProtocolBase)Endpoint.Protocol;
+                return (ProtocolBase)Endpoint.Protocol;
             }
         }
 
@@ -1160,7 +1161,7 @@ public virtual void Open(bool insist)
             string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
                                                         "", // FIXME: make configurable?
                                                         insist);
-            KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
+            KnownHosts = AmqpTcpEndpoint.ParseMultiple((IProtocol)Protocol, knownHosts);
         }
 
         public override string ToString()

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

@@ -41,9 +41,18 @@
 using RabbitMQ.Client;
 using RabbitMQ.Client.Impl;
 using RabbitMQ.Util;
+using System.Collections.Generic;
 
 namespace RabbitMQ.Client.Framing.Impl.v0_9_1 {
-    public abstract class ProtocolBase: AbstractProtocolBase {
+    public abstract class ProtocolBase : IProtocol {
+
+        public abstract int MajorVersion { get; }
+        public abstract int MinorVersion { get; }
+        public abstract int Revision { get; }
+        public abstract string ApiName { get; }
+        public abstract int DefaultPort { get; }
+
+        public IDictionary<string, bool> Capabilities = new Dictionary<string, bool>();
 
         public ProtocolBase() {
             Capabilities["publisher_confirms"] = true;
@@ -54,25 +63,28 @@ public ProtocolBase() {
             Capabilities["authentication_failure_close"] = true;
         }
 
-        public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint,
+        public abstract MethodBase DecodeMethodFrom(NetworkBinaryReader reader);
+        public abstract ContentHeaderBase DecodeContentHeaderFrom(NetworkBinaryReader reader);
+
+        public IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint,
                                                          ConnectionFactory.ObtainSocket socketFactory,
                                                          int timeout)
         {
             return new SocketFrameHandler(endpoint, socketFactory, timeout);
         }
 
-        public override IModel CreateModel(ISession session) {
+        public IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(ConnectionFactory factory,
+        public IConnection CreateConnection(ConnectionFactory factory,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
             return new Connection(factory, insist, frameHandler);
         }
 
-        public override void CreateConnectionClose(ushort reasonCode,
+        public void CreateConnectionClose(ushort reasonCode,
                                                    string reasonText,
                                                    out Command request,
                                                    out int replyClassId,
@@ -85,7 +97,7 @@ public override void CreateConnectionClose(ushort reasonCode,
             replyMethodId = RabbitMQ.Client.Framing.Impl.v0_9_1.ConnectionCloseOk.MethodId;
         }
 
-        public override void CreateChannelClose(ushort reasonCode,
+        public void CreateChannelClose(ushort reasonCode,
                                                 string reasonText,
                                                 out Command request,
                                                 out int replyClassId,
@@ -98,9 +110,27 @@ public override void CreateChannelClose(ushort reasonCode,
             replyMethodId = RabbitMQ.Client.Framing.Impl.v0_9_1.ChannelCloseOk.MethodId;
         }
 
-        public override bool CanSendWhileClosed(Command cmd)
+        public bool CanSendWhileClosed(Command cmd)
         {
             return cmd.m_method is RabbitMQ.Client.Framing.Impl.v0_9_1.ChannelCloseOk;
         }
+
+        public AmqpVersion Version {
+            get {
+                return new AmqpVersion(MajorVersion, MinorVersion);
+            }
+        }
+
+        public override string ToString() {
+            return Version.ToString();
+        }
+
+        public override bool Equals(object obj) {
+            return (GetType() == obj.GetType());
+        }
+
+        public override int GetHashCode() {
+            return GetType().GetHashCode();
+        }
     }
 }