* Delete code for sync API

Author: lukebakken

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

@@ -38,21 +38,6 @@ namespace RabbitMQ.Client
 {
     public static class IChannelExtensions
     {
-#if SYNC_API
-        /// <summary>Start a Basic content-class consumer.</summary>
-        public static string BasicConsume(this IChannel channel,
-            IBasicConsumer consumer,
-            string queue,
-            bool autoAck = false,
-            string consumerTag = "",
-            bool noLocal = false,
-            bool exclusive = false,
-            IDictionary<string, object> arguments = null)
-        {
-            return channel.BasicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
-        }
-#endif
-
         /// <summary>Asynchronously start a Basic content-class consumer.</summary>
         public static Task<string> BasicConsumeAsync(this IChannel channel,
             IBasicConsumer consumer,
@@ -66,16 +51,6 @@ public static Task<string> BasicConsumeAsync(this IChannel channel,
             return channel.BasicConsumeAsync(queue, autoAck, consumerTag, noLocal, exclusive, arguments, consumer);
         }
 
-#if SYNC_API
-        /// <summary>Start a Basic content-class consumer.</summary>
-        public static string BasicConsume(this IChannel channel, string queue,
-            bool autoAck,
-            IBasicConsumer consumer)
-        {
-            return channel.BasicConsume(queue, autoAck, string.Empty, false, false, null, consumer);
-        }
-#endif
-
         /// <summary>Asynchronously start a Basic content-class consumer.</summary>
         public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,
             bool autoAck,
@@ -84,17 +59,6 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
             return channel.BasicConsumeAsync(queue, autoAck, string.Empty, false, false, null, consumer);
         }
 
-#if SYNC_API
-        /// <summary>Start a Basic content-class consumer.</summary>
-        public static string BasicConsume(this IChannel channel, string queue,
-            bool autoAck,
-            string consumerTag,
-            IBasicConsumer consumer)
-        {
-            return channel.BasicConsume(queue, autoAck, consumerTag, false, false, null, consumer);
-        }
-#endif
-
         /// <summary>Asynchronously start a Basic content-class consumer.</summary>
         public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,
             bool autoAck,
@@ -104,18 +68,6 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
             return channel.BasicConsumeAsync(queue, autoAck, consumerTag, false, false, null, consumer);
         }
 
-#if SYNC_API
-        /// <summary>Start a Basic content-class consumer.</summary>
-        public static string BasicConsume(this IChannel channel, string queue,
-            bool autoAck,
-            string consumerTag,
-            IDictionary<string, object> arguments,
-            IBasicConsumer consumer)
-        {
-            return channel.BasicConsume(queue, autoAck, consumerTag, false, false, arguments, consumer);
-        }
-#endif
-
         /// <summary>Asynchronously start a Basic content-class consumer.</summary>
         public static Task<string> BasicConsumeAsync(this IChannel channel, string queue,
             bool autoAck,
@@ -127,13 +79,6 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
         }
 
 #nullable enable
-#if SYNC_API
-        public static void BasicPublish<T>(this IChannel channel, PublicationAddress addr, in T basicProperties, ReadOnlyMemory<byte> body)
-            where T : IReadOnlyBasicProperties, IAmqpHeader
-        {
-            channel.BasicPublish(addr.ExchangeName, addr.RoutingKey, in basicProperties, body);
-        }
-#endif
 
         /// <summary>
         /// (Extension method) Convenience overload of BasicPublish.
@@ -147,33 +92,13 @@ public static ValueTask BasicPublishAsync<T>(this IChannel channel, PublicationA
             return channel.BasicPublishAsync(addr.ExchangeName, addr.RoutingKey, in basicProperties, body);
         }
 
-#if SYNC_API
-        public static void BasicPublish(this IChannel channel, string exchange, string routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
-            => channel.BasicPublish(exchange, routingKey, in EmptyBasicProperty.Empty, body, mandatory);
-#endif
-
         public static ValueTask BasicPublishAsync(this IChannel channel, string exchange, string routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
             => channel.BasicPublishAsync(exchange, routingKey, in EmptyBasicProperty.Empty, body, mandatory);
 
-#if SYNC_API
-        public static void BasicPublish(this IChannel channel, CachedString exchange, CachedString routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
-            => channel.BasicPublish(exchange, routingKey, in EmptyBasicProperty.Empty, body, mandatory);
-#endif
-
         public static ValueTask BasicPublishAsync(this IChannel channel, CachedString exchange, CachedString routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
             => channel.BasicPublishAsync(exchange, routingKey, in EmptyBasicProperty.Empty, body, mandatory);
-#nullable disable
 
-#if SYNC_API
-        /// <summary>
-        /// Declare a queue.
-        /// </summary>
-        public static QueueDeclareOk QueueDeclare(this IChannel channel, string queue = "", bool durable = false, bool exclusive = true,
-            bool autoDelete = true, IDictionary<string, object> arguments = null)
-        {
-            return channel.QueueDeclare(queue, durable, exclusive, autoDelete, arguments);
-        }
-#endif
+#nullable disable
 
         /// <summary>
         /// Asynchronously declare a queue.
@@ -186,35 +111,6 @@ public static Task<QueueDeclareOk> QueueDeclareAsync(this IChannel channel, stri
                 arguments: arguments, noWait: noWait);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Bind an exchange to an exchange.
-        /// </summary>
-        public static void ExchangeBind(this IChannel channel, string destination, string source, string routingKey, IDictionary<string, object> arguments = null)
-        {
-            channel.ExchangeBind(destination, source, routingKey, arguments);
-        }
-#endif
-
-#if SYNC_API
-        /// <summary>
-        /// Like exchange bind but sets nowait to true.
-        /// </summary>
-        public static void ExchangeBindNoWait(this IChannel channel, string destination, string source, string routingKey, IDictionary<string, object> arguments = null)
-        {
-            channel.ExchangeBindNoWait(destination, source, routingKey, arguments);
-        }
-
-        /// <summary>
-        /// Declare an exchange.
-        /// </summary>
-        public static void ExchangeDeclare(this IChannel channel, string exchange, string type, bool durable = false, bool autoDelete = false,
-            IDictionary<string, object> arguments = null)
-        {
-            channel.ExchangeDeclare(exchange, type, durable, autoDelete, arguments);
-        }
-#endif
-
         /// <summary>
         /// Asynchronously declare an exchange.
         /// </summary>
@@ -225,60 +121,6 @@ public static Task ExchangeDeclareAsync(this IChannel channel, string exchange,
                 arguments: arguments, passive: false, noWait: noWait);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Like ExchangeDeclare but sets nowait to true.
-        /// </summary>
-        public static void ExchangeDeclareNoWait(this IChannel channel, string exchange, string type, bool durable = false, bool autoDelete = false,
-            IDictionary<string, object> arguments = null)
-        {
-            channel.ExchangeDeclareNoWait(exchange, type, durable, autoDelete, arguments);
-        }
-
-        /// <summary>
-        /// Unbinds an exchange.
-        /// </summary>
-        public static void ExchangeUnbind(this IChannel channel, string destination,
-            string source,
-            string routingKey,
-            IDictionary<string, object> arguments = null)
-        {
-            channel.ExchangeUnbind(destination, source, routingKey, arguments);
-        }
-
-        /// <summary>
-        /// Deletes an exchange.
-        /// </summary>
-        public static void ExchangeDelete(this IChannel channel, string exchange, bool ifUnused = false)
-        {
-            channel.ExchangeDelete(exchange, ifUnused);
-        }
-
-        /// <summary>
-        /// Like ExchangeDelete but sets nowait to true.
-        /// </summary>
-        public static void ExchangeDeleteNoWait(this IChannel channel, string exchange, bool ifUnused = false)
-        {
-            channel.ExchangeDeleteNoWait(exchange, ifUnused);
-        }
-
-        /// <summary>
-        /// Binds a queue.
-        /// </summary>
-        public static void QueueBind(this IChannel channel, string queue, string exchange, string routingKey, IDictionary<string, object> arguments = null)
-        {
-            channel.QueueBind(queue, exchange, routingKey, arguments);
-        }
-
-        /// <summary>
-        /// Deletes a queue.
-        /// </summary>
-        public static uint QueueDelete(this IChannel channel, string queue, bool ifUnused = false, bool ifEmpty = false)
-        {
-            return channel.QueueDelete(queue, ifUnused, ifEmpty);
-        }
-#endif
-
         /// <summary>
         /// Asynchronously deletes a queue.
         /// </summary>
@@ -287,24 +129,6 @@ public static Task<uint> QueueDeleteAsync(this IChannel channel, string queue, b
             return channel.QueueDeleteAsync(queue, ifUnused, ifEmpty);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Like QueueDelete but sets nowait to true.
-        /// </summary>
-        public static void QueueDeleteNoWait(this IChannel channel, string queue, bool ifUnused = false, bool ifEmpty = false)
-        {
-            channel.QueueDeleteNoWait(queue, ifUnused, ifEmpty);
-        }
-
-        /// <summary>
-        /// Unbinds a queue.
-        /// </summary>
-        public static void QueueUnbind(this IChannel channel, string queue, string exchange, string routingKey, IDictionary<string, object> arguments = null)
-        {
-            channel.QueueUnbind(queue, exchange, routingKey, arguments);
-        }
-#endif
-
         /// <summary>
         /// Asynchronously unbinds a queue.
         /// </summary>
@@ -313,24 +137,6 @@ public static Task QueueUnbindAsync(this IChannel channel, string queue, string
             return channel.QueueUnbindAsync(queue, exchange, routingKey, arguments);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Abort this session.
-        /// </summary>
-        /// <remarks>
-        /// If the session is already closed (or closing), then this
-        /// method does nothing but wait for the in-progress close
-        /// operation to complete. This method will not return to the
-        /// caller until the shutdown is complete.
-        /// In comparison to normal <see cref="Close(IChannel)"/> method, <see cref="Abort(IChannel)"/> will not throw
-        /// <see cref="Exceptions.AlreadyClosedException"/> or <see cref="System.IO.IOException"/> or any other <see cref="Exception"/> during closing channel.
-        /// </remarks>
-        public static void Abort(this IChannel channel)
-        {
-            channel.Close(Constants.ReplySuccess, "Goodbye", true);
-        }
-#endif
-
         /// <summary>
         /// Asynchronously abort this session.
         /// </summary>
@@ -347,38 +153,6 @@ public static Task AbortAsync(this IChannel channel)
             return channel.CloseAsync(Constants.ReplySuccess, "Goodbye", true);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Abort this session.
-        /// </summary>
-        /// <remarks>
-        /// The method behaves in the same way as <see cref="Abort(IChannel)"/>, with the only
-        /// difference that the channel is closed with the given channel close code and message.
-        /// <para>
-        /// The close code (See under "Reply Codes" in the AMQP specification)
-        /// </para>
-        /// <para>
-        /// A message indicating the reason for closing the channel
-        /// </para>
-        /// </remarks>
-        public static void Abort(this IChannel channel, ushort replyCode, string replyText)
-        {
-            channel.Close(replyCode, replyText, true);
-        }
-
-        /// <summary>Close this session.</summary>
-        /// <remarks>
-        /// If the session is already closed (or closing), then this
-        /// method does nothing but wait for the in-progress close
-        /// operation to complete. This method will not return to the
-        /// caller until the shutdown is complete.
-        /// </remarks>
-        public static void Close(this IChannel channel)
-        {
-            channel.Close(Constants.ReplySuccess, "Goodbye", false);
-        }
-#endif
-
         /// <summary>Asynchronously close this session.</summary>
         /// <remarks>
         /// If the session is already closed (or closing), then this
@@ -391,29 +165,6 @@ public static Task CloseAsync(this IChannel channel)
             return channel.CloseAsync(Constants.ReplySuccess, "Goodbye", false);
         }
 
-#if SYNC_API
-        /// <summary>
-        /// Close this channel.
-        /// </summary>
-        /// <param name="channel">The channel.</param>
-        /// <param name="replyCode">The reply code.</param>
-        /// <param name="replyText">The reply text.</param>
-        /// <remarks>
-        /// The method behaves in the same way as Close(), with the only
-        /// difference that the channel is closed with the given channel
-        /// close code and message.
-        /// <para>
-        /// The close code (See under "Reply Codes" in the AMQP specification)
-        /// </para><para>
-        /// A message indicating the reason for closing the channel
-        /// </para>
-        /// </remarks>
-        public static void Close(this IChannel channel, ushort replyCode, string replyText)
-        {
-            channel.Close(replyCode, replyText, false);
-        }
-#endif
-
         /// <summary>
         /// Asynchronously close this channel.
         /// </summary>

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

@@ -217,18 +217,6 @@ public interface IConnection : INetworkConnection, IDisposable
         /// TODO rabbitmq-dotnet-client-1472 async
         void UpdateSecret(string newSecret, string reason);
 
-#if SYNC_API
-        /// <summary>
-        /// Close this connection and all its channels
-        /// and wait with a timeout for all the in-progress close operations to complete.
-        /// </summary>
-        /// <param name="reasonCode">The close code (See under "Reply Codes" in the AMQP 0-9-1 specification).</param>
-        /// <param name="reasonText">A message indicating the reason for closing the connection.</param>
-        /// <param name="timeout">Operation timeout.</param>
-        /// <param name="abort">Whether or not this close is an abort (ignores certain exceptions).</param>
-        void Close(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort);
-#endif
-
         /// <summary>
         /// Asynchronously close this connection and all its channels
         /// and wait with a timeout for all the in-progress close operations to complete.