Merge pull request #763 from bording/public-api-cleanup-round-2

Public api cleanup round 2

Author: lukebakken

projects/client/Apigen/src/apigen/Apigen.cs

@@ -941,7 +941,7 @@ public void EmitMethodArgumentReader()
             EmitLine("        return result;");
             EmitLine("      }");
             EmitLine("");
-            EmitLine("      throw new Client.Impl.UnknownClassOrMethodException(classId, methodId);");
+            EmitLine("      throw new Client.Exceptions.UnknownClassOrMethodException(classId, methodId);");
             EmitLine("    }");
             EmitLine("");
             EmitLine("    internal Client.Impl.MethodBase DecodeMethodFrom(ushort classId, ushort methodId)");
@@ -974,7 +974,7 @@ public void EmitContentHeaderReader()
                     EmitLine($"        case {c.Index}: return new {MangleClass(c.Name)}Properties();");
                 }
             }
-            EmitLine("        default: throw new Client.Impl.UnknownClassOrMethodException(classId, 0);");
+            EmitLine("        default: throw new Client.Exceptions.UnknownClassOrMethodException(classId, 0);");
             EmitLine("      }");
             EmitLine("    }");
         }

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

@@ -147,13 +147,13 @@ public sealed class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionF
         /// <summary>
         ///  Default SASL auth mechanisms to use.
         /// </summary>
-        public static readonly IList<AuthMechanismFactory> DefaultAuthMechanisms =
-            new List<AuthMechanismFactory>() { new PlainMechanismFactory() };
+        public static readonly IList<IAuthMechanismFactory> DefaultAuthMechanisms =
+            new List<IAuthMechanismFactory>() { new PlainMechanismFactory() };
 
         /// <summary>
         ///  SASL auth mechanisms to use.
         /// </summary>
-        public IList<AuthMechanismFactory> AuthMechanisms { get; set; } = DefaultAuthMechanisms;
+        public IList<IAuthMechanismFactory> AuthMechanisms { get; set; } = DefaultAuthMechanisms;
 
         /// <summary>
         /// Address family used by default.
@@ -331,10 +331,10 @@ public Uri Uri
         /// Given a list of mechanism names supported by the server, select a preferred mechanism,
         ///  or null if we have none in common.
         /// </summary>
-        public AuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames)
+        public IAuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames)
         {
             // Our list is in order of preference, the server one is not.
-            foreach (AuthMechanismFactory factory in AuthMechanisms)
+            foreach (IAuthMechanismFactory factory in AuthMechanisms)
             {
                 string factoryName = factory.Name;
                 if (mechanismNames.Any<string>(x => string.Equals(x, factoryName, StringComparison.OrdinalIgnoreCase)))

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

@@ -40,6 +40,7 @@
 
 using System;
 using System.Net.Sockets;
+using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client
 {

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

@@ -40,7 +40,7 @@
 
 namespace RabbitMQ.Client
 {
-    public class ExternalMechanism : AuthMechanism
+    public class ExternalMechanism : IAuthMechanism
     {
         /// <summary>
         /// Handle one round of challenge-response.

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

@@ -40,7 +40,7 @@
 
 namespace RabbitMQ.Client
 {
-    public class ExternalMechanismFactory : AuthMechanismFactory
+    public class ExternalMechanismFactory : IAuthMechanismFactory
     {
         /// <summary>
         /// The name of the authentication mechanism, as negotiated on the wire.
@@ -53,7 +53,7 @@ public string Name
         /// <summary>
         /// Return a new authentication mechanism implementation.
         /// </summary>
-        public AuthMechanism GetInstance()
+        public IAuthMechanism GetInstance()
         {
             return new ExternalMechanism();
         }

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

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client
     /// <summary>
     /// A pluggable authentication mechanism.
     /// </summary>
-    public interface AuthMechanism
+    public interface IAuthMechanism
     {
         /// <summary>
         /// 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

@@ -40,7 +40,7 @@
 
 namespace RabbitMQ.Client
 {
-    public interface AuthMechanismFactory
+    public interface IAuthMechanismFactory
     {
         /// <summary>
         /// The name of the authentication mechanism, as negotiated on the wire.
@@ -50,6 +50,6 @@ public interface AuthMechanismFactory
         /// <summary>
         /// Return a new authentication mechanism implementation.
         /// </summary>
-        AuthMechanism GetInstance();
+        IAuthMechanism GetInstance();
     }
 }

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

@@ -45,6 +45,7 @@
 
 using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Exceptions;
+using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client
 {
@@ -65,7 +66,7 @@ namespace RabbitMQ.Client
     /// appropriate.
     /// </para>
     /// </remarks>
-    public interface IConnection : NetworkConnection, IDisposable
+    public interface IConnection : INetworkConnection, IDisposable
     {
         /// <summary>
         /// The maximum channel number this connection supports (0 if unlimited).

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

@@ -101,7 +101,7 @@ public interface IConnectionFactory
         /// Given a list of mechanism names supported by the server, select a preferred mechanism,
         /// or null if we have none in common.
         /// </summary>
-        AuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames);
+        IAuthMechanismFactory AuthMechanismFactory(IList<string> mechanismNames);
 
         /// <summary>
         /// 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

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client
     /// <summary>
     /// Common interface for network (TCP/IP) connection classes.
     /// </summary>
-    public interface NetworkConnection
+    public interface INetworkConnection
     {
         /// <summary>
         /// Local port.