Skip to content

Commit 5f4f47e

Browse files
bollhalsbollhals
committed
use protocol command id instead of class id & method id
1 parent ab36f9b commit 5f4f47e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+396
-403
lines changed

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

Lines changed: 0 additions & 66 deletions
This file was deleted.

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,26 @@ namespace RabbitMQ.Client.Exceptions
4141
#endif
4242
public class UnexpectedMethodException : ProtocolViolationException
4343
{
44-
public UnexpectedMethodException(IMethod method)
44+
public UnexpectedMethodException(ushort classId, ushort methodId, string methodName)
4545
{
46-
Method = method;
46+
ProtocolClassId = classId;
47+
ProtocolMethodId = methodId;
48+
ProtocolMethodName = methodName;
4749
}
4850

49-
///<summary>The unexpected reply method.</summary>
50-
public IMethod Method { get; private set; }
51+
/// <summary>
52+
/// Retrieves the class ID number of this method, as defined in the AMQP specification XML.
53+
/// </summary>
54+
public ushort ProtocolClassId { get; }
55+
56+
/// <summary>
57+
/// Retrieves the method ID number of this method, as defined in the AMQP specification XML.
58+
/// </summary>
59+
public ushort ProtocolMethodId { get; }
60+
61+
/// <summary>
62+
/// Retrieves the name of this method - for debugging use.
63+
/// </summary>
64+
public string ProtocolMethodName { get; }
5165
}
5266
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicAck : Client.Impl.MethodBase
@@ -46,8 +48,7 @@ public BasicAck(ulong DeliveryTag, bool Multiple)
4648
_multiple = Multiple;
4749
}
4850

49-
public override ushort ProtocolClassId => ClassConstants.Basic;
50-
public override ushort ProtocolMethodId => BasicMethodConstants.Ack;
51+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicAck;
5152
public override string ProtocolMethodName => "basic.ack";
5253
public override bool HasContent => false;
5354

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -48,8 +49,7 @@ public BasicCancel(string ConsumerTag, bool Nowait)
4849
_nowait = Nowait;
4950
}
5051

51-
public override ushort ProtocolClassId => ClassConstants.Basic;
52-
public override ushort ProtocolMethodId => BasicMethodConstants.Cancel;
52+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicCancel;
5353
public override string ProtocolMethodName => "basic.cancel";
5454
public override bool HasContent => false;
5555

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -46,8 +47,7 @@ public BasicCancelOk(string ConsumerTag)
4647
_consumerTag = ConsumerTag;
4748
}
4849

49-
public override ushort ProtocolClassId => ClassConstants.Basic;
50-
public override ushort ProtocolMethodId => BasicMethodConstants.CancelOk;
50+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicCancelOk;
5151
public override string ProtocolMethodName => "basic.cancel-ok";
5252
public override bool HasContent => false;
5353

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
using System.Collections.Generic;
3333
using System.Text;
34+
using RabbitMQ.Client.client.framing;
3435
using RabbitMQ.Client.Impl;
3536

3637
namespace RabbitMQ.Client.Framing.Impl
@@ -62,8 +63,7 @@ public BasicConsume(ushort Reserved1, string Queue, string ConsumerTag, bool NoL
6263
_arguments = Arguments;
6364
}
6465

65-
public override ushort ProtocolClassId => ClassConstants.Basic;
66-
public override ushort ProtocolMethodId => BasicMethodConstants.Consume;
66+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicConsume;
6767
public override string ProtocolMethodName => "basic.consume";
6868
public override bool HasContent => false;
6969

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -46,8 +47,7 @@ public BasicConsumeOk(string ConsumerTag)
4647
_consumerTag = ConsumerTag;
4748
}
4849

49-
public override ushort ProtocolClassId => ClassConstants.Basic;
50-
public override ushort ProtocolMethodId => BasicMethodConstants.ConsumeOk;
50+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicConsumeOk;
5151
public override string ProtocolMethodName => "basic.consume-ok";
5252
public override bool HasContent => false;
5353

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -54,8 +55,7 @@ public BasicDeliver(string ConsumerTag, ulong DeliveryTag, bool Redelivered, str
5455
_routingKey = RoutingKey;
5556
}
5657

57-
public override ushort ProtocolClassId => ClassConstants.Basic;
58-
public override ushort ProtocolMethodId => BasicMethodConstants.Deliver;
58+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicDeliver;
5959
public override string ProtocolMethodName => "basic.deliver";
6060
public override bool HasContent => true;
6161

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -50,8 +51,7 @@ public BasicGet(ushort Reserved1, string Queue, bool NoAck)
5051
_noAck = NoAck;
5152
}
5253

53-
public override ushort ProtocolClassId => ClassConstants.Basic;
54-
public override ushort ProtocolMethodId => BasicMethodConstants.Get;
54+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicGet;
5555
public override string ProtocolMethodName => "basic.get";
5656
public override bool HasContent => false;
5757

‎projects/RabbitMQ.Client/client/framing/BasicGetEmpty.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -46,8 +47,7 @@ public BasicGetEmpty(string Reserved1)
4647
_reserved1 = Reserved1;
4748
}
4849

49-
public override ushort ProtocolClassId => ClassConstants.Basic;
50-
public override ushort ProtocolMethodId => BasicMethodConstants.GetEmpty;
50+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicGetEmpty;
5151
public override string ProtocolMethodName => "basic.get-empty";
5252
public override bool HasContent => false;
5353

‎projects/RabbitMQ.Client/client/framing/BasicGetOk.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -54,8 +55,7 @@ public BasicGetOk(ulong DeliveryTag, bool Redelivered, string Exchange, string R
5455
_messageCount = MessageCount;
5556
}
5657

57-
public override ushort ProtocolClassId => ClassConstants.Basic;
58-
public override ushort ProtocolMethodId => BasicMethodConstants.GetOk;
58+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicGetOk;
5959
public override string ProtocolMethodName => "basic.get-ok";
6060
public override bool HasContent => true;
6161

‎projects/RabbitMQ.Client/client/framing/BasicNack.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicNack : Client.Impl.MethodBase
@@ -48,8 +50,7 @@ public BasicNack(ulong DeliveryTag, bool Multiple, bool Requeue)
4850
_requeue = Requeue;
4951
}
5052

51-
public override ushort ProtocolClassId => ClassConstants.Basic;
52-
public override ushort ProtocolMethodId => BasicMethodConstants.Nack;
53+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicNack;
5354
public override string ProtocolMethodName => "basic.nack";
5455
public override bool HasContent => false;
5556

‎projects/RabbitMQ.Client/client/framing/BasicPublish.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Text;
33+
using RabbitMQ.Client.client.framing;
3334

3435
namespace RabbitMQ.Client.Framing.Impl
3536
{
@@ -54,8 +55,7 @@ public BasicPublish(ushort Reserved1, string Exchange, string RoutingKey, bool M
5455
_immediate = Immediate;
5556
}
5657

57-
public override ushort ProtocolClassId => ClassConstants.Basic;
58-
public override ushort ProtocolMethodId => BasicMethodConstants.Publish;
58+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicPublish;
5959
public override string ProtocolMethodName => "basic.publish";
6060
public override bool HasContent => true;
6161

‎projects/RabbitMQ.Client/client/framing/BasicQos.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicQos : Client.Impl.MethodBase
@@ -48,8 +50,7 @@ public BasicQos(uint PrefetchSize, ushort PrefetchCount, bool Global)
4850
_global = Global;
4951
}
5052

51-
public override ushort ProtocolClassId => ClassConstants.Basic;
52-
public override ushort ProtocolMethodId => BasicMethodConstants.Qos;
53+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicQos;
5354
public override string ProtocolMethodName => "basic.qos";
5455
public override bool HasContent => false;
5556

‎projects/RabbitMQ.Client/client/framing/BasicQosOk.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicQosOk : Client.Impl.MethodBase
@@ -37,8 +39,7 @@ public BasicQosOk()
3739
{
3840
}
3941

40-
public override ushort ProtocolClassId => ClassConstants.Basic;
41-
public override ushort ProtocolMethodId => BasicMethodConstants.QosOk;
42+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicQosOk;
4243
public override string ProtocolMethodName => "basic.qos-ok";
4344
public override bool HasContent => false;
4445

‎projects/RabbitMQ.Client/client/framing/BasicRecover.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicRecover : Client.Impl.MethodBase
@@ -44,8 +46,7 @@ public BasicRecover(bool Requeue)
4446
_requeue = Requeue;
4547
}
4648

47-
public override ushort ProtocolClassId => ClassConstants.Basic;
48-
public override ushort ProtocolMethodId => BasicMethodConstants.Recover;
49+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecover;
4950
public override string ProtocolMethodName => "basic.recover";
5051
public override bool HasContent => false;
5152

‎projects/RabbitMQ.Client/client/framing/BasicRecoverAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicRecoverAsync : Client.Impl.MethodBase
@@ -44,8 +46,7 @@ public BasicRecoverAsync(bool Requeue)
4446
_requeue = Requeue;
4547
}
4648

47-
public override ushort ProtocolClassId => ClassConstants.Basic;
48-
public override ushort ProtocolMethodId => BasicMethodConstants.RecoverAsync;
49+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecoverAsync;
4950
public override string ProtocolMethodName => "basic.recover-async";
5051
public override bool HasContent => false;
5152

‎projects/RabbitMQ.Client/client/framing/BasicRecoverOk.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.
3030
//---------------------------------------------------------------------------
3131

32+
using RabbitMQ.Client.client.framing;
33+
3234
namespace RabbitMQ.Client.Framing.Impl
3335
{
3436
internal sealed class BasicRecoverOk : Client.Impl.MethodBase
@@ -37,8 +39,7 @@ public BasicRecoverOk()
3739
{
3840
}
3941

40-
public override ushort ProtocolClassId => ClassConstants.Basic;
41-
public override ushort ProtocolMethodId => BasicMethodConstants.RecoverOk;
42+
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecoverOk;
4243
public override string ProtocolMethodName => "basic.recover-ok";
4344
public override bool HasContent => false;
4445

0 commit comments

Comments
 (0)