Merge pull request #739 from bording/public-api-cleanup

Public API cleanup, round 1

Author: michaelklishin

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

@@ -516,7 +516,7 @@ public void EmitClassMethods(AmqpClass c)
             {
                 EmitAutogeneratedSummary("  ", $"AMQP specification method \"{c.Name}.{m.Name}\".");
                 EmitSpecComment(m.DocumentationCommentVariant("  ", "remarks"));
-                EmitLine($"  public interface I{MangleMethodClass(c, m)} : IMethod");
+                EmitLine($"  internal interface I{MangleMethodClass(c, m)} : IMethod");
                 EmitLine("  {");
                 foreach (AmqpField f in m.m_Fields)
                 {
@@ -635,7 +635,7 @@ public void EmitClassProperties(AmqpClass c)
             EmitLine($"    public override ushort ProtocolClassId => {c.Index};");
             EmitLine($"    public override string ProtocolClassName => \"{c.Name}\";");
             EmitLine("");
-            EmitLine("    public override void ReadPropertiesFrom(Client.Impl.ContentHeaderPropertyReader reader)");
+            EmitLine("    internal override void ReadPropertiesFrom(Client.Impl.ContentHeaderPropertyReader reader)");
             EmitLine("    {");
             foreach (AmqpField f in c.m_Fields)
             {
@@ -658,7 +658,7 @@ public void EmitClassProperties(AmqpClass c)
             }
             EmitLine("    }");
             EmitLine("");
-            EmitLine("    public override void WritePropertiesTo(Client.Impl.ContentHeaderPropertyWriter writer)");
+            EmitLine("    internal override void WritePropertiesTo(Client.Impl.ContentHeaderPropertyWriter writer)");
             EmitLine("    {");
             foreach (AmqpField f in c.m_Fields)
             {
@@ -733,7 +733,7 @@ public void EmitPrivate()
             }
             EmitLine("  }");
             EmitLine("");
-            EmitLine("  public enum ClassId");
+            EmitLine("  internal enum ClassId");
             EmitLine("  {");
             foreach (AmqpClass c in m_classes)
             {
@@ -840,7 +840,7 @@ public void EmitClassMethodImplementations(AmqpClass c)
 
         public void EmitMethodArgumentReader()
         {
-            EmitLine("    public override Client.Impl.MethodBase DecodeMethodFrom(Util.NetworkBinaryReader reader)");
+            EmitLine("    internal override Client.Impl.MethodBase DecodeMethodFrom(Util.NetworkBinaryReader reader)");
             EmitLine("    {");
             EmitLine("      ushort classId = reader.ReadUInt16();");
             EmitLine("      ushort methodId = reader.ReadUInt16();");
@@ -874,7 +874,7 @@ public void EmitMethodArgumentReader()
 
         public void EmitContentHeaderReader()
         {
-            EmitLine("    public override Client.Impl.ContentHeaderBase DecodeContentHeaderFrom(Util.NetworkBinaryReader reader)");
+            EmitLine("    internal override Client.Impl.ContentHeaderBase DecodeContentHeaderFrom(Util.NetworkBinaryReader reader)");
             EmitLine("    {");
             EmitLine("      ushort classId = reader.ReadUInt16();");
             EmitLine("");
@@ -1327,7 +1327,7 @@ string GetParameterString(ParameterInfo pi)
 
                 string implClass = MangleMethodClass(amqpClass, amqpMethod);
 
-                EmitLine($"        case (ClassConstants.{MangleConstant(amqpClass.Name)} << 16) | {MangleClass(amqpClass.Name)}MethodConstants.{MangleConstant(amqpMethod.Name)}: ");
+                EmitLine($"        case (ClassConstants.{MangleConstant(amqpClass.Name)} << 16) | {MangleClass(amqpClass.Name)}MethodConstants.{MangleConstant(amqpMethod.Name)}:");
                 EmitLine("        {");
                 ParameterInfo[] parameters = method.GetParameters();
                 if (parameters.Length > 0)

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

@@ -493,7 +493,7 @@ public IConnection CreateConnection(IEndpointResolver endpointResolver, string c
                 }
                 else
                 {
-                    IProtocol protocol = Protocols.DefaultProtocol;
+                    var protocol = new RabbitMQ.Client.Framing.Protocol();
                     conn = protocol.CreateConnection(this, false, endpointResolver.SelectOne(CreateFrameHandler), clientProvidedName);
                 }
             }

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

@@ -73,36 +73,5 @@ public interface IProtocol
         /// Retrieve the protocol's revision (if specified).
         /// </summary>
         int Revision { get; }
-
-        /// <summary>
-        /// Construct a connection from a given set of parameters,
-        /// a frame handler, and no automatic recovery.
-        /// The "insist" parameter is passed on to the AMQP connection.open method.
-        /// </summary>
-        IConnection CreateConnection(IConnectionFactory factory, bool insist, IFrameHandler frameHandler);
-
-        /// <summary>
-        /// Construct a connection from a given set of parameters,
-        /// a frame handler, and automatic recovery settings.
-        /// </summary>
-        IConnection CreateConnection(ConnectionFactory factory, IFrameHandler frameHandler, bool automaticRecoveryEnabled);
-
-        /// <summary>
-        /// Construct a connection from a given set of parameters,
-        /// a frame handler, a client-provided name, and no automatic recovery.
-        /// The "insist" parameter is passed on to the AMQP connection.open method.
-        /// </summary>
-        IConnection CreateConnection(IConnectionFactory factory, bool insist, IFrameHandler frameHandler, string clientProvidedName);
-
-        /// <summary>
-        /// Construct a connection from a given set of parameters,
-        /// a frame handler, a client-provided name, and automatic recovery settings.
-        /// </summary>
-        IConnection CreateConnection(ConnectionFactory factory, IFrameHandler frameHandler, bool automaticRecoveryEnabled, string clientProvidedName);
-
-        /// <summary>
-        /// Construct a protocol model atop a given session.
-        /// </summary>
-        IModel CreateModel(ISession session);
     }
 }

projects/client/RabbitMQ.Client/src/client/content/BasicMessageBuilder.cs

@@ -48,7 +48,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Framework for constructing various types of AMQP. Basic-class application messages.
     /// </summary>
-    public class BasicMessageBuilder : IMessageBuilder
+    class BasicMessageBuilder : IMessageBuilder
     {
         /// <summary>
         /// By default, new instances of BasicMessageBuilder and its subclasses will have this much initial buffer space.

projects/client/RabbitMQ.Client/src/client/content/BasicMessageReader.cs

@@ -48,7 +48,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Framework for analyzing various types of AMQP Basic-class application messages.
     /// </summary>
-    public class BasicMessageReader : IMessageReader
+    class BasicMessageReader : IMessageReader
     {
         protected NetworkBinaryReader m_reader;
         protected MemoryStream m_stream;

projects/client/RabbitMQ.Client/src/client/content/BytesMessageBuilder.cs

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Constructs AMQP Basic-class messages binary-compatible with QPid's "BytesMessage" wire encoding.
     /// </summary>
-    public class BytesMessageBuilder : BasicMessageBuilder, IBytesMessageBuilder
+    class BytesMessageBuilder : BasicMessageBuilder, IBytesMessageBuilder
     {
         /// <summary>
         /// MIME type associated with QPid BytesMessages.

projects/client/RabbitMQ.Client/src/client/content/BytesMessageReader.cs

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Analyzes AMQP Basic-class messages binary-compatible with QPid's "BytesMessage" wire encoding.
     /// </summary>
-    public class BytesMessageReader : BasicMessageReader, IBytesMessageReader
+    class BytesMessageReader : BasicMessageReader, IBytesMessageReader
     {
         /// <summary>
         /// MIME type associated with QPid BytesMessages.

projects/client/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs

@@ -49,7 +49,7 @@ namespace RabbitMQ.Client.Content
     /// Internal support class for use in reading and
     /// writing information binary-compatible with QPid's "BytesMessage" wire encoding.
     /// </summary>
-    public static class BytesWireFormatting
+    static class BytesWireFormatting
     {
         public static int Read(NetworkBinaryReader reader, byte[] target, int offset, int count)
         {

projects/client/RabbitMQ.Client/src/client/content/IBytesMessageBuilder.cs

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Interface for constructing messages binary-compatible with QPid's "BytesMessage" wire encoding.
     /// </summary>
-    public interface IBytesMessageBuilder : IMessageBuilder
+    interface IBytesMessageBuilder : IMessageBuilder
     {
         /// <summary>
         /// Write a section of a byte array into the message body being assembled.

projects/client/RabbitMQ.Client/src/client/content/IBytesMessageReader.cs

@@ -43,7 +43,7 @@ namespace RabbitMQ.Client.Content
     /// <summary>
     /// Analyzes messages binary-compatible with QPid's "BytesMessage" wire encoding.
     /// </summary>
-    public interface IBytesMessageReader : IMessageReader
+    interface IBytesMessageReader : IMessageReader
     {
         /// <summary>
         /// Reads a given number ("count") of bytes from the message body,