Skip to content

Commit

Permalink
Merge pull request #1631 from Tornhoof/IReadOnlyBasicProperties
Browse files Browse the repository at this point in the history
Replace ReadOnlyBasicProperties with IReadOnlyBasicProperties
  • Loading branch information
lukebakken authored Jul 9, 2024
2 parents e247e8b + b3f0bc7 commit 946b4c2
Show file tree
Hide file tree
Showing 24 changed files with 55 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)
}

public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
{
if (Interlocked.Increment(ref _current) == Count)
{
Expand All @@ -30,7 +30,7 @@ public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redel
}

Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
{
if (Interlocked.Increment(ref _current) == Count)
{
Expand Down
26 changes: 13 additions & 13 deletions projects/RabbitMQ.Client/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ override RabbitMQ.Client.AmqpTimestamp.GetHashCode() -> int
override RabbitMQ.Client.AmqpTimestamp.ToString() -> string
override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicCancelOk(string consumerTag) -> void
override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> void
Expand Down Expand Up @@ -117,12 +117,12 @@ RabbitMQ.Client.BasicCredentialsProvider.Refresh() -> void
RabbitMQ.Client.BasicCredentialsProvider.UserName.get -> string
RabbitMQ.Client.BasicCredentialsProvider.ValidUntil.get -> System.TimeSpan?
RabbitMQ.Client.BasicGetResult
RabbitMQ.Client.BasicGetResult.BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, string routingKey, uint messageCount, in RabbitMQ.Client.ReadOnlyBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.BasicGetResult.BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, string routingKey, uint messageCount, RabbitMQ.Client.IReadOnlyBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.BasicProperties
RabbitMQ.Client.BasicProperties.AppId.get -> string
RabbitMQ.Client.BasicProperties.AppId.set -> void
RabbitMQ.Client.BasicProperties.BasicProperties() -> void
RabbitMQ.Client.BasicProperties.BasicProperties(RabbitMQ.Client.ReadOnlyBasicProperties input) -> void
RabbitMQ.Client.BasicProperties.BasicProperties(RabbitMQ.Client.IReadOnlyBasicProperties input) -> void
RabbitMQ.Client.BasicProperties.ClearAppId() -> void
RabbitMQ.Client.BasicProperties.ClearClusterId() -> void
RabbitMQ.Client.BasicProperties.ClearContentEncoding() -> void
Expand Down Expand Up @@ -292,11 +292,11 @@ RabbitMQ.Client.Events.BaseExceptionEventArgs.BaseExceptionEventArgs(System.Coll
RabbitMQ.Client.Events.BasicAckEventArgs
RabbitMQ.Client.Events.BasicAckEventArgs.BasicAckEventArgs(ulong deliveryTag, bool multiple) -> void
RabbitMQ.Client.Events.BasicDeliverEventArgs
RabbitMQ.Client.Events.BasicDeliverEventArgs.BasicDeliverEventArgs(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.Events.BasicDeliverEventArgs.BasicDeliverEventArgs(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.Events.BasicNackEventArgs
RabbitMQ.Client.Events.BasicNackEventArgs.BasicNackEventArgs(ulong deliveryTag, bool multiple, bool requeue) -> void
RabbitMQ.Client.Events.BasicReturnEventArgs
RabbitMQ.Client.Events.BasicReturnEventArgs.BasicReturnEventArgs(ushort replyCode, string replyText, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.Events.BasicReturnEventArgs.BasicReturnEventArgs(ushort replyCode, string replyText, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) -> void
RabbitMQ.Client.Events.CallbackExceptionEventArgs
RabbitMQ.Client.Events.CallbackExceptionEventArgs.CallbackExceptionEventArgs(System.Collections.Generic.IDictionary<string, object> detail, System.Exception exception) -> void
RabbitMQ.Client.Events.ConnectionBlockedEventArgs
Expand Down Expand Up @@ -413,7 +413,7 @@ RabbitMQ.Client.IAsyncBasicConsumer.ConsumerCancelled -> RabbitMQ.Client.Events.
RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicCancel(string consumerTag) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAsyncBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
RabbitMQ.Client.IAuthMechanism
RabbitMQ.Client.IAuthMechanism.handleChallenge(byte[] challenge, RabbitMQ.Client.ConnectionConfig config) -> byte[]
Expand Down Expand Up @@ -766,7 +766,7 @@ RabbitMQ.Client.TopologyRecoveryFilter.QueueFilter.get -> System.Func<RabbitMQ.C
RabbitMQ.Client.TopologyRecoveryFilter.QueueFilter.set -> void
RabbitMQ.Client.TopologyRecoveryFilter.TopologyRecoveryFilter() -> void
readonly RabbitMQ.Client.AmqpTimestamp.UnixTime -> long
readonly RabbitMQ.Client.BasicGetResult.BasicProperties -> RabbitMQ.Client.ReadOnlyBasicProperties
readonly RabbitMQ.Client.BasicGetResult.BasicProperties -> RabbitMQ.Client.IReadOnlyBasicProperties
readonly RabbitMQ.Client.BasicGetResult.Body -> System.ReadOnlyMemory<byte>
readonly RabbitMQ.Client.BasicGetResult.DeliveryTag -> ulong
readonly RabbitMQ.Client.BasicGetResult.Exchange -> string
Expand Down Expand Up @@ -798,7 +798,7 @@ readonly RabbitMQ.Client.Events.BaseExceptionEventArgs.Detail -> System.Collecti
readonly RabbitMQ.Client.Events.BaseExceptionEventArgs.Exception -> System.Exception
readonly RabbitMQ.Client.Events.BasicAckEventArgs.DeliveryTag -> ulong
readonly RabbitMQ.Client.Events.BasicAckEventArgs.Multiple -> bool
readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.BasicProperties -> RabbitMQ.Client.ReadOnlyBasicProperties
readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.BasicProperties -> RabbitMQ.Client.IReadOnlyBasicProperties
readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.Body -> System.ReadOnlyMemory<byte>
readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.ConsumerTag -> string
readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.DeliveryTag -> ulong
Expand All @@ -808,7 +808,7 @@ readonly RabbitMQ.Client.Events.BasicDeliverEventArgs.RoutingKey -> string
readonly RabbitMQ.Client.Events.BasicNackEventArgs.DeliveryTag -> ulong
readonly RabbitMQ.Client.Events.BasicNackEventArgs.Multiple -> bool
readonly RabbitMQ.Client.Events.BasicNackEventArgs.Requeue -> bool
readonly RabbitMQ.Client.Events.BasicReturnEventArgs.BasicProperties -> RabbitMQ.Client.ReadOnlyBasicProperties
readonly RabbitMQ.Client.Events.BasicReturnEventArgs.BasicProperties -> RabbitMQ.Client.IReadOnlyBasicProperties
readonly RabbitMQ.Client.Events.BasicReturnEventArgs.Body -> System.ReadOnlyMemory<byte>
readonly RabbitMQ.Client.Events.BasicReturnEventArgs.Exchange -> string
readonly RabbitMQ.Client.Events.BasicReturnEventArgs.ReplyCode -> ushort
Expand Down Expand Up @@ -863,7 +863,7 @@ static readonly RabbitMQ.Client.PublicationAddress.PSEUDO_URI_PARSER -> System.T
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicCancel(string consumerTag) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.OnCancel(params string[] consumerTags) -> System.Threading.Tasks.Task
virtual RabbitMQ.Client.DefaultBasicConsumer.HandleBasicCancel(string consumerTag) -> void
Expand All @@ -882,7 +882,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.get -> System.TimeSpan
virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
~const RabbitMQ.Client.RabbitMQActivitySource.PublisherSourceName = "RabbitMQ.Client.Publisher" -> string
~const RabbitMQ.Client.RabbitMQActivitySource.SubscriberSourceName = "RabbitMQ.Client.Subscriber" -> string
~override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
~override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
~RabbitMQ.Client.AmqpTcpEndpoint.AmqpTcpEndpoint(string hostName, int portOrMinusOne, RabbitMQ.Client.SslOption ssl, uint maxInboundMessageBodySize) -> void
~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(RabbitMQ.Client.IEndpointResolver endpointResolver, string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
Expand All @@ -891,7 +891,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Collections.Generic.IEnumerable<string> hostnames, string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Collections.Generic.IEnumerable<string> hostnames, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
~RabbitMQ.Client.IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
~RabbitMQ.Client.IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
~RabbitMQ.Client.IChannel.BasicCancelAsync(string consumerTag, bool noWait = false, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
~RabbitMQ.Client.IChannel.BasicConsumeAsync(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive, System.Collections.Generic.IDictionary<string, object> arguments, RabbitMQ.Client.IBasicConsumer consumer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string>
~RabbitMQ.Client.IChannel.BasicGetAsync(string queue, bool autoAck, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<RabbitMQ.Client.BasicGetResult>
Expand Down Expand Up @@ -960,5 +960,5 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
~static RabbitMQ.Client.RabbitMQActivitySource.ContextExtractor.set -> void
~static RabbitMQ.Client.RabbitMQActivitySource.ContextInjector.get -> System.Action<System.Diagnostics.Activity, System.Collections.Generic.IDictionary<string, object>>
~static RabbitMQ.Client.RabbitMQActivitySource.ContextInjector.set -> void
~virtual RabbitMQ.Client.DefaultBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
~virtual RabbitMQ.Client.DefaultBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task

4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
RabbitMQ.Client.BasicProperties.BasicProperties(RabbitMQ.Client.ReadOnlyBasicProperties! input) -> void
RabbitMQ.Client.IConnection.DispatchConsumersAsyncEnabled.get -> bool
RabbitMQ.Client.BasicProperties.BasicProperties(RabbitMQ.Client.IReadOnlyBasicProperties! input) -> void
RabbitMQ.Client.IConnection.DispatchConsumersAsyncEnabled.get -> bool
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public virtual Task HandleBasicDeliver(string consumerTag,
bool redelivered,
string exchange,
string routingKey,
ReadOnlyBasicProperties properties,
IReadOnlyBasicProperties properties,
ReadOnlyMemory<byte> body)
{
// Nothing to do here.
Expand Down Expand Up @@ -166,8 +166,9 @@ void IBasicConsumer.HandleBasicConsumeOk(string consumerTag)
throw new InvalidOperationException("Should never be called. Enable 'DispatchConsumersAsync'.");
}

Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,
string exchange, string routingKey,
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
{
throw new InvalidOperationException("Should never be called. Enable 'DispatchConsumersAsync'.");
}
Expand Down
4 changes: 2 additions & 2 deletions projects/RabbitMQ.Client/client/api/BasicGetResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public sealed class BasicGetResult
/// <param name="basicProperties">The Basic-class content header properties for the message.</param>
/// <param name="body">The body</param>
public BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, string routingKey,
uint messageCount, in ReadOnlyBasicProperties basicProperties, ReadOnlyMemory<byte> body)
uint messageCount, IReadOnlyBasicProperties basicProperties, ReadOnlyMemory<byte> body)
{
DeliveryTag = deliveryTag;
Redelivered = redelivered;
Expand All @@ -64,7 +64,7 @@ public BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, stri
/// <summary>
/// Retrieves the Basic-class content header properties for this message.
/// </summary>
public readonly ReadOnlyBasicProperties BasicProperties;
public readonly IReadOnlyBasicProperties BasicProperties;

/// <summary>
/// Retrieves the body of this message.
Expand Down
2 changes: 1 addition & 1 deletion projects/RabbitMQ.Client/client/api/BasicProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public BasicProperties()
{
}

public BasicProperties(ReadOnlyBasicProperties input)
public BasicProperties(IReadOnlyBasicProperties input)
{
ContentType = input.ContentType;
ContentEncoding = input.ContentEncoding;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public virtual Task HandleBasicDeliverAsync(string consumerTag,
bool redelivered,
string exchange,
string routingKey,
ReadOnlyBasicProperties properties,
IReadOnlyBasicProperties properties,
ReadOnlyMemory<byte> body)
{
// Nothing to do here.
Expand Down
2 changes: 1 addition & 1 deletion projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Task HandleBasicDeliver(string consumerTag,
bool redelivered,
string exchange,
string routingKey,
ReadOnlyBasicProperties properties,
IReadOnlyBasicProperties properties,
ReadOnlyMemory<byte> body);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion projects/RabbitMQ.Client/client/api/IBasicConsumer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Task HandleBasicDeliverAsync(string consumerTag,
bool redelivered,
string exchange,
string routingKey,
ReadOnlyBasicProperties properties,
IReadOnlyBasicProperties properties,
ReadOnlyMemory<byte> body);

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ await base.HandleBasicConsumeOk(consumerTag)

///<summary>Fires the Received event.</summary>
public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
{
var deliverEventArgs = new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
// No need to call base, it's empty.
Expand Down
Loading

0 comments on commit 946b4c2

Please sign in to comment.