Merge pull request #331 from rabbitmq/rabbitmq-dotnet-client-330

Reintroduce a Uri property on ConnectionFactory.

Author: michaelklishin

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

@@ -145,7 +145,7 @@ public class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionFactory
         ///  Default SASL auth mechanisms to use.
         /// </summary>
         public static readonly IList<AuthMechanismFactory> DefaultAuthMechanisms =
-            new List<AuthMechanismFactory>(){ new PlainMechanismFactory() };
+            new List<AuthMechanismFactory>() { new PlainMechanismFactory() };
 
         /// <summary>
         ///  SASL auth mechanisms to use.
@@ -174,6 +174,9 @@ public class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionFactory
         private TimeSpan m_handshakeContinuationTimeout = TimeSpan.FromSeconds(10);
         private TimeSpan m_continuationTimeout = TimeSpan.FromSeconds(20);
 
+        // just here to hold the value that was set through the setter
+        private Uri uri;
+
         /// <summary>
         /// Amount of time protocol handshake operations are allowed to take before
         /// timing out.
@@ -311,6 +314,15 @@ public AmqpTcpEndpoint Endpoint
         /// </summary>
         public string VirtualHost { get; set; } = DefaultVHost;
 
+        /// <summary>
+        /// Username to use when authenticating to the server.
+        /// </summary>
+        public Uri Uri
+        {
+            get { return uri; }
+            set { SetUri(value); }
+        }
+
         /// <summary>
         /// Given a list of mechanism names supported by the server, select a preferred mechanism,
         ///  or null if we have none in common.
@@ -488,13 +500,13 @@ public IFrameHandler CreateFrameHandlerForHostname(string hostname)
         private IFrameHandler ConfigureFrameHandler(IFrameHandler fh)
         {
             // make sure socket timeouts are higher than heartbeat
-            fh.ReadTimeout  = Math.Max(SocketReadTimeout,  RequestedHeartbeat * 1000);
+            fh.ReadTimeout = Math.Max(SocketReadTimeout, RequestedHeartbeat * 1000);
             fh.WriteTimeout = Math.Max(SocketWriteTimeout, RequestedHeartbeat * 1000);
             // TODO: add user-provided configurator, like in the Java client
             return fh;
         }
 
-        public void SetUri(Uri uri)
+        private void SetUri(Uri uri)
         {
             Endpoint = new AmqpTcpEndpoint();
 
@@ -554,6 +566,8 @@ that has at least the path segment "/". */
             {
                 VirtualHost = UriDecode(uri.Segments[1]);
             }
+
+            this.uri = uri;
         }
 
         ///<summary>
@@ -564,7 +578,7 @@ private static string UriDecode(string uri)
             return System.Uri.UnescapeDataString(uri.Replace("+", "%2B"));
         }
 
-        private List<AmqpTcpEndpoint> LocalEndpoints ()
+        private List<AmqpTcpEndpoint> LocalEndpoints()
         {
             return new List<AmqpTcpEndpoint> { this.Endpoint };
         }

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

@@ -87,12 +87,10 @@ public interface IConnectionFactory
         /// </summary>
         string VirtualHost { get; set; }
 
-
-
         /// <summary>
-        /// Sets the AMQP Uri to be used for connections.
+        /// Sets or gets the AMQP Uri to be used for connections.
         /// </summary>
-        void SetUri(Uri uri);
+        Uri Uri { get; set; }
 
         /// <summary>
         /// Given a list of mechanism names supported by the server, select a preferred mechanism,

projects/client/Unit/src/unit/TestAmqpUri.cs

@@ -147,13 +147,13 @@ private static void AssertUriPartEquivalence(string user, string password, int p
         private void ParseFailWith<T>(string uri)
         {
             var cf = new ConnectionFactory();
-            Assert.That(() => cf.SetUri(new Uri(uri)), Throws.TypeOf<T>());
+            Assert.That(() => cf.Uri = new Uri(uri), Throws.TypeOf<T>());
         }
 
         private void ParseSuccess(string uri, string user, string password, string host, int port, string vhost)
         {
             var factory = new ConnectionFactory();
-            factory.SetUri(new Uri(uri));
+            factory.Uri = new Uri(uri);
             AssertUriPartEquivalence(user, password, port, vhost, factory);
             Assert.AreEqual(host, factory.HostName);
         }
@@ -162,7 +162,7 @@ private void ParseSuccess(string uri, string user, string password,
             string[] hosts, int port, string vhost)
         {
             var factory = new ConnectionFactory();
-            factory.SetUri(new Uri(uri));
+            factory.Uri = new Uri(uri);
             AssertUriPartEquivalence(user, password, port, vhost, factory);
             Assert.IsTrue((Array.IndexOf(hosts, factory.HostName)) != -1);
         }