Skip to content

Commit 3383830

Browse files
lukebakkenlukebakken
committed
* Remove BasicConsume 
1 parent d7566b3 commit 3383830

File tree

8 files changed

+17
-13
lines changed

8 files changed

+17
-13
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ RabbitMQ.Client.IBasicProperties.UserId.set -> void
478478
RabbitMQ.Client.IChannel
479479
RabbitMQ.Client.IChannel.BasicAckAsync(ulong deliveryTag, bool multiple) -> System.Threading.Tasks.ValueTask
480480
RabbitMQ.Client.IChannel.BasicAcks -> System.EventHandler<RabbitMQ.Client.Events.BasicAckEventArgs>
481-
RabbitMQ.Client.IChannel.BasicConsume(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive, System.Collections.Generic.IDictionary<string, object> arguments, RabbitMQ.Client.IBasicConsumer consumer) -> string
482481
RabbitMQ.Client.IChannel.BasicGetAsync(string queue, bool autoAck) -> System.Threading.Tasks.ValueTask<RabbitMQ.Client.BasicGetResult>
483482
RabbitMQ.Client.IChannel.BasicNackAsync(ulong deliveryTag, bool multiple, bool requeue) -> System.Threading.Tasks.ValueTask
484483
RabbitMQ.Client.IChannel.BasicNacks -> System.EventHandler<RabbitMQ.Client.Events.BasicNackEventArgs>
@@ -849,10 +848,6 @@ static RabbitMQ.Client.EndpointResolverExtensions.SelectOneAsync<T>(this RabbitM
849848
static RabbitMQ.Client.Events.CallbackExceptionEventArgs.Build(System.Exception e, string context) -> RabbitMQ.Client.Events.CallbackExceptionEventArgs
850849
static RabbitMQ.Client.Events.CallbackExceptionEventArgs.Build(System.Exception e, string context, object consumer) -> RabbitMQ.Client.Events.CallbackExceptionEventArgs
851850
static RabbitMQ.Client.ExchangeType.All() -> System.Collections.Generic.ICollection<string>
852-
static RabbitMQ.Client.IChannelExtensions.BasicConsume(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.IBasicConsumer consumer, string queue, bool autoAck = false, string consumerTag = "", bool noLocal = false, bool exclusive = false, System.Collections.Generic.IDictionary<string, object> arguments = null) -> string
853-
static RabbitMQ.Client.IChannelExtensions.BasicConsume(this RabbitMQ.Client.IChannel channel, string queue, bool autoAck, RabbitMQ.Client.IBasicConsumer consumer) -> string
854-
static RabbitMQ.Client.IChannelExtensions.BasicConsume(this RabbitMQ.Client.IChannel channel, string queue, bool autoAck, string consumerTag, RabbitMQ.Client.IBasicConsumer consumer) -> string
855-
static RabbitMQ.Client.IChannelExtensions.BasicConsume(this RabbitMQ.Client.IChannel channel, string queue, bool autoAck, string consumerTag, System.Collections.Generic.IDictionary<string, object> arguments, RabbitMQ.Client.IBasicConsumer consumer) -> string
856851
static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.CachedString exchange, RabbitMQ.Client.CachedString routingKey, System.ReadOnlyMemory<byte> body = default(System.ReadOnlyMemory<byte>), bool mandatory = false) -> System.Threading.Tasks.ValueTask
857852
static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync(this RabbitMQ.Client.IChannel channel, string exchange, string routingKey, System.ReadOnlyMemory<byte> body = default(System.ReadOnlyMemory<byte>), bool mandatory = false) -> System.Threading.Tasks.ValueTask
858853
static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync<T>(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.PublicationAddress addr, in T basicProperties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.ValueTask

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ public interface IChannel : IDisposable
173173
/// </summary>
174174
/// <param name="consumerTag">The consumer tag.</param>
175175
void BasicCancelNoWait(string consumerTag);
176-
#endif
177176

178177
/// <summary>Start a Basic content-class consumer.</summary>
179178
/// <param name="queue">The queue.</param>
@@ -185,6 +184,7 @@ public interface IChannel : IDisposable
185184
/// <param name="consumer">The consumer, an instance of <see cref="IBasicConsumer"/></param>
186185
/// <returns></returns>
187186
string BasicConsume(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive, IDictionary<string, object> arguments, IBasicConsumer consumer);
187+
#endif
188188

189189
/// <summary>Asynchronously start a Basic content-class consumer.</summary>
190190
/// <param name="queue">The queue.</param>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ namespace RabbitMQ.Client
3838
{
3939
public static class IChannelExtensions
4040
{
41+
#if SYNC_API
4142
/// <summary>Start a Basic content-class consumer.</summary>
4243
public static string BasicConsume(this IChannel channel,
4344
IBasicConsumer consumer,
@@ -50,6 +51,7 @@ public static string BasicConsume(this IChannel channel,
5051
{
5152
return channel.BasicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
5253
}
54+
#endif
5355

5456
/// <summary>Asynchronously start a Basic content-class consumer.</summary>
5557
public static Task<string> BasicConsumeAsync(this IChannel channel,
@@ -64,13 +66,15 @@ public static Task<string> BasicConsumeAsync(this IChannel channel,
6466
return channel.BasicConsumeAsync(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
6567
}
6668

69+
#if SYNC_API
6770
/// <summary>Start a Basic content-class consumer.</summary>
6871
public static string BasicConsume(this IChannel channel, string queue,
6972
bool autoAck,
7073
IBasicConsumer consumer)
7174
{
7275
return channel.BasicConsume(queue, autoAck, string.Empty, false, false, null, consumer);
7376
}
77+
#endif
7478

7579
/// <summary>Asynchronously start a Basic content-class consumer.</summary>
7680
public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,
@@ -80,6 +84,7 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
8084
return channel.BasicConsumeAsync(queue, autoAck, string.Empty, false, false, null, consumer);
8185
}
8286

87+
#if SYNC_API
8388
/// <summary>Start a Basic content-class consumer.</summary>
8489
public static string BasicConsume(this IChannel channel, string queue,
8590
bool autoAck,
@@ -88,6 +93,7 @@ public static string BasicConsume(this IChannel channel, string queue,
8893
{
8994
return channel.BasicConsume(queue, autoAck, consumerTag, false, false, null, consumer);
9095
}
96+
#endif
9197

9298
/// <summary>Asynchronously start a Basic content-class consumer.</summary>
9399
public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,
@@ -98,6 +104,7 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
98104
return channel.BasicConsumeAsync(queue, autoAck, consumerTag, false, false, null, consumer);
99105
}
100106

107+
#if SYNC_API
101108
/// <summary>Start a Basic content-class consumer.</summary>
102109
public static string BasicConsume(this IChannel channel, string queue,
103110
bool autoAck,
@@ -107,6 +114,7 @@ public static string BasicConsume(this IChannel channel, string queue,
107114
{
108115
return channel.BasicConsume(queue, autoAck, consumerTag, false, false, arguments, consumer);
109116
}
117+
#endif
110118

111119
/// <summary>Asynchronously start a Basic content-class consumer.</summary>
112120
public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,

‎projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ public void BasicCancelNoWait(string consumerTag)
292292
_connection.DeleteRecordedConsumer(consumerTag, recordedEntitiesSemaphoreHeld: false);
293293
_innerChannel.BasicCancelNoWait(consumerTag);
294294
}
295-
#endif
296295

297296
public string BasicConsume(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive,
298297
IDictionary<string, object> arguments, IBasicConsumer consumer)
@@ -304,6 +303,7 @@ public string BasicConsume(string queue, bool autoAck, string consumerTag, bool
304303
_recordedConsumerTags.Add(resultConsumerTag);
305304
return resultConsumerTag;
306305
}
306+
#endif
307307

308308
public async Task<string> BasicConsumeAsync(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive,
309309
IDictionary<string, object> arguments, IBasicConsumer consumer)

‎projects/RabbitMQ.Client/client/impl/ChannelBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,6 @@ public void BasicCancelNoWait(string consumerTag)
11491149
_Private_BasicCancel(consumerTag, true);
11501150
ConsumerDispatcher.GetAndRemoveConsumer(consumerTag);
11511151
}
1152-
#endif
11531152

11541153
public string BasicConsume(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive,
11551154
IDictionary<string, object> arguments, IBasicConsumer consumer)
@@ -1184,6 +1183,7 @@ public string BasicConsume(string queue, bool autoAck, string consumerTag, bool
11841183

11851184
return actualConsumerTag;
11861185
}
1186+
#endif
11871187

11881188
public async Task<string> BasicConsumeAsync(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive,
11891189
IDictionary<string, object> arguments, IBasicConsumer consumer)

‎projects/Test/Integration/TestChannelSoftErrors.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ public async Task TestBindOnNonExistingExchange()
6363
}
6464

6565
[Fact]
66-
public void TestConsumeOnNonExistingQueue()
66+
public async Task TestConsumeOnNonExistingQueue()
6767
{
68-
OperationInterruptedException exception = Assert.Throws<OperationInterruptedException>(() =>
68+
OperationInterruptedException exception = await Assert.ThrowsAsync<OperationInterruptedException>(() =>
6969
{
70-
var consumer = new EventingBasicConsumer(_channel); _channel.BasicConsume("NonExistingQueue", true, consumer);
70+
var consumer = new EventingBasicConsumer(_channel);
71+
return _channel.BasicConsumeAsync("NonExistingQueue", true, consumer);
7172
});
7273

7374
Assert.True(exception.Message.Contains("404"), $"Message doesn't contain the expected 404 part: {exception.Message}");

‎projects/Test/Integration/TestConsumerExceptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected async Task TestExceptionHandlingWithAsync(IBasicConsumer consumer,
118118
tcs.SetResult(true);
119119
};
120120

121-
string tag = _channel.BasicConsume(q, true, consumer);
121+
string tag = await _channel.BasicConsumeAsync(q, true, consumer);
122122
await action(_channel, q, consumer, tag);
123123
await WaitAsync(tcs, "callback exception");
124124

‎projects/Test/SequentialIntegration/TestConnectionTopologyRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()
253253
var consumerReceivedTcs2 = new TaskCompletionSource<bool>();
254254
var consumer2 = new EventingBasicConsumer(ch);
255255
consumer2.Received += (source, ea) => consumerReceivedTcs2.SetResult(true);
256-
ch.BasicConsume(queue2, true, "filtered.consumer", consumer2);
256+
await ch.BasicConsumeAsync(queue2, true, "filtered.consumer", consumer2);
257257

258258
await _channel.ExchangeDeleteAsync(exchange);
259259
await _channel.QueueDeleteAsync(queue1);

0 commit comments

Comments
 (0)