Merge pull request #7291 from Particular/code-analysis-cleanup-9.2

Code analysis cleanup 9.2
Particular · Feb 12, 2025 · 1a672a1 · 1a672a1
2 parents 902e7a3 + 4b481f0
commit 1a672a1
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 35 deletions.
diff --git a/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs b/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs
@@ -636,19 +636,19 @@ public void TestInterfaces()
             };
             o.Foos = new Dictionary<string, List<Foo>>
             {
-                ["foo1"] = new List<Foo>(new[]
-            {
-                new Foo
-                {
-                    Name = "1",
-                    Title = "1"
-                },
-                new Foo
-                {
-                    Name = "2",
-                    Title = "2"
-                }
-            })
+                ["foo1"] = new List<Foo>(
+                    [
+                        new Foo
+                        {
+                            Name = "1",
+                            Title = "1"
+                        },
+                        new Foo
+                        {
+                            Name = "2",
+                            Title = "2"
+                        }
+                    ])
             };
             o.Data =
             [

diff --git a/src/NServiceBus.Core/Features/Feature.cs b/src/NServiceBus.Core/Features/Feature.cs
@@ -125,7 +125,7 @@ protected void DependsOnAtLeastOne(params Type[] features)
             }
         }
 
-        Dependencies.Add(new List<string>(features.Select(GetFeatureName)));
+        Dependencies.Add(features.Select(GetFeatureName).ToList());
     }
 
     /// <summary>
@@ -173,7 +173,7 @@ protected void DependsOnAtLeastOne(params string[] featureNames)
     {
         ArgumentNullException.ThrowIfNull(featureNames);
 
-        Dependencies.Add(new List<string>(featureNames));
+        Dependencies.Add([.. featureNames]);
     }
 
     /// <summary>

diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
@@ -67,7 +67,7 @@ static string RemoveExtension(string assemblyName) =>
 
     internal IReadOnlyCollection<Type> TypesToSkip
     {
-        set => typesToSkip = new HashSet<Type>(value);
+        set => typesToSkip = [.. value];
     }
 
     internal string AdditionalAssemblyScanningPath { get; set; }

diff --git a/src/NServiceBus.Core/OpenTelemetry/Tracing/ActivityExtensions.cs b/src/NServiceBus.Core/OpenTelemetry/Tracing/ActivityExtensions.cs
@@ -1,7 +1,6 @@
 namespace NServiceBus;
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Extensibility;
@@ -38,13 +37,13 @@ public static void SetErrorStatus(this Activity activity, Exception ex)
         activity.SetTag("otel.status_code", "ERROR");
         activity.SetTag("otel.status_description", ex.Message);
         activity.AddEvent(new ActivityEvent("exception", DateTimeOffset.UtcNow,
-            new ActivityTagsCollection(new[]
+            new ActivityTagsCollection
             {
-                new KeyValuePair<string, object>("exception.escaped", true),
-                new KeyValuePair<string, object>("exception.type", ex.GetType()),
-                new KeyValuePair<string, object>("exception.message", ex.Message),
-                new KeyValuePair<string, object>("exception.stacktrace", ex.ToString()),
-            })));
+                { "exception.escaped", true },
+                { "exception.type", ex.GetType() },
+                { "exception.message", ex.Message },
+                { "exception.stacktrace", ex.ToString() }
+            }));
 
         if (ex is TaskCanceledException)
         {

diff --git a/src/NServiceBus.Core/Recoverability/IRecoverabilityActionContext.cs b/src/NServiceBus.Core/Recoverability/IRecoverabilityActionContext.cs
@@ -12,27 +12,27 @@ public interface IRecoverabilityActionContext : IBehaviorContext
     /// <summary>
     /// The message that failed processing.
     /// </summary>
-    public IncomingMessage FailedMessage { get; }
+    IncomingMessage FailedMessage { get; }
 
     /// <summary>
     /// The exception that caused processing to fail.
     /// </summary>
-    public Exception Exception { get; }
+    Exception Exception { get; }
 
     /// <summary>
     /// The receive address where this message failed.
     /// </summary>
-    public string ReceiveAddress { get; }
+    string ReceiveAddress { get; }
 
     /// <summary>
     /// The number of times the message have been retried immediately but failed.
     /// </summary>
-    public int ImmediateProcessingFailures { get; }
+    int ImmediateProcessingFailures { get; }
 
     /// <summary>
     /// Number of delayed deliveries performed so far.
     /// </summary>
-    public int DelayedDeliveriesPerformed { get; }
+    int DelayedDeliveriesPerformed { get; }
 
     /// <summary>
     /// Metadata for this message.

diff --git a/src/NServiceBus.Core/Recoverability/IRecoverabilityContext.cs b/src/NServiceBus.Core/Recoverability/IRecoverabilityContext.cs
@@ -12,32 +12,32 @@ public interface IRecoverabilityContext : IBehaviorContext
     /// <summary>
     /// The message that failed processing.
     /// </summary>
-    public IncomingMessage FailedMessage { get; }
+    IncomingMessage FailedMessage { get; }
 
     /// <summary>
     /// The exception that caused processing to fail.
     /// </summary>
-    public Exception Exception { get; }
+    Exception Exception { get; }
 
     /// <summary>
     /// The receive address where this message failed.
     /// </summary>
-    public string ReceiveAddress { get; }
+    string ReceiveAddress { get; }
 
     /// <summary>
     /// The number of times the message have been retried immediately but failed.
     /// </summary>
-    public int ImmediateProcessingFailures { get; }
+    int ImmediateProcessingFailures { get; }
 
     /// <summary>
     /// Number of delayed deliveries performed so far.
     /// </summary>
-    public int DelayedDeliveriesPerformed { get; }
+    int DelayedDeliveriesPerformed { get; }
 
     /// <summary>
     /// The recoverability configuration for the endpoint.
     /// </summary>
-    public RecoverabilityConfig RecoverabilityConfiguration { get; }
+    RecoverabilityConfig RecoverabilityConfiguration { get; }
 
     /// <summary>
     /// The recoverability action to take for this message.

diff --git a/src/NServiceBus.Core/Recoverability/RecoverabilityComponent.cs b/src/NServiceBus.Core/Recoverability/RecoverabilityComponent.cs
@@ -80,7 +80,7 @@ public IRecoverabilityPipelineExecutor CreateRecoverabilityPipelineExecutor(
         if (!settings.TryGet(PolicyOverride, out Func<RecoverabilityConfig, ErrorContext, RecoverabilityAction> policy))
         {
             policy = (config, context) => DefaultRecoverabilityPolicy.Invoke(config, context);
-        };
+        }
 
         return new RecoverabilityPipelineExecutor<(RecoverabilityComponent,
             Func<RecoverabilityConfig, ErrorContext, RecoverabilityAction>)>(