Following the java client, make the default properties visible to applications

Author: tonyg

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

@@ -144,9 +144,9 @@ public class ConnectionFactory
         /// <summary>Heartbeat setting to request (in seconds)</summary>
         public ushort RequestedHeartbeat = DefaultHeartbeat;
 
-        /// <summary>Dictionary of extra client properties to be sent to the
+        /// <summary>Dictionary of client properties to be sent to the
         /// server</summary>
-        public IDictionary ClientProperties = DefaultClientProperties;
+        public IDictionary ClientProperties = ConnectionBase.DefaultClientProperties();
 
         ///<summary>Ssl options setting</summary>
         public SslOption Ssl = new SslOption();
@@ -161,16 +161,6 @@ public class ConnectionFactory
         ///<summary>The AMQP protocol to be used</summary>
         public IProtocol Protocol = Protocols.FromEnvironment();
 
-        /// <summary>Default value for extra client properties to be sent to
-        /// the server (value: empty Hashtable)</summary>
-        public static IDictionary DefaultClientProperties
-        {
-            get
-            {
-                return new Hashtable(); // PLEASE KEEP THIS MATCHING THE DOC ABOVE
-            }
-        }
-
         public AmqpTcpEndpoint Endpoint
         { 
           get

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

@@ -922,8 +922,7 @@ public void OnCallbackException(CallbackExceptionEventArgs args)
             }
         }
 
-        private static IDictionary BuildClientPropertiesTable(
-                IDictionary extraClientProperties)
+        public static IDictionary DefaultClientProperties()
         {
             System.Reflection.Assembly assembly =
                     System.Reflection.Assembly.GetAssembly(typeof(ConnectionBase));
@@ -938,10 +937,6 @@ private static IDictionary BuildClientPropertiesTable(
                                                         "and Rabbit Technologies Ltd.");
             table["information"] = Encoding.UTF8.GetBytes("Licensed under the MPL.  " +
                                                           "See http://www.rabbitmq.com/");
-
-            foreach(DictionaryEntry de in extraClientProperties)
-                table[de.Key] = de.Value;
-
             return table;
         }
 
@@ -988,7 +983,7 @@ public void Open(bool insist)
                                                            serverVersion.Minor);
             }
 
-            m_clientProperties = BuildClientPropertiesTable(m_factory.ClientProperties);
+            m_clientProperties = new Hashtable(m_factory.ClientProperties);
 
             // FIXME: check that PLAIN is supported.
             // FIXME: parse out locales properly!