Use with syntax to clone

nats-io · Sep 25, 2024 · 1b590c1 · 1b590c1
1 parent 419cf3f
commit 1b590c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/src/NATS.Client.JetStream/Models/StreamConfig.cs b/src/NATS.Client.JetStream/Models/StreamConfig.cs
@@ -245,12 +245,4 @@ internal StreamConfig()
     [System.Text.Json.Serialization.JsonPropertyName("metadata")]
     [System.Text.Json.Serialization.JsonIgnore(Condition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingDefault)]
     public IDictionary<string, string>? Metadata { get; set; }
-
-    /// <summary>
-    /// Creates a shallow copy of the current StreamConfig instance using the MemberwiseClone method.
-    /// </summary>
-    /// <return>
-    /// A shallow copy of the current StreamConfig.
-    /// </return>
-    public StreamConfig ShallowCopy() => (StreamConfig)MemberwiseClone();
 }
diff --git a/src/NATS.Client.JetStream/Models/StreamSource.cs b/src/NATS.Client.JetStream/Models/StreamSource.cs
@@ -63,12 +63,4 @@ public record StreamSource
     /// </summary>
     [System.Text.Json.Serialization.JsonIgnore]
     public string? Domain { get; set; }
-
-    /// <summary>
-    /// Creates a shallow copy of the current StreamSource instance using the MemberwiseClone method.
-    /// </summary>
-    /// <return>
-    /// A shallow copy of the current StreamSource.
-    /// </return>
-    public StreamSource ShallowCopy() => (StreamSource)MemberwiseClone();
 }
diff --git a/src/NATS.Client.JetStream/NatsJSContext.Streams.cs b/src/NATS.Client.JetStream/NatsJSContext.Streams.cs
@@ -22,12 +22,12 @@ public async ValueTask<INatsJSStream> CreateStreamAsync(
         ThrowIfInvalidStreamName(config.Name, nameof(config.Name));
 
         // keep caller's config intact.
-        config = config.ShallowCopy();
+        config = config with { };
 
         // If we have a mirror and an external domain, convert to ext.APIPrefix.
         if (config.Mirror != null && !string.IsNullOrEmpty(config.Mirror.Domain))
         {
-            config.Mirror = config.Mirror.ShallowCopy();
+            config.Mirror = config.Mirror with { };
             ConvertDomain(config.Mirror);
         }
 
@@ -39,7 +39,7 @@ public async ValueTask<INatsJSStream> CreateStreamAsync(
             {
                 if (!string.IsNullOrEmpty(ss.Domain))
                 {
-                    var remappedDomainSource = ss.ShallowCopy();
+                    var remappedDomainSource = ss with { };
                     ConvertDomain(remappedDomainSource);
                     sources.Add(remappedDomainSource);
                 }

diff --git a/src/NATS.Client.KeyValueStore/NatsKVContext.cs b/src/NATS.Client.KeyValueStore/NatsKVContext.cs
@@ -207,10 +207,12 @@ private static StreamConfig CreateStreamConfig(NatsKVConfig config)
 
         if (config.Mirror != null)
         {
-            mirror = config.Mirror.ShallowCopy();
-            mirror.Name = config.Mirror.Name.StartsWith(KvStreamNamePrefix)
-                ? config.Mirror.Name
-                : BucketToStream(config.Mirror.Name);
+            mirror = config.Mirror with
+            {
+                Name = config.Mirror.Name.StartsWith(KvStreamNamePrefix)
+                    ? config.Mirror.Name
+                    : BucketToStream(config.Mirror.Name),
+            };
             mirrorDirect = true;
             subjects = default;
             sources = default;