* Make IConnectionFactory.Uri non-nullable.

Author: lukebakken

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

@@ -34,7 +34,6 @@
 using System.Linq;
 using System.Net.Security;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Security.Authentication;
 using System.Text;
 using System.Threading;
@@ -197,7 +196,6 @@ public sealed class ConnectionFactory : ConnectionFactoryBase, IConnectionFactor
         private TimeSpan _continuationTimeout = TimeSpan.FromSeconds(20);
 
         // just here to hold the value that was set through the setter
-        private Uri? _uri;
         private string? _clientProvidedName;
 
         /// <summary>
@@ -360,9 +358,9 @@ public AmqpTcpEndpoint Endpoint
         /// <summary>
         /// The uri to use for the connection.
         /// </summary>
-        public Uri? Uri
+        public Uri Uri
         {
-            get { return _uri; }
+            get { return GetUri(); }
             set { SetUri(value); }
         }
 
@@ -644,14 +642,50 @@ private IFrameHandler ConfigureFrameHandler(IFrameHandler fh)
             return fh;
         }
 
-        private void SetUri(Uri? uri)
+        private Uri GetUri()
         {
-            if (uri is null)
+            var builder = new UriBuilder();
+
+            if (Ssl.Enabled)
+            {
+                builder.Scheme = "amqps";
+            }
+            else
+            {
+                builder.Scheme = "amqp";
+            }
+
+            builder.Host = HostName;
+
+            if (Port == AmqpTcpEndpoint.UseDefaultPort)
+            {
+                builder.Port = 5672;
+            }
+            else
+            {
+                builder.Port = Port;
+            }
+
+            if (false == string.IsNullOrEmpty(UserName))
             {
-                _uri = uri;
-                return;
+                builder.UserName = UserName;
             }
 
+            if (false == string.IsNullOrEmpty(Password))
+            {
+                builder.Password = Password;
+            }
+
+            if (false == string.IsNullOrEmpty(VirtualHost))
+            {
+                builder.Path = Uri.EscapeDataString(VirtualHost);
+            }
+
+            return builder.Uri;
+        }
+
+        private void SetUri(Uri uri)
+        {
             Endpoint = new AmqpTcpEndpoint();
 
             if (string.Equals("amqp", uri.Scheme, StringComparison.OrdinalIgnoreCase))
@@ -669,11 +703,13 @@ private void SetUri(Uri? uri)
             {
                 throw new ArgumentException($"Wrong scheme in AMQP URI: {uri.Scheme}");
             }
+
             string host = uri.Host;
             if (!string.IsNullOrEmpty(host))
             {
                 HostName = host;
             }
+
             Ssl.ServerName = HostName;
 
             int port = uri.Port;
@@ -703,20 +739,19 @@ that has at least the path segment "/". */
             {
                 throw new ArgumentException($"Multiple segments in path of AMQP URI: {string.Join(", ", uri.Segments)}");
             }
+
             if (uri.Segments.Length == 2)
             {
                 VirtualHost = UriDecode(uri.Segments[1]);
             }
-
-            _uri = uri;
         }
 
         ///<summary>
         /// Unescape a string, protecting '+'.
         /// </summary>
         private static string UriDecode(string uri)
         {
-            return System.Uri.UnescapeDataString(uri.Replace("+", "%2B"));
+            return Uri.UnescapeDataString(uri.Replace("+", "%2B"));
         }
 
         private List<AmqpTcpEndpoint> LocalEndpoints()

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

@@ -85,7 +85,7 @@ public interface IConnectionFactory
         /// <summary>
         /// Sets or gets the AMQP Uri to be used for connections.
         /// </summary>
-        Uri? Uri { get; set; }
+        Uri Uri { get; set; }
 
         /// <summary>
         /// Default client provided name to be used for connections.