core: Apply code review suggestions

Author: HofmeisterAn

src/Testcontainers.Mosquitto/MosquittoContainer.cs

@@ -17,47 +17,59 @@ public MosquittoContainer(MosquittoConfiguration configuration)
     }
 
     /// <summary>
-    /// Gets the MQTT endpoint.
+    /// Gets the MQTT port.
     /// </summary>
-    /// <returns>An MQTT address in the format: <c>mqtt://hostname:port</c>.</returns>
-    public string GetEndpoint()
+    public ushort MqttPort => GetMappedPublicPort(MosquittoBuilder.MqttPort);
+
+    /// <summary>
+    /// Gets the secure MQTT port.
+    /// </summary>
+    public ushort MqttTlsPort => GetMappedPublicPort(MosquittoBuilder.MqttTlsPort);
+
+    /// <summary>
+    /// Gets the MQTT connection string.
+    /// </summary>
+    /// <returns>An MQTT connection string in the format: <c>mqtt://hostname:port</c>.</returns>
+    public string GetConnectionString()
     {
-        return new UriBuilder("mqtt", Hostname, GetMappedPublicPort(MosquittoBuilder.MqttPort)).ToString();
+        return new UriBuilder("mqtt", Hostname, MqttPort).ToString();
     }
 
     /// <summary>
-    /// Gets the secure MQTT endpoint.
+    /// Gets the secure MQTT connection string.
     /// </summary>
-    /// <returns>A secure MQTT address in the format: <c>mqtts://hostname:port</c>.</returns>
-    public string GetSecureEndpoint()
+    /// <returns>A secure MQTT connection string in the format: <c>mqtts://hostname:port</c>.</returns>
+    /// <exception cref="InvalidOperationException">TLS/SSL support is not enabled in the container configuration.</exception>
+    public string GetSecureConnectionString()
     {
         ThrowIfTlsNotEnabled();
-        return new UriBuilder("mqtts", Hostname, GetMappedPublicPort(MosquittoBuilder.MqttTlsPort)).ToString();
+        return new UriBuilder("mqtts", Hostname, MqttTlsPort).ToString();
     }
 
     /// <summary>
-    /// Gets the WebSocket endpoint.
+    /// Gets the MQTT over WebSocket connection string.
     /// </summary>
-    /// <returns>A WS address in the format: <c>ws://hostname:port</c>.</returns>
-    public string GetWsEndpoint()
+    /// <returns>A WebSocket connection string in the format: <c>ws://hostname:port</c>.</returns>
+    public string GetWsConnectionString()
     {
         return new UriBuilder("ws", Hostname, GetMappedPublicPort(MosquittoBuilder.MqttWsPort)).ToString();
     }
 
     /// <summary>
-    /// Gets the secure WebSocket endpoint.
+    /// Gets the secure MQTT over WebSocket connection string.
     /// </summary>
-    /// <returns>A secure WS address in the format: <c>wss://hostname:port</c>.</returns>
-    public string GetWssEndpoint()
+    /// <returns>A secure WebSocket connection string in the format: <c>wss://hostname:port</c>.</returns>
+    /// <exception cref="InvalidOperationException">TLS/SSL support is not enabled in the container configuration.</exception>
+    public string GetWssConnectionString()
     {
         ThrowIfTlsNotEnabled();
         return new UriBuilder("wss", Hostname, GetMappedPublicPort(MosquittoBuilder.MqttWssPort)).ToString();
     }
 
     /// <summary>
-    /// Throws <see cref="InvalidOperationException" /> when TLS/SSL is not enabled in the configuration.
+    /// Throws <see cref="InvalidOperationException" /> when TLS/SSL support is not enabled in the container configuration.
     /// </summary>
-    /// <exception cref="InvalidOperationException">TLS/SSL is not enabled in the configuration.</exception>
+    /// <exception cref="InvalidOperationException">TLS/SSL support is not enabled in the container configuration.</exception>
     private void ThrowIfTlsNotEnabled()
     {
         if (!_configuration.TlsEnabled)

tests/Testcontainers.Mosquitto.Tests/MosquittoContainerTest.cs

@@ -78,7 +78,7 @@ public sealed class TcpUnencryptedUnauthenticatedConfiguration(ITestOutputHelper
         protected override MqttClientOptions GetClientOptions()
         {
             return new MqttClientOptionsBuilder()
-                .WithTcpServer(Container.Hostname, Container.GetMappedPublicPort(MosquittoBuilder.MqttPort))
+                .WithTcpServer(Container.Hostname, Container.MqttPort)
                 .Build();
         }
     }
@@ -95,7 +95,7 @@ protected override MosquittoBuilder Configure(MosquittoBuilder builder)
         protected override MqttClientOptions GetClientOptions()
         {
             return new MqttClientOptionsBuilder()
-                .WithTcpServer(Container.Hostname, Container.GetMappedPublicPort(MosquittoBuilder.MqttTlsPort))
+                .WithTcpServer(Container.Hostname, Container.MqttTlsPort)
                 .WithTlsOptions(options => options.WithCertificateValidationHandler(e =>
                     "CN=Test CA".Equals(e.Certificate.Issuer, StringComparison.Ordinal)))
                 .Build();
@@ -109,7 +109,7 @@ public sealed class WebSocketUnencryptedUnauthenticatedConfiguration(ITestOutput
         protected override MqttClientOptions GetClientOptions()
         {
             return new MqttClientOptionsBuilder()
-                .WithWebSocketServer(options => options.WithUri(Container.GetWsEndpoint()))
+                .WithWebSocketServer(options => options.WithUri(Container.GetWsConnectionString()))
                 .Build();
         }
     }
@@ -126,7 +126,7 @@ protected override MosquittoBuilder Configure(MosquittoBuilder builder)
         protected override MqttClientOptions GetClientOptions()
         {
             return new MqttClientOptionsBuilder()
-                .WithWebSocketServer(options => options.WithUri(Container.GetWssEndpoint()))
+                .WithWebSocketServer(options => options.WithUri(Container.GetWssConnectionString()))
                 .WithTlsOptions(options => options.WithCertificateValidationHandler(e =>
                     "CN=Test CA".Equals(e.Certificate.Issuer, StringComparison.Ordinal)))
                 .Build();