Skip to content

Command Id instead of class & method id #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2020
Merged

Command Id instead of class & method id #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4f47e
use protocol command id instead of class id & method id
bollhals Aug 16, 2020
0ee19a4
Merge branch 'master' into commandId
michaelklishin Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 0 additions & 66 deletions projects/RabbitMQ.Client/client/api/IMethod.cs
View file
Open in desktop

This file was deleted.

22 changes: 18 additions & 4 deletions projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicAck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicCancel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicConsume.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicDeliver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicGet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicGetEmpty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

namespace RabbitMQ.Client.Framing.Impl
{
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicGetOk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

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

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

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicNack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicNack : Client.Impl.MethodBase
Expand All @@ -48,8 +50,7 @@ public BasicNack(ulong DeliveryTag, bool Multiple, bool Requeue)
_requeue = Requeue;
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.Nack;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicNack;
public override string ProtocolMethodName => "basic.nack";
public override bool HasContent => false;

Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicPublish.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//---------------------------------------------------------------------------

using System.Text;
using RabbitMQ.Client.client.framing;

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

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.Publish;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicPublish;
public override string ProtocolMethodName => "basic.publish";
public override bool HasContent => true;

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicQos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicQos : Client.Impl.MethodBase
Expand All @@ -48,8 +50,7 @@ public BasicQos(uint PrefetchSize, ushort PrefetchCount, bool Global)
_global = Global;
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.Qos;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicQos;
public override string ProtocolMethodName => "basic.qos";
public override bool HasContent => false;

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicQosOk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicQosOk : Client.Impl.MethodBase
Expand All @@ -37,8 +39,7 @@ public BasicQosOk()
{
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.QosOk;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicQosOk;
public override string ProtocolMethodName => "basic.qos-ok";
public override bool HasContent => false;

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicRecover.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicRecover : Client.Impl.MethodBase
Expand All @@ -44,8 +46,7 @@ public BasicRecover(bool Requeue)
_requeue = Requeue;
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.Recover;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecover;
public override string ProtocolMethodName => "basic.recover";
public override bool HasContent => false;

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicRecoverAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicRecoverAsync : Client.Impl.MethodBase
Expand All @@ -44,8 +46,7 @@ public BasicRecoverAsync(bool Requeue)
_requeue = Requeue;
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.RecoverAsync;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecoverAsync;
public override string ProtocolMethodName => "basic.recover-async";
public override bool HasContent => false;

Expand Down
5 changes: 3 additions & 2 deletions projects/RabbitMQ.Client/client/framing/BasicRecoverOk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 BasicRecoverOk : Client.Impl.MethodBase
Expand All @@ -37,8 +39,7 @@ public BasicRecoverOk()
{
}

public override ushort ProtocolClassId => ClassConstants.Basic;
public override ushort ProtocolMethodId => BasicMethodConstants.RecoverOk;
public override ProtocolCommandId ProtocolCommandId => ProtocolCommandId.BasicRecoverOk;
public override string ProtocolMethodName => "basic.recover-ok";
public override bool HasContent => false;

Expand Down
Loading