[Service Bus] ConnectionString parsing cleanup (#10664)

[Service Bus] ConnectionString parsing cleanup

sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/Argument.cs

@@ -134,5 +134,26 @@ public static void AssertNotClosed(bool wasClosed, string targetName)
                     targetName);
             }
         }
+
+        /// <summary>
+        ///   Ensures that an argument's value is a well-formed Event Hubs fully qualified namespace value,
+        ///   throwing a <see cref="ArgumentException" /> if that invariant is not met.
+        /// </summary>
+        ///
+        /// <param name="argumentValue">The argument value.</param>
+        /// <param name="argumentName">Name of the argument.</param>
+        ///
+        ///
+        /// <exception cref="ArgumentException"><paramref name="argumentValue"/> is not a well-formed Service Bus fully qualified namespace.</exception>
+        ///
+        public static void AssertWellFormedServiceBusNamespace(string argumentValue, string argumentName)
+        {
+            argumentValue ??= string.Empty;
+
+            if (Uri.CheckHostName(argumentValue) == UriHostNameType.Unknown)
+            {
+                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Resources1.InvalidFullyQualifiedNamespace, argumentValue), argumentName);
+            }
+        }
     }
 }

sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/ConnectionStringParser.cs

@@ -115,7 +115,8 @@ public static ConnectionStringProperties Parse(string connectionString)
                     {
                         parsedValues.EndpointToken = new UriBuilder(value)
                         {
-                            Scheme = ServiceBusEndpointScheme
+                            Scheme = ServiceBusEndpointScheme,
+                            Port = -1
                         };
                     }
                     else if (string.Compare(EntityName, token, StringComparison.OrdinalIgnoreCase) == 0)

sdk/servicebus/Azure.Messaging.ServiceBus/src/Resources1.resx

@@ -153,7 +153,7 @@
   <data name="MissingConnectionInformation" xml:space="preserve">
     <value>The connection string used for an Service Bus entity client must specify the Service Bus namespace host, and a Shared Access Signature (both the name and value) to be valid. The path to an Service Bus entity must be included in the connection string or specified separately.</value>
   </data>
-  <data name="OnlyOneEventHubNameMayBeSpecified" xml:space="preserve">
+  <data name="OnlyOneEntityNameMayBeSpecified" xml:space="preserve">
     <value>The path to an Service Bus entity may be specified as part of the connection string or as a separate value, but not both.</value>
   </data>
   <data name="UnknownConnectionType" xml:space="preserve">
@@ -225,7 +225,7 @@
   <data name="CannotStartEventProcessorWithoutHandler" xml:space="preserve">
     <value>Cannot begin processing without {0} handler set.</value>
   </data>
-  <data name="RunningMessageProcessor" xml:space="preserve">
+  <data name="RunningMessageProcessorCannotPerformOperation" xml:space="preserve">
     <value>The message processor is already running and needs to be stopped in order to perform this operation.</value>
   </data>
   <data name="ClientNeededForThisInformation" xml:space="preserve">
@@ -270,4 +270,7 @@
   <data name="MaxPermittedLength" xml:space="preserve">
     <value>Maximum permitted length is {0}</value>
   </data>
-</root>
+  <data name="InvalidFullyQualifiedNamespace" xml:space="preserve">
+    <value>The value '{0}' is not a well-formed Service Bus fully qualified namespace.</value>
+  </data>
+</root>