Skip to content

Commit 390ef8b

Browse files
committed
Adjust interface names to follow convention
1 parent 782ae3a commit 390ef8b

11 files changed

+19
-19
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ public sealed class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionF
147147
/// <summary>
148148
/// Default SASL auth mechanisms to use.
149149
/// </summary>
150-
public static readonly IList<AuthMechanismFactory> DefaultAuthMechanisms =
151-
new List<AuthMechanismFactory>() { new PlainMechanismFactory() };
150+
public static readonly IList<IAuthMechanismFactory> DefaultAuthMechanisms =
151+
new List<IAuthMechanismFactory>() { new PlainMechanismFactory() };
152152

153153
/// <summary>
154154
/// SASL auth mechanisms to use.
155155
/// </summary>
156-
public IList<AuthMechanismFactory> AuthMechanisms { get; set; } = DefaultAuthMechanisms;
156+
public IList<IAuthMechanismFactory> AuthMechanisms { get; set; } = DefaultAuthMechanisms;
157157

158158
/// <summary>
159159
/// Address family used by default.
@@ -331,10 +331,10 @@ public Uri Uri
331331
/// Given a list of mechanism names supported by the server, select a preferred mechanism,
332332
/// or null if we have none in common.
333333
/// </summary>
334-
public AuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames)
334+
public IAuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames)
335335
{
336336
// Our list is in order of preference, the server one is not.
337-
foreach (AuthMechanismFactory factory in AuthMechanisms)
337+
foreach (IAuthMechanismFactory factory in AuthMechanisms)
338338
{
339339
string factoryName = factory.Name;
340340
if (mechanismNames.Any<string>(x => string.Equals(x, factoryName, StringComparison.OrdinalIgnoreCase)))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
namespace RabbitMQ.Client
4242
{
43-
public class ExternalMechanism : AuthMechanism
43+
public class ExternalMechanism : IAuthMechanism
4444
{
4545
/// <summary>
4646
/// Handle one round of challenge-response.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
namespace RabbitMQ.Client
4242
{
43-
public class ExternalMechanismFactory : AuthMechanismFactory
43+
public class ExternalMechanismFactory : IAuthMechanismFactory
4444
{
4545
/// <summary>
4646
/// The name of the authentication mechanism, as negotiated on the wire.
@@ -53,7 +53,7 @@ public string Name
5353
/// <summary>
5454
/// Return a new authentication mechanism implementation.
5555
/// </summary>
56-
public AuthMechanism GetInstance()
56+
public IAuthMechanism GetInstance()
5757
{
5858
return new ExternalMechanism();
5959
}

projects/client/RabbitMQ.Client/src/client/api/AuthMechanism.cs renamed to projects/client/RabbitMQ.Client/src/client/api/IAuthMechanism.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace RabbitMQ.Client
4343
/// <summary>
4444
/// A pluggable authentication mechanism.
4545
/// </summary>
46-
public interface AuthMechanism
46+
public interface IAuthMechanism
4747
{
4848
/// <summary>
4949
/// Handle one round of challenge-response.

projects/client/RabbitMQ.Client/src/client/api/AuthMechanismFactory.cs renamed to projects/client/RabbitMQ.Client/src/client/api/IAuthMechanismFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
namespace RabbitMQ.Client
4242
{
43-
public interface AuthMechanismFactory
43+
public interface IAuthMechanismFactory
4444
{
4545
/// <summary>
4646
/// The name of the authentication mechanism, as negotiated on the wire.
@@ -50,6 +50,6 @@ public interface AuthMechanismFactory
5050
/// <summary>
5151
/// Return a new authentication mechanism implementation.
5252
/// </summary>
53-
AuthMechanism GetInstance();
53+
IAuthMechanism GetInstance();
5454
}
5555
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace RabbitMQ.Client
6565
/// appropriate.
6666
/// </para>
6767
/// </remarks>
68-
public interface IConnection : NetworkConnection, IDisposable
68+
public interface IConnection : INetworkConnection, IDisposable
6969
{
7070
/// <summary>
7171
/// The maximum channel number this connection supports (0 if unlimited).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public interface IConnectionFactory
101101
/// Given a list of mechanism names supported by the server, select a preferred mechanism,
102102
/// or null if we have none in common.
103103
/// </summary>
104-
AuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames);
104+
IAuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames);
105105

106106
/// <summary>
107107
/// Create a connection to the specified endpoint.

projects/client/RabbitMQ.Client/src/client/api/NetworkConnection.cs renamed to projects/client/RabbitMQ.Client/src/client/api/INetworkConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace RabbitMQ.Client
4343
/// <summary>
4444
/// Common interface for network (TCP/IP) connection classes.
4545
/// </summary>
46-
public interface NetworkConnection
46+
public interface INetworkConnection
4747
{
4848
/// <summary>
4949
/// Local port.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
namespace RabbitMQ.Client
4444
{
45-
public class PlainMechanism : AuthMechanism
45+
public class PlainMechanism : IAuthMechanism
4646
{
4747
public byte[] handleChallenge(byte[] challenge, IConnectionFactory factory)
4848
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
namespace RabbitMQ.Client
4242
{
43-
public class PlainMechanismFactory : AuthMechanismFactory
43+
public class PlainMechanismFactory : IAuthMechanismFactory
4444
{
4545
/// <summary>
4646
/// The name of the authentication mechanism, as negotiated on the wire.
@@ -53,7 +53,7 @@ public string Name
5353
/// <summary>
5454
/// Return a new authentication mechanism implementation.
5555
/// </summary>
56-
public AuthMechanism GetInstance()
56+
public IAuthMechanism GetInstance()
5757
{
5858
return new PlainMechanism();
5959
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,13 +1093,13 @@ void StartAndTune()
10931093
{
10941094
string mechanismsString = Encoding.UTF8.GetString(connectionStart.m_mechanisms, 0, connectionStart.m_mechanisms.Length);
10951095
string[] mechanisms = mechanismsString.Split(' ');
1096-
AuthMechanismFactory mechanismFactory = _factory.AuthMechanismFactory(mechanisms);
1096+
IAuthMechanismFactory mechanismFactory = _factory.AuthMechanismFactory(mechanisms);
10971097
if (mechanismFactory == null)
10981098
{
10991099
throw new IOException("No compatible authentication mechanism found - " +
11001100
"server offered [" + mechanismsString + "]");
11011101
}
1102-
AuthMechanism mechanism = mechanismFactory.GetInstance();
1102+
IAuthMechanism mechanism = mechanismFactory.GetInstance();
11031103
byte[] challenge = null;
11041104
do
11051105
{

0 commit comments

Comments
 (0)