Change the connection string parser inside the ConnectionSettings class to prevent reinventing the wheel (#102)

* Simplify endpoint extraction in ConnectionSettings

* fix using in DocumentFilter file.

* Corrected the assignment of the Endpoint and FullyQualifiedNamespace properties in the ConnectionSettings class.

* Optimize parsing of connection string in ConnectionSettings constructor.

* Ensure connection string starts with 'Endpoint=' in ConnectionSettings

* Restoring two constructors in ConnectionSettings

Author: DigitalMushrooms

src/Ev.ServiceBus.Abstractions/Configuration/ClientOptions.cs

@@ -1,5 +1,7 @@
 // ReSharper disable once CheckNamespace
 
+using Ev.ServiceBus.Abstractions.Configuration;
+
 namespace Ev.ServiceBus.Abstractions;
 
 public abstract class ClientOptions : IClientOptions

src/Ev.ServiceBus.Abstractions/Configuration/ConnectionSettings.cs

@@ -1,24 +1,31 @@
-using Azure.Core;
-using Azure.Messaging.ServiceBus;
 using System;
+using Azure.Messaging.ServiceBus;
+using Azure.Core;
 
-namespace Ev.ServiceBus.Abstractions;
+namespace Ev.ServiceBus.Abstractions.Configuration;
 
 public class ConnectionSettings
 {
     internal ConnectionSettings(string connectionString, ServiceBusClientOptions options)
     {
         ConnectionString = connectionString;
         Options = options;
-        Endpoint = GetEndpointFromConnectionString(connectionString);
+        Endpoint = ServiceBusConnectionStringProperties.Parse(connectionString).Endpoint.AbsoluteUri;
     }
 
     internal ConnectionSettings(string fullyQualifiedNamespace, TokenCredential credentials, ServiceBusClientOptions options)
     {
+        if (!fullyQualifiedNamespace.StartsWith("Endpoint=", StringComparison.OrdinalIgnoreCase))
+        {
+            fullyQualifiedNamespace = $"Endpoint={fullyQualifiedNamespace}";
+        }
+
+        var connectionStringProperties = ServiceBusConnectionStringProperties.Parse(fullyQualifiedNamespace);
+
         Options = options;
-        FullyQualifiedNamespace = fullyQualifiedNamespace;
+        FullyQualifiedNamespace = connectionStringProperties.FullyQualifiedNamespace;
         Credentials = credentials;
-        Endpoint = GetEndpointFromFullyQualifiedNamespace(fullyQualifiedNamespace);
+        Endpoint = connectionStringProperties.Endpoint.AbsoluteUri;
     }
 
     public string Endpoint { get; }
@@ -31,38 +38,6 @@ internal ConnectionSettings(string fullyQualifiedNamespace, TokenCredential cred
 
     public TokenCredential? Credentials { get; }
 
-    private string GetEndpointFromConnectionString(string connectionString)
-    {
-        var KeyValuePairDelimiter = ';';
-        var KeyValueSeparator = '=';
-        var EndpointConfigName = "Endpoint";
-
-        // First split based on ';'
-        var keyValuePairs = connectionString.Split(new[] { KeyValuePairDelimiter }, StringSplitOptions.RemoveEmptyEntries);
-        foreach (var keyValuePair in keyValuePairs)
-        {
-            // Now split based on the _first_ '='
-            var keyAndValue = keyValuePair.Split(new[] { KeyValueSeparator }, 2);
-            var key = keyAndValue[0];
-            if (keyAndValue.Length != 2)
-            {
-                return string.Empty;
-            }
-
-            var value = keyAndValue[1].Trim();
-            if (key.Equals(EndpointConfigName, StringComparison.OrdinalIgnoreCase))
-            {
-                return value;
-            }
-        }
-        return string.Empty;
-    }
-
-    private string GetEndpointFromFullyQualifiedNamespace(string fullyQualifiedNamespace)
-    {
-        return $"sb://{fullyQualifiedNamespace}/";
-    }
-
     private bool Equals(ConnectionSettings other) =>
         string.Equals(Endpoint, other.Endpoint, StringComparison.Ordinal)
         && string.Equals(ConnectionString, other.ConnectionString, StringComparison.Ordinal)

src/Ev.ServiceBus.Abstractions/Configuration/Extensions/ClientOptionsExtensions.cs

@@ -1,5 +1,6 @@
 using Azure.Core;
 using Azure.Messaging.ServiceBus;
+using Ev.ServiceBus.Abstractions.Configuration;
 
 // ReSharper disable once CheckNamespace
 namespace Ev.ServiceBus.Abstractions;

src/Ev.ServiceBus.Abstractions/Configuration/IClientOptions.cs

@@ -1,4 +1,7 @@
 // ReSharper disable once CheckNamespace
+
+using Ev.ServiceBus.Abstractions.Configuration;
+
 namespace Ev.ServiceBus.Abstractions;
 
 public interface IClientOptions

src/Ev.ServiceBus.Abstractions/Configuration/ServiceBusSettings.cs

@@ -1,5 +1,6 @@
 using Azure.Core;
 using Azure.Messaging.ServiceBus;
+using Ev.ServiceBus.Abstractions.Configuration;
 
 namespace Ev.ServiceBus.Abstractions;
 

src/Ev.ServiceBus.AsyncApi/DocumentFilter.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Encodings.Web;
-using System.Text.Json;
 using Ev.ServiceBus.Abstractions;
+using Ev.ServiceBus.Abstractions.Configuration;
 using Microsoft.Extensions.Options;
-using Microsoft.VisualBasic;
 using NJsonSchema;
 using Saunter.AsyncApiSchema.v2;
 using Saunter.AsyncApiSchema.v2.Bindings;
@@ -117,7 +115,7 @@ private Operation CreatePublishOperation(string channelName, ClientOptions optio
 
     private IMessage GenerateMessage(string payloadTypeId, Type payloadType, DocumentFilterContext context, AsyncApiSchemaResolver asyncApiSchemaResolver)
     {
-        var message = new Saunter.AsyncApiSchema.v2.Message()
+        var message = new Message()
         {
             Name = payloadTypeId.Replace("/", "¤"),
             Payload = GetOrCreatePayloadSchema(payloadType, context),

src/Ev.ServiceBus.HealthChecks/ConnectionSettingsComparer.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Ev.ServiceBus.Abstractions;
+using Ev.ServiceBus.Abstractions.Configuration;
 
 namespace Ev.ServiceBus.HealthChecks;
 

src/Ev.ServiceBus/Management/Factories/ClientFactory.cs

@@ -1,6 +1,6 @@
 using System;
 using Azure.Messaging.ServiceBus;
-using Ev.ServiceBus.Abstractions;
+using Ev.ServiceBus.Abstractions.Configuration;
 
 namespace Ev.ServiceBus;
 

src/Ev.ServiceBus/Management/Factories/IClientFactory.cs

@@ -1,5 +1,5 @@
 using Azure.Messaging.ServiceBus;
-using Ev.ServiceBus.Abstractions;
+using Ev.ServiceBus.Abstractions.Configuration;
 
 // ReSharper disable once CheckNamespace
 namespace Ev.ServiceBus;

src/Ev.ServiceBus/Management/ServiceBusRegistry.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using Azure.Messaging.ServiceBus;
 using Ev.ServiceBus.Abstractions;
+using Ev.ServiceBus.Abstractions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace Ev.ServiceBus.Management;