* Rename to ClusterConnectionSettings

Author: lukebakken

RabbitMQ.AMQP.Client/ConnectionSettings.cs

@@ -159,7 +159,7 @@ public ConnectionSettings Build()
             }
             else if (_uris is not null)
             {
-                return new ConnectionSettingsViaUris(_uris,
+                return new ClusterConnectionSettings(_uris,
                     _uriSelector,
                     _containerId, _saslMechanism,
                     _recoveryConfiguration,
@@ -415,13 +415,13 @@ private static string UriDecode(string str)
         }
     }
 
-    public class ConnectionSettingsViaUris : ConnectionSettings
+    public class ClusterConnectionSettings : ConnectionSettings
     {
         private readonly List<Uri> _uris;
         private readonly Dictionary<Uri, Address> _uriToAddress;
         private readonly IUriSelector _uriSelector = new RandomUriSelector();
 
-        public ConnectionSettingsViaUris(IEnumerable<Uri> uris,
+        public ClusterConnectionSettings(IEnumerable<Uri> uris,
             IUriSelector? uriSelector = null,
             string? containerId = null,
             SaslMechanism? saslMechanism = null,
@@ -492,7 +492,7 @@ public override bool Equals(object? obj)
                 return false;
             }
 
-            if (base.Equals(obj) && (obj is ConnectionSettingsViaUris other))
+            if (base.Equals(obj) && (obj is ClusterConnectionSettings other))
             {
                 for (int i = 0; i < _uris.Count; i++)
                 {

RabbitMQ.AMQP.Client/PublicAPI.Unshipped.txt

@@ -11,11 +11,11 @@ const RabbitMQ.AMQP.Client.Consts.Queues = "queues" -> string!
 const RabbitMQ.AMQP.Client.MetricsReporter.MeterName = "RabbitMQ.Amqp" -> string!
 const RabbitMQ.AMQP.Client.MetricsReporter.MetricPrefix = "rabbitmq.amqp" -> string!
 override RabbitMQ.AMQP.Client.BackOffDelayPolicy.ToString() -> string!
+override RabbitMQ.AMQP.Client.ClusterConnectionSettings.Equals(object? obj) -> bool
+override RabbitMQ.AMQP.Client.ClusterConnectionSettings.GetHashCode() -> int
 override RabbitMQ.AMQP.Client.ConnectionSettings.Equals(object? obj) -> bool
 override RabbitMQ.AMQP.Client.ConnectionSettings.GetHashCode() -> int
 override RabbitMQ.AMQP.Client.ConnectionSettings.ToString() -> string!
-override RabbitMQ.AMQP.Client.ConnectionSettingsViaUris.Equals(object? obj) -> bool
-override RabbitMQ.AMQP.Client.ConnectionSettingsViaUris.GetHashCode() -> int
 override RabbitMQ.AMQP.Client.Error.ToString() -> string!
 override RabbitMQ.AMQP.Client.Impl.AmqpConnection.CloseAsync() -> System.Threading.Tasks.Task!
 override RabbitMQ.AMQP.Client.Impl.AmqpConnection.OpenAsync() -> System.Threading.Tasks.Task!
@@ -56,6 +56,8 @@ RabbitMQ.AMQP.Client.ClassicQueueMode.Lazy = 1 -> RabbitMQ.AMQP.Client.ClassicQu
 RabbitMQ.AMQP.Client.ClassicQueueVersion
 RabbitMQ.AMQP.Client.ClassicQueueVersion.V1 = 0 -> RabbitMQ.AMQP.Client.ClassicQueueVersion
 RabbitMQ.AMQP.Client.ClassicQueueVersion.V2 = 1 -> RabbitMQ.AMQP.Client.ClassicQueueVersion
+RabbitMQ.AMQP.Client.ClusterConnectionSettings
+RabbitMQ.AMQP.Client.ClusterConnectionSettings.ClusterConnectionSettings(System.Collections.Generic.IEnumerable<System.Uri!>! uris, RabbitMQ.AMQP.Client.IUriSelector? uriSelector = null, 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.ConnectionException
 RabbitMQ.AMQP.Client.ConnectionException.ConnectionException(string! message) -> void
 RabbitMQ.AMQP.Client.ConnectionException.ConnectionException(string! message, System.Exception! innerException) -> void
@@ -95,8 +97,6 @@ RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.Uris(System.Collections.Generic.I
 RabbitMQ.AMQP.Client.ConnectionSettingsBuilder.UriSelector(RabbitMQ.AMQP.Client.IUriSelector! uriSelector) -> 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!
-RabbitMQ.AMQP.Client.ConnectionSettingsViaUris
-RabbitMQ.AMQP.Client.ConnectionSettingsViaUris.ConnectionSettingsViaUris(System.Collections.Generic.IEnumerable<System.Uri!>! uris, RabbitMQ.AMQP.Client.IUriSelector? uriSelector = null, 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.Consts
 RabbitMQ.AMQP.Client.ConsumerException
 RabbitMQ.AMQP.Client.ConsumerException.ConsumerException(string! message) -> void

Tests/ConnectionTests/ConnectionSettingsTests.cs

@@ -121,7 +121,7 @@ public void ConnectionSettingsViaUris()
         var uri2 = new Uri($"{scheme}://{user}:{pass}@{host}:5691/%2Ffrazzle");
 
         List<Uri> uris = [uri0, uri1, uri2];
-        var connectionSettings = new ConnectionSettingsViaUris(uris);
+        var connectionSettings = new ClusterConnectionSettings(uris);
 
         Assert.True(connectionSettings.UseSsl);
         Assert.Equal(host, connectionSettings.Host);
@@ -295,7 +295,7 @@ public void ConnectionSettingsViaUrisThrowsWithDifferentVirtualHosts()
         var uri2 = new Uri($"{scheme}://{user}:{pass}@{host}:5691/foo");
 
         List<Uri> uris = [uri0, uri1, uri2];
-        Assert.ThrowsAny<ArgumentException>(() => new ConnectionSettingsViaUris(uris));
+        Assert.ThrowsAny<ArgumentException>(() => new ClusterConnectionSettings(uris));
     }
 
     [Fact]