1212
1313namespace RabbitMQ . AMQP . Client
1414{
15- // TODO rename to ConnectionSettingsBuilder
16- public class ConnectionSettingBuilder
15+ public class ConnectionSettingsBuilder
1716 {
18- // TODO: maybe add the event "LifeCycle" to the builder
1917 private string _host = "localhost" ;
2018 private int _port = - 1 ; // Note: -1 means use the defalt for the scheme
2119 private string ? _user = "guest" ;
@@ -28,54 +26,54 @@ public class ConnectionSettingBuilder
2826 private RecoveryConfiguration _recoveryConfiguration = new RecoveryConfiguration ( ) ;
2927 private IList < Uri > ? _uris ;
3028
31- public static ConnectionSettingBuilder Create ( )
29+ public static ConnectionSettingsBuilder Create ( )
3230 {
33- return new ConnectionSettingBuilder ( ) ;
31+ return new ConnectionSettingsBuilder ( ) ;
3432 }
3533
36- public ConnectionSettingBuilder Host ( string host )
34+ public ConnectionSettingsBuilder Host ( string host )
3735 {
3836 _host = host ;
3937 return this ;
4038 }
4139
42- public ConnectionSettingBuilder Port ( int port )
40+ public ConnectionSettingsBuilder Port ( int port )
4341 {
4442 _port = port ;
4543 return this ;
4644 }
4745
48- public ConnectionSettingBuilder User ( string user )
46+ public ConnectionSettingsBuilder User ( string user )
4947 {
5048 _user = user ;
5149 return this ;
5250 }
5351
54- public ConnectionSettingBuilder Password ( string password )
52+ public ConnectionSettingsBuilder Password ( string password )
5553 {
5654 _password = password ;
5755 return this ;
5856 }
5957
60- public ConnectionSettingBuilder Scheme ( string scheme )
58+ public ConnectionSettingsBuilder Scheme ( string scheme )
6159 {
6260 _scheme = scheme ;
6361 return this ;
6462 }
6563
66- public ConnectionSettingBuilder ContainerId ( string containerId )
64+ public ConnectionSettingsBuilder ContainerId ( string containerId )
6765 {
6866 _containerId = containerId ;
6967 return this ;
7068 }
7169
72- public ConnectionSettingBuilder VirtualHost ( string virtualHost )
70+ public ConnectionSettingsBuilder VirtualHost ( string virtualHost )
7371 {
7472 _virtualHost = virtualHost ;
7573 return this ;
7674 }
7775
78- public ConnectionSettingBuilder MaxFrameSize ( uint maxFrameSize )
76+ public ConnectionSettingsBuilder MaxFrameSize ( uint maxFrameSize )
7977 {
8078 _maxFrameSize = maxFrameSize ;
8179 if ( _maxFrameSize != uint . MinValue && _maxFrameSize < 512 )
@@ -86,7 +84,7 @@ public ConnectionSettingBuilder MaxFrameSize(uint maxFrameSize)
8684 return this ;
8785 }
8886
89- public ConnectionSettingBuilder SaslMechanism ( SaslMechanism saslMechanism )
87+ public ConnectionSettingsBuilder SaslMechanism ( SaslMechanism saslMechanism )
9088 {
9189 _saslMechanism = saslMechanism ;
9290 if ( _saslMechanism == Client . SaslMechanism . Anonymous ||
@@ -99,13 +97,13 @@ public ConnectionSettingBuilder SaslMechanism(SaslMechanism saslMechanism)
9997 return this ;
10098 }
10199
102- public ConnectionSettingBuilder RecoveryConfiguration ( RecoveryConfiguration recoveryConfiguration )
100+ public ConnectionSettingsBuilder RecoveryConfiguration ( RecoveryConfiguration recoveryConfiguration )
103101 {
104102 _recoveryConfiguration = recoveryConfiguration ;
105103 return this ;
106104 }
107105
108- public ConnectionSettingBuilder Uris ( IEnumerable < Uri > uris )
106+ public ConnectionSettingsBuilder Uris ( IEnumerable < Uri > uris )
109107 {
110108 _uris = uris . ToList ( ) ;
111109 return this ;
@@ -226,6 +224,9 @@ public ConnectionSettings(string scheme, string host, int port,
226224 public SaslMechanism SaslMechanism => _saslMechanism ;
227225 public TlsSettings ? TlsSettings => _tlsSettings ;
228226 public RecoveryConfiguration Recovery => _recoveryConfiguration ;
227+ public IEnumerable < Uri > ? Uris => throw new NotImplementedException ( ) ;
228+
229+ internal Address Address => _address ;
229230
230231 public override string ToString ( )
231232 {
@@ -243,32 +244,25 @@ public override bool Equals(object? obj)
243244 return false ;
244245 }
245246
246- if ( obj is ConnectionSettings address )
247+ if ( Object . ReferenceEquals ( this , obj ) )
247248 {
248- return _address . Host == address . _address . Host &&
249- _address . Port == address . _address . Port &&
250- _address . Path == address . _address . Path &&
251- _address . User == address . _address . User &&
252- _address . Password == address . _address . Password &&
253- _address . Scheme == address . _address . Scheme ;
249+ return true ;
254250 }
255251
256- return false ;
257- }
258-
259- protected bool Equals ( ConnectionSettings other )
260- {
261- if ( other is null )
252+ if ( obj is ConnectionSettings other )
262253 {
263- return false ;
254+ return
255+ _address . Host == other . _address . Host &&
256+ _address . Port == other . _address . Port &&
257+ _virtualHost == other . _virtualHost &&
258+ _address . User == other . _address . User &&
259+ _address . Password == other . _address . Password &&
260+ _address . Scheme == other . _address . Scheme &&
261+ _containerId == other . _containerId &&
262+ _address . Path == other . _address . Path ;
264263 }
265264
266- return _address . Equals ( other . _address ) ;
267- }
268-
269- public override int GetHashCode ( )
270- {
271- return _address . GetHashCode ( ) ;
265+ return false ;
272266 }
273267
274268 bool IEquatable < ConnectionSettings > . Equals ( ConnectionSettings ? other )
@@ -278,24 +272,20 @@ bool IEquatable<ConnectionSettings>.Equals(ConnectionSettings? other)
278272 return false ;
279273 }
280274
281- if ( other is ConnectionSettings connectionSettings )
275+ if ( Object . ReferenceEquals ( this , other ) )
282276 {
283- return _address . Host == connectionSettings . Host &&
284- _address . Port == connectionSettings . Port &&
285- _address . Path == connectionSettings . Path &&
286- _address . User == connectionSettings . User &&
287- _address . Password == connectionSettings . Password &&
288- _address . Scheme == connectionSettings . Scheme ;
277+ return true ;
289278 }
290279
291- return false ;
280+ return Equals ( other ) ;
292281 }
293282
294- internal Address Address => _address ;
295-
296- public IEnumerable < Uri > ? Uris => throw new NotImplementedException ( ) ;
297-
298- // public RecoveryConfiguration RecoveryConfiguration { get; set; } = RecoveryConfiguration.Create();
283+ public override int GetHashCode ( )
284+ {
285+ return HashCode . Combine ( _address . Host , _address . Port ,
286+ _virtualHost , _address . User , _address . Password ,
287+ _address . Scheme , _containerId , _address . Path ) ;
288+ }
299289
300290 ///<summary>
301291 /// Unescape a string, protecting '+'.
0 commit comments