Skip to content

Commit 79c0c9a

Browse files
lukebakkenlukebakken
committed
fixup
1 parent 80910a7 commit 79c0c9a

File tree

6 files changed

+9
-34
lines changed

6 files changed

+9
-34
lines changed

‎RabbitMQ.AMQP.Client/IConsumerBuilder.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Copyright (c) 2017-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
44

55
using System;
6-
using System.Collections.Generic;
76
using System.Threading;
87
using System.Threading.Tasks;
98

@@ -71,16 +70,6 @@ public interface IStreamOptions
7170
/// <see href="https://www.rabbitmq.com/docs/streams#retention">Interval Syntax</see>
7271
IStreamOptions Offset(string interval);
7372

74-
/// <summary>
75-
/// <para>Single filter value for stream filtering.</para>
76-
/// <para>This a different filtering mechanism from AMQP filter expressions. Both mechanisms can be used together.</para>
77-
/// </summary>
78-
/// <param name="value">filter value</param>
79-
/// <returns><see cref="IStreamOptions"/></returns>
80-
/// <see href="https://www.rabbitmq.com/docs/streams#filtering">Stream Filtering</see>
81-
/// <see cref="Filter"/>
82-
IStreamOptions FilterValue(string value);
83-
8473
/// <summary>
8574
/// <para>Filter values for stream filtering.</para>
8675
/// <para>This a different filtering mechanism from AMQP filter expressions. Both mechanisms can be used together.</para>
@@ -89,7 +78,7 @@ public interface IStreamOptions
8978
/// <returns><see cref="IStreamOptions"/></returns>
9079
/// <see href="https://www.rabbitmq.com/docs/streams#filtering">Stream Filtering</see>
9180
/// <see cref="Filter"/>
92-
IStreamOptions FilterValues(IEnumerable<string> values);
81+
IStreamOptions FilterValues(params string[] values);
9382

9483
/// <summary>
9584
/// <para>Whether messages without a filter value should be sent.</para>

‎RabbitMQ.AMQP.Client/Impl/AmqpConsumer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private async Task ProcessMessages()
146146

147147
_unsettledMessageCounter.Increment();
148148

149-
IContext context = new Context(_receiverLink, nativeMessage, _unsettledMessageCounter);
149+
IContext context = new DeliveryContext(_receiverLink, nativeMessage, _unsettledMessageCounter);
150150
var amqpMessage = new AmqpMessage(nativeMessage);
151151

152152
// TODO catch exceptions thrown by handlers,

‎RabbitMQ.AMQP.Client/Impl/AmqpConsumerBuilder.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Copyright (c) 2017-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
44

55
using System;
6-
using System.Collections.Generic;
76
using System.Linq;
87
using System.Text.RegularExpressions;
98
using System.Threading;
@@ -151,18 +150,7 @@ public IConsumerBuilder.IStreamOptions Offset(string interval)
151150
return this;
152151
}
153152

154-
public IConsumerBuilder.IStreamOptions FilterValue(string value)
155-
{
156-
// Note:
157-
// The value must implement IList for AMQP.NET to serialized it
158-
// as expected.
159-
var values = new List<string> { value };
160-
_filters[s_streamFilterSymbol] =
161-
new DescribedValue(s_streamFilterSymbol, values);
162-
return this;
163-
}
164-
165-
public IConsumerBuilder.IStreamOptions FilterValues(IEnumerable<string> values)
153+
public IConsumerBuilder.IStreamOptions FilterValues(params string[] values)
166154
{
167155
_filters[s_streamFilterSymbol] =
168156
new DescribedValue(s_streamFilterSymbol, values.ToList());

‎RabbitMQ.AMQP.Client/Impl/DeliveryContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
namespace RabbitMQ.AMQP.Client.Impl
1010
{
11-
internal class Context : IContext
11+
internal class DeliveryContext : IContext
1212
{
1313
private readonly IReceiverLink _link;
1414
private readonly Message _message;
1515
private readonly UnsettledMessageCounter _unsettledMessageCounter;
1616

17-
public Context(IReceiverLink link, Message message, UnsettledMessageCounter unsettledMessageCounter)
17+
public DeliveryContext(IReceiverLink link, Message message, UnsettledMessageCounter unsettledMessageCounter)
1818
{
1919
_link = link;
2020
_message = message;

‎RabbitMQ.AMQP.Client/PublicAPI.Unshipped.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions
145145
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Builder() -> RabbitMQ.AMQP.Client.IConsumerBuilder!
146146
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Filter() -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamFilterOptions!
147147
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.FilterMatchUnfiltered(bool matchUnfiltered) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
148-
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.FilterValue(string! value) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
149-
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.FilterValues(System.Collections.Generic.IEnumerable<string!>! values) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
148+
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.FilterValues(params string![]! values) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
150149
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Offset(long offset) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
151150
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Offset(RabbitMQ.AMQP.Client.StreamOffsetSpecification specification) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
152151
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Offset(string! interval) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
@@ -577,8 +576,7 @@ RabbitMQ.AMQP.Client.Impl.StreamFilterOptions.UserId(byte[]! userId) -> RabbitMQ
577576
RabbitMQ.AMQP.Client.Impl.StreamOptions
578577
RabbitMQ.AMQP.Client.Impl.StreamOptions.Filter() -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamFilterOptions!
579578
RabbitMQ.AMQP.Client.Impl.StreamOptions.FilterMatchUnfiltered(bool matchUnfiltered) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
580-
RabbitMQ.AMQP.Client.Impl.StreamOptions.FilterValue(string! value) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
581-
RabbitMQ.AMQP.Client.Impl.StreamOptions.FilterValues(System.Collections.Generic.IEnumerable<string!>! values) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
579+
RabbitMQ.AMQP.Client.Impl.StreamOptions.FilterValues(params string![]! values) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
582580
RabbitMQ.AMQP.Client.Impl.StreamOptions.Offset(long offset) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
583581
RabbitMQ.AMQP.Client.Impl.StreamOptions.Offset(RabbitMQ.AMQP.Client.StreamOffsetSpecification specification) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!
584582
RabbitMQ.AMQP.Client.Impl.StreamOptions.Offset(string! interval) -> RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions!

‎Tests/Consumer/StreamConsumerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Task MessageHandler(IContext cxt, IMessage msg)
499499
.Queue(_queueName)
500500
.Stream()
501501
.Offset(StreamOffsetSpecification.First)
502-
.FilterValue("banana")
502+
.FilterValues("banana")
503503
.FilterMatchUnfiltered(false)
504504
.Builder()
505505
.MessageHandler(MessageHandler);
@@ -521,7 +521,7 @@ Task MessageHandler(IContext cxt, IMessage msg)
521521
.Queue(_queueName)
522522
.Stream()
523523
.Offset(StreamOffsetSpecification.First)
524-
.FilterValue("banana")
524+
.FilterValues("banana")
525525
.FilterMatchUnfiltered(true) // NOTE: true
526526
.Builder()
527527
.MessageHandler(MessageHandler);

0 commit comments

Comments
 (0)