Remove Address

src/Aspire.Hosting.Nats/NatsServerResource.cs

@@ -1,14 +1,17 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// A resource that represents a NATS server container.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 
-public class NatsServerResource(string name) : ContainerResource(PassThroughNonNull(name)), IResourceWithConnectionString
+public class NatsServerResource(string name) : ContainerResource(ThrowIfNull(name)), IResourceWithConnectionString
 {
     internal const string PrimaryEndpointName = "tcp";
     internal const string PrimaryNatsSchemeName = "nats";
@@ -27,9 +30,6 @@ public class NatsServerResource(string name) : ContainerResource(PassThroughNonN
         ReferenceExpression.Create(
             $"{PrimaryNatsSchemeName}://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}");
 
-    private static string PassThroughNonNull(string name)
-    {
-        ArgumentNullException.ThrowIfNull(name);
-        return name;
-    }
+    private static string ThrowIfNull([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+        => argument ?? throw new ArgumentNullException(paramName);
 }

tests/Aspire.Hosting.Nats.Tests/NatsPublicApiTests.cs

@@ -9,8 +9,6 @@ namespace Aspire.Hosting.Nats.Tests;
 
 public class NatsPublicApiTests
 {
-    #region NatsBuilderExtensions
-
     [Fact]
     public void AddNatsContainerShouldThrowWhenBuilderIsNull()
     {
@@ -82,10 +80,6 @@ public void WithDataBindMountShouldThrowWhenSourceIsNull()
         Assert.Equal(nameof(source), exception.ParamName);
     }
 
-    #endregion
-
-    #region NatsServerResource
-
     [Fact]
     public void CtorNatsServerResourceShouldThrowWhenNameIsNull()
     {
@@ -96,6 +90,4 @@ public void CtorNatsServerResourceShouldThrowWhenNameIsNull()
         var exception = Assert.Throws<ArgumentNullException>(action);
         Assert.Equal(nameof(name), exception.ParamName);
     }
-
-    #endregion
 }