Skip to content

Commit 304f976

Browse files
Remove ConnectionFactory#Tls alias
The dream of eradicating "SSL" everywhere we can over a decade after the name has been deprecated is still alive, though. (cherry picked from commit 1631482)
1 parent aed0758 commit 304f976

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

projects/client/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,6 @@ public IProtocol Protocol
184184
/// </summary>
185185
public SslOption Ssl { get; set; }
186186

187-
public SslOption Tls {
188-
get { return this.Ssl; }
189-
set { this.Ssl = value; }
190-
}
191-
192187
/// <summary>
193188
/// Construct an instance from a protocol and an address in "hostname:port" format.
194189
/// </summary>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,6 @@ public TimeSpan ContinuationTimeout
245245
/// </summary>
246246
public SslOption Ssl { get; set; } = new SslOption();
247247

248-
/// <summary>
249-
/// TLS options setting.
250-
/// </summary>
251-
public SslOption Tls {
252-
get { return this.Ssl; }
253-
set { this.Ssl = value; }
254-
}
255-
256248
/// <summary>
257249
/// Set to false to make automatic connection recovery not recover topology (exchanges, queues, bindings, etc).
258250
/// Defaults to true.

projects/client/Unit/src/unit/APIApproval.Approve.approved.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace RabbitMQ.Client
1515
public int Port { get; set; }
1616
public RabbitMQ.Client.IProtocol Protocol { get; }
1717
public RabbitMQ.Client.SslOption Ssl { get; set; }
18-
public RabbitMQ.Client.SslOption Tls { get; set; }
1918
public object Clone() { }
2019
public RabbitMQ.Client.AmqpTcpEndpoint CloneWithHostname(string hostname) { }
2120
public override bool Equals(object obj) { }
@@ -113,7 +112,6 @@ namespace RabbitMQ.Client
113112
public System.TimeSpan SocketReadTimeout { get; set; }
114113
public System.TimeSpan SocketWriteTimeout { get; set; }
115114
public RabbitMQ.Client.SslOption Ssl { get; set; }
116-
public RabbitMQ.Client.SslOption Tls { get; set; }
117115
public bool TopologyRecoveryEnabled { get; set; }
118116
public System.Uri Uri { get; set; }
119117
public bool UseBackgroundThreadsForIO { get; set; }

projects/client/Unit/src/unit/TestAmqpUri.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ private static void AssertUriPartEquivalence(ConnectionFactory cf, string user,
172172
Assert.AreEqual(password, cf.Password);
173173
Assert.AreEqual(port, cf.Port);
174174
Assert.AreEqual(vhost, cf.VirtualHost);
175-
Assert.AreEqual(tlsEnabled, cf.Tls.Enabled);
175+
Assert.AreEqual(tlsEnabled, cf.Ssl.Enabled);
176176

177177
Assert.AreEqual(port, cf.Endpoint.Port);
178-
Assert.AreEqual(tlsEnabled, cf.Endpoint.Tls.Enabled);
178+
Assert.AreEqual(tlsEnabled, cf.Endpoint.Ssl.Enabled);
179179
}
180180

181181
private void ParseFailWith<T>(string uri) where T : Exception

0 commit comments

Comments
 (0)