Merge pull request #925 from bollhals/commandId

Command Id instead of class & method id

Author: michaelklishin

projects/RabbitMQ.Client/client/api/IMethod.cs

@@ -41,12 +41,26 @@ namespace RabbitMQ.Client.Exceptions
 #endif
     public class UnexpectedMethodException : ProtocolViolationException
     {
-        public UnexpectedMethodException(IMethod method)
+        public UnexpectedMethodException(ushort classId, ushort methodId, string methodName)
         {
-            Method = method;
+            ProtocolClassId = classId;
+            ProtocolMethodId = methodId;
+            ProtocolMethodName = methodName;
         }
 
-        ///<summary>The unexpected reply method.</summary>
-        public IMethod Method { get; private set; }
+        /// <summary>
+        /// Retrieves the class ID number of this method, as defined in the AMQP specification XML.
+        /// </summary>
+        public ushort ProtocolClassId { get; }
+
+        /// <summary>
+        /// Retrieves the method ID number of this method, as defined in the AMQP specification XML.
+        /// </summary>
+        public ushort ProtocolMethodId { get; }
+
+        /// <summary>
+        /// Retrieves the name of this method - for debugging use.
+        /// </summary>
+        public string ProtocolMethodName { get; }
     }
 }

projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs

@@ -29,6 +29,8 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using RabbitMQ.Client.client.framing;
+
 namespace RabbitMQ.Client.Framing.Impl
 {
     internal sealed class BasicAck : Client.Impl.MethodBase
@@ -46,8 +48,7 @@ public BasicAck(ulong DeliveryTag, bool Multiple)
             _multiple = Multiple;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.Ack;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicAck;
         public override string ProtocolMethodName => "basic.ack";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicAck.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -48,8 +49,7 @@ public BasicCancel(string ConsumerTag, bool Nowait)
             _nowait = Nowait;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.Cancel;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicCancel;
         public override string ProtocolMethodName => "basic.cancel";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicCancel.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -46,8 +47,7 @@ public BasicCancelOk(string ConsumerTag)
             _consumerTag = ConsumerTag;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.CancelOk;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicCancelOk;
         public override string ProtocolMethodName => "basic.cancel-ok";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs

@@ -31,6 +31,7 @@
 
 using System.Collections.Generic;
 using System.Text;
+using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client.Framing.Impl
@@ -62,8 +63,7 @@ public BasicConsume(ushort Reserved1, string Queue, string ConsumerTag, bool NoL
             _arguments = Arguments;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.Consume;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicConsume;
         public override string ProtocolMethodName => "basic.consume";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicConsume.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -46,8 +47,7 @@ public BasicConsumeOk(string ConsumerTag)
             _consumerTag = ConsumerTag;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.ConsumeOk;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicConsumeOk;
         public override string ProtocolMethodName => "basic.consume-ok";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -54,8 +55,7 @@ public BasicDeliver(string ConsumerTag, ulong DeliveryTag, bool Redelivered, str
             _routingKey = RoutingKey;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.Deliver;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicDeliver;
         public override string ProtocolMethodName => "basic.deliver";
         public override bool HasContent => true;
 

projects/RabbitMQ.Client/client/framing/BasicDeliver.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -50,8 +51,7 @@ public BasicGet(ushort Reserved1, string Queue, bool NoAck)
             _noAck = NoAck;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.Get;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicGet;
         public override string ProtocolMethodName => "basic.get";
         public override bool HasContent => false;
 

projects/RabbitMQ.Client/client/framing/BasicGet.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System.Text;
+using RabbitMQ.Client.client.framing;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
@@ -46,8 +47,7 @@ public BasicGetEmpty(string Reserved1)
             _reserved1 = Reserved1;
         }
 
-        public override ushort ProtocolClassId => ClassConstants.Basic;
-        public override ushort ProtocolMethodId => BasicMethodConstants.GetEmpty;
+        public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicGetEmpty;
         public override string ProtocolMethodName => "basic.get-empty";
         public override bool HasContent => false;