* Rework ConnectionSettings ctors to allow other settings when Uri or Uris are used.

Author: lukebakken

RabbitMQ.AMQP.Client/ConnectionSettings.cs

@@ -24,6 +24,8 @@ public class ConnectionSettingsBuilder
         private uint _maxFrameSize = Consts.DefaultMaxFrameSize;
         private SaslMechanism _saslMechanism = Client.SaslMechanism.Anonymous;
         private IRecoveryConfiguration _recoveryConfiguration = new RecoveryConfiguration();
+        private TlsSettings? _tlsSettings = null;
+        private Uri? _uri;
         private List<Uri>? _uris;
 
         public static ConnectionSettingsBuilder Create()
@@ -76,10 +78,10 @@ public ConnectionSettingsBuilder VirtualHost(string virtualHost)
         public ConnectionSettingsBuilder MaxFrameSize(uint maxFrameSize)
         {
             _maxFrameSize = maxFrameSize;
-            if (_maxFrameSize != uint.MinValue && _maxFrameSize < 512)
+            if (_maxFrameSize != Consts.DefaultMaxFrameSize && _maxFrameSize < 512)
             {
                 throw new ArgumentOutOfRangeException(nameof(maxFrameSize),
-                    "maxFrameSize must be greater or equal to 512");
+                    "maxFrameSize must be 0 (no limit) or greater than or equal to 512");
             }
             return this;
         }
@@ -103,21 +105,63 @@ public ConnectionSettingsBuilder RecoveryConfiguration(IRecoveryConfiguration re
             return this;
         }
 
+        public ConnectionSettingsBuilder TlsSettings(TlsSettings tlsSettings)
+        {
+            _tlsSettings = tlsSettings;
+            return this;
+        }
+
+        public ConnectionSettingsBuilder Uri(Uri uri)
+        {
+            _uri = uri;
+            ValidateUris();
+            return this;
+        }
+
         public ConnectionSettingsBuilder Uris(IEnumerable<Uri> uris)
         {
             _uris = uris.ToList();
+            ValidateUris();
             return this;
         }
 
         public ConnectionSettings Build()
         {
+            ValidateUris();
             // TODO this should do something similar to consolidate in the Java code
-            var c = new ConnectionSettings(_scheme, _host, _port, _user,
-                _password, _virtualHost,
-                _containerId, _saslMechanism,
-                _recoveryConfiguration,
-                _maxFrameSize);
-            return c;
+            if (_uri is not null)
+            {
+                return new ConnectionSettings(_uri,
+                    _containerId, _saslMechanism,
+                    _recoveryConfiguration,
+                    _maxFrameSize,
+                    _tlsSettings);
+            }
+            else if (_uris is not null)
+            {
+                return new ConnectionSettings(_uris,
+                    _containerId, _saslMechanism,
+                    _recoveryConfiguration,
+                    _maxFrameSize,
+                    _tlsSettings);
+            }
+            else
+            {
+                return new ConnectionSettings(_scheme, _host, _port, _user,
+                    _password, _virtualHost,
+                    _containerId, _saslMechanism,
+                    _recoveryConfiguration,
+                    _maxFrameSize,
+                    _tlsSettings);
+            }
+        }
+
+        private void ValidateUris()
+        {
+            if (_uri is not null && _uris is not null)
+            {
+                throw new ArgumentOutOfRangeException("uris", "Do not set both Uri and Uris");
+            }
         }
     }
 
@@ -126,23 +170,22 @@ public ConnectionSettings Build()
     // </summary>
     public class ConnectionSettings : IEquatable<ConnectionSettings>
     {
-        private readonly Address _address;
+        private readonly Address _address = new("amqp://localhost:5672");
         private readonly List<Address> _addresses = new();
         private readonly string _virtualHost = Consts.DefaultVirtualHost;
-        private readonly string _containerId = "";
+        private readonly string _containerId = string.Empty;
         private readonly uint _maxFrameSize = Consts.DefaultMaxFrameSize;
         private readonly TlsSettings? _tlsSettings;
         private readonly SaslMechanism _saslMechanism = SaslMechanism.Plain;
         private readonly IRecoveryConfiguration _recoveryConfiguration = new RecoveryConfiguration();
 
-        /*
-         * TODO: support these:
-            SaslMechanism saslMechanism,
-            IRecoveryConfiguration recoveryConfiguration,
-            uint maxFrameSize = Consts.DefaultMaxFrameSize,
+        public ConnectionSettings(Uri uri,
+            string? containerId = null,
+            SaslMechanism? saslMechanism = null,
+            IRecoveryConfiguration? recoveryConfiguration = null,
+            uint? maxFrameSize = null,
             TlsSettings? tlsSettings = null)
-         */
-        public ConnectionSettings(Uri uri)
+            : this(containerId, saslMechanism, recoveryConfiguration, maxFrameSize, tlsSettings)
         {
             (string? user, string? password) = ProcessUserInfo(uri);
 
@@ -162,14 +205,13 @@ public ConnectionSettings(Uri uri)
             }
         }
 
-        /*
-         * TODO: support these:
-            SaslMechanism saslMechanism,
-            IRecoveryConfiguration recoveryConfiguration,
-            uint maxFrameSize = Consts.DefaultMaxFrameSize,
+        public ConnectionSettings(IEnumerable<Uri> uris,
+            string? containerId = null,
+            SaslMechanism? saslMechanism = null,
+            IRecoveryConfiguration? recoveryConfiguration = null,
+            uint? maxFrameSize = null,
             TlsSettings? tlsSettings = null)
-         */
-        public ConnectionSettings(IEnumerable<Uri> uris)
+            : this(containerId, saslMechanism, recoveryConfiguration, maxFrameSize, tlsSettings)
         {
             string? tmpVirtualHost = null;
 
@@ -200,43 +242,75 @@ public ConnectionSettings(IEnumerable<Uri> uris)
             }
 
             _address = _addresses[0];
+
             if (tmpVirtualHost is not null)
             {
                 _virtualHost = tmpVirtualHost;
             }
         }
 
-        public ConnectionSettings(string scheme, string host, int port,
-            string? user, string? password,
-            string virtualHost, string containerId,
-            SaslMechanism saslMechanism,
-            IRecoveryConfiguration recoveryConfiguration,
-            uint maxFrameSize = Consts.DefaultMaxFrameSize,
+        public ConnectionSettings(string scheme,
+            string host,
+            int port,
+            string? user = null,
+            string? password = null,
+            string? virtualHost = null,
+            string containerId = "",
+            SaslMechanism? saslMechanism = null,
+            IRecoveryConfiguration? recoveryConfiguration = null,
+            uint? maxFrameSize = null,
             TlsSettings? tlsSettings = null)
+            : this(containerId, saslMechanism, recoveryConfiguration, maxFrameSize, tlsSettings)
         {
             _address = new Address(host: host, port: port,
                 user: user, password: password,
                 path: "/", scheme: scheme);
             _addresses.Add(_address);
-            _containerId = containerId;
-            _virtualHost = virtualHost;
-            _saslMechanism = saslMechanism;
 
-            _maxFrameSize = maxFrameSize;
-            if (_maxFrameSize != uint.MinValue && _maxFrameSize < 512)
+            if (virtualHost is not null)
             {
-                throw new ArgumentOutOfRangeException(nameof(maxFrameSize),
-                    "maxFrameSize must be greater or equal to 512");
+                _virtualHost = virtualHost;
             }
 
-            _tlsSettings = tlsSettings;
-
             if (_address.UseSsl && _tlsSettings == null)
             {
                 _tlsSettings = new TlsSettings();
             }
+        }
+
+        private ConnectionSettings(
+            string? containerId = null,
+            SaslMechanism? saslMechanism = null,
+            IRecoveryConfiguration? recoveryConfiguration = null,
+            uint? maxFrameSize = null,
+            TlsSettings? tlsSettings = null)
+        {
+            if (containerId is not null)
+            {
+                _containerId = containerId;
+            }
 
-            _recoveryConfiguration = recoveryConfiguration;
+            if (saslMechanism is not null)
+            {
+                _saslMechanism = saslMechanism;
+            }
+
+            if (recoveryConfiguration is not null)
+            {
+                _recoveryConfiguration = recoveryConfiguration;
+            }
+
+            if (maxFrameSize is not null)
+            {
+                _maxFrameSize = (uint)maxFrameSize;
+                if (_maxFrameSize != Consts.DefaultMaxFrameSize && _maxFrameSize < 512)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(maxFrameSize),
+                        "maxFrameSize must be 0 (no limit) or greater than or equal to 512");
+                }
+            }
+
+            _tlsSettings = tlsSettings;
         }
 
         public string Host => _address.Host;

RabbitMQ.AMQP.Client/PublicAPI.Unshipped.txt

@@ -58,9 +58,9 @@ RabbitMQ.AMQP.Client.ConnectionException
 RabbitMQ.AMQP.Client.ConnectionException.ConnectionException(string! message) -> void
 RabbitMQ.AMQP.Client.ConnectionException.ConnectionException(string! message, System.Exception! innerException) -> void
 RabbitMQ.AMQP.Client.ConnectionSettings
-RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(string! scheme, string! host, int port, string? user, string? password, string! virtualHost, string! containerId, RabbitMQ.AMQP.Client.SaslMechanism! saslMechanism, RabbitMQ.AMQP.Client.IRecoveryConfiguration! recoveryConfiguration, uint maxFrameSize = 0, RabbitMQ.AMQP.Client.TlsSettings? tlsSettings = null) -> void
-RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(System.Collections.Generic.IEnumerable<System.Uri!>! uris) -> void
-RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(System.Uri! uri) -> void
+RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(string! scheme, string! host, int port, string? user = null, string? password = null, string? virtualHost = null, string! containerId = "", RabbitMQ.AMQP.Client.SaslMechanism? saslMechanism = null, RabbitMQ.AMQP.Client.IRecoveryConfiguration? recoveryConfiguration = null, uint? maxFrameSize = null, RabbitMQ.AMQP.Client.TlsSettings? tlsSettings = null) -> void
+RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(System.Collections.Generic.IEnumerable<System.Uri!>! uris, string? containerId = null, RabbitMQ.AMQP.Client.SaslMechanism? saslMechanism = null, RabbitMQ.AMQP.Client.IRecoveryConfiguration? recoveryConfiguration = null, uint? maxFrameSize = null, RabbitMQ.AMQP.Client.TlsSettings? tlsSettings = null) -> void
+RabbitMQ.AMQP.Client.ConnectionSettings.ConnectionSettings(System.Uri! uri, string? containerId = null, RabbitMQ.AMQP.Client.SaslMechanism? saslMechanism = null, RabbitMQ.AMQP.Client.IRecoveryConfiguration? recoveryConfiguration = null, uint? maxFrameSize = null, RabbitMQ.AMQP.Client.TlsSettings? tlsSettings = null) -> void
 RabbitMQ.AMQP.Client.ConnectionSettings.ContainerId.get -> string!
 RabbitMQ.AMQP.Client.ConnectionSettings.Host.get -> string!
 RabbitMQ.AMQP.Client.ConnectionSettings.MaxFrameSize.get -> uint
@@ -85,6 +85,8 @@ RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.Port(int port) -> RabbitMQ.AMQP.C
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.RecoveryConfiguration(RabbitMQ.AMQP.Client.IRecoveryConfiguration! recoveryConfiguration) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.SaslMechanism(RabbitMQ.AMQP.Client.SaslMechanism! saslMechanism) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.Scheme(string! scheme) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
+RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.TlsSettings(RabbitMQ.AMQP.Client.TlsSettings! tlsSettings) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
+RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.Uri(System.Uri! uri) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.Uris(System.Collections.Generic.IEnumerable<System.Uri!>! uris) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.User(string! user) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.VirtualHost(string! virtualHost) -> RabbitMQ.AMQP.Client.ConnectionSettingsBuilder!