Remove IAsyncConnectionFactory

Author: danielmarbach

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

@@ -85,7 +85,7 @@ namespace RabbitMQ.Client
     ///"amqp://foo/" (note the trailing slash) also represent the
     ///default virtual host.  The latter issue means that virtual
     ///hosts with an empty name are not addressable. </para></remarks>
-    public sealed class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionFactory
+    public sealed class ConnectionFactory : ConnectionFactoryBase, IConnectionFactory
     {
         /// <summary>
         /// Default value for the desired maximum channel number. Default: 2047.

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

@@ -172,6 +172,12 @@ public interface IConnectionFactory
         /// </summary>
         TimeSpan ContinuationTimeout { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether an asynchronous consumer dispatcher which is compatible with <see cref="IAsyncBasicConsumer"/> is used.
+        /// </summary>
+        /// <value><see langword="true" /> if an asynchronous consumer dispatcher which is compatible with <see cref="IAsyncBasicConsumer"/> is used; otherwise, <see langword="false" />.</value>
+        bool DispatchConsumersAsync { get; set; }
+
         /// <summary>
         /// Set to a value greater than one to enable concurrent processing. For a concurrency greater than one <see cref="IBasicConsumer"/>
         /// will be offloaded to the worker thread pool so it is important to choose the value for the concurrency wisely to avoid thread pool overloading.

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

@@ -102,14 +102,9 @@ public Connection(IConnectionFactory factory, bool insist, IFrameHandler frameHa
             _factory = factory;
             _frameHandler = frameHandler;
 
-            if (factory is IAsyncConnectionFactory asyncConnectionFactory && asyncConnectionFactory.DispatchConsumersAsync)
-            {
-                ConsumerWorkService = new AsyncConsumerWorkService(factory.ConsumerDispatchConcurrency);
-            }
-            else
-            {
-                ConsumerWorkService = new ConsumerWorkService(factory.ConsumerDispatchConcurrency);
-            }
+            ConsumerWorkService = factory.DispatchConsumersAsync
+                ? new AsyncConsumerWorkService(factory.ConsumerDispatchConcurrency)
+                : new ConsumerWorkService(factory.ConsumerDispatchConcurrency);
 
             _sessionManager = new SessionManager(this, 0);
             _session0 = new MainSession(this) { Handler = NotifyReceivedCloseOk };
@@ -154,7 +149,7 @@ public event EventHandler<ShutdownEventArgs> ConnectionShutdown
             }
         }
 
-        
+
 
         public event EventHandler<EventArgs> ConnectionUnblocked;
 

projects/RabbitMQ.Client/client/impl/Connection.cs

@@ -69,7 +69,7 @@ namespace RabbitMQ.Client
         public BinaryTableValue(byte[] bytes) { }
         public byte[] Bytes { get; set; }
     }
-    public sealed class ConnectionFactory : RabbitMQ.Client.ConnectionFactoryBase, RabbitMQ.Client.IAsyncConnectionFactory, RabbitMQ.Client.IConnectionFactory
+    public sealed class ConnectionFactory : RabbitMQ.Client.ConnectionFactoryBase, RabbitMQ.Client.IConnectionFactory
     {
         public const ushort DefaultChannelMax = 2047;
         public const uint DefaultFrameMax = 0u;
@@ -221,10 +221,6 @@ namespace RabbitMQ.Client
         System.Threading.Tasks.Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body);
         System.Threading.Tasks.Task HandleModelShutdown(object model, RabbitMQ.Client.ShutdownEventArgs reason);
     }
-    public interface IAsyncConnectionFactory : RabbitMQ.Client.IConnectionFactory
-    {
-        bool DispatchConsumersAsync { get; set; }
-    }
     public interface IAuthMechanism
     {
         byte[] handleChallenge(byte[] challenge, RabbitMQ.Client.IConnectionFactory factory);
@@ -338,6 +334,7 @@ namespace RabbitMQ.Client
         string ClientProvidedName { get; set; }
         int ConsumerDispatchConcurrency { get; set; }
         System.TimeSpan ContinuationTimeout { get; set; }
+        bool DispatchConsumersAsync { get; set; }
         System.TimeSpan HandshakeContinuationTimeout { get; set; }
         string Password { get; set; }
         ushort RequestedChannelMax { get; set; }