Protocol-specific connection opening using subclass instead of condition

Author: Emile Joubert

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

@@ -971,15 +971,18 @@ private static uint NegotiatedMaxValue(uint clientValue, uint serverValue)
                 Math.Min(clientValue, serverValue);
         }
 
-        public void Open(bool insist)
+        /// <summary>
+        /// Connection opening, common to all supported protocol versions
+        /// </summary>
+        protected void OpenCommon()
         {
             BlockingCell connectionStartCell = new BlockingCell();
             m_model0.m_connectionStartCell = connectionStartCell;
             m_frameHandler.Timeout = HandshakeTimeout;
             m_frameHandler.SendHeader();
 
             ConnectionStartDetails connectionStart = (ConnectionStartDetails)
-                connectionStartCell.Value;
+                                                     connectionStartCell.Value;
 
             ServerProperties = connectionStart.m_serverProperties;
 
@@ -1002,13 +1005,13 @@ public void Open(bool insist)
             ConnectionTuneDetails connectionTune = default(ConnectionTuneDetails);
             try
             {
-                connectionTune = 
-                m_model0.ConnectionStartOk(m_clientProperties,
-                                           "PLAIN",
-                                           Encoding.UTF8.GetBytes(
-                                               "\0" + m_factory.UserName +
-                                               "\0" + m_factory.Password),
-                                           "en_US");
+                connectionTune =
+                    m_model0.ConnectionStartOk(m_clientProperties,
+                                               "PLAIN",
+                                               Encoding.UTF8.GetBytes(
+                                                   "\0" + m_factory.UserName +
+                                                   "\0" + m_factory.Password),
+                                               "en_US");
             }
             catch (OperationInterruptedException e)
             {
@@ -1031,18 +1034,15 @@ public void Open(bool insist)
             m_model0.ConnectionTuneOk(channelMax,
                                       frameMax,
                                       heartbeat);
+        }
 
-            if (Protocol.SupportsRedirect)
-            {
-                string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
-                                                            "", // FIXME: make configurable?
-                                                            insist);
-                KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
-            }
-            else
-            {
-                m_model0.ConnectionOpen(m_factory.VirtualHost, String.Empty, false);
-            }
+        public virtual void Open(bool insist)
+        {
+            OpenCommon();
+            string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
+                                                        "", // FIXME: make configurable?
+                                                        insist);
+            KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
         }
 
         public override string ToString()

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

@@ -61,5 +61,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9_1 {
     public class Connection: ConnectionBase {
         public Connection(ConnectionFactory factory, bool insist, IFrameHandler frameHandler)
             : base(factory, insist, frameHandler) {}
+
+        public override void Open(bool insist)
+        {
+            OpenCommon();
+            m_model0.ConnectionOpen(m_factory.VirtualHost, String.Empty, false);
+        }
+
     }
 }