Use collection initializers and spreads everywhere

Author: commonsensesoftware

src/Abstractions/src/Asp.Versioning.Abstractions/AmbiguousApiVersionException.cs

@@ -12,22 +12,22 @@ public partial class AmbiguousApiVersionException : Exception
     /// <summary>
     /// Initializes a new instance of the <see cref="AmbiguousApiVersionException"/> class.
     /// </summary>
-    public AmbiguousApiVersionException() => apiVersions = Array.Empty<string>();
+    public AmbiguousApiVersionException() => apiVersions = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AmbiguousApiVersionException"/> class.
     /// </summary>
     /// <param name="message">The associated error message.</param>
     public AmbiguousApiVersionException( string message )
-        : base( message ) => apiVersions = Array.Empty<string>();
+        : base( message ) => apiVersions = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AmbiguousApiVersionException"/> class.
     /// </summary>
     /// <param name="message">The associated error message.</param>
     /// <param name="innerException">The inner <see cref="Exception">exception</see> that caused the current exception, if any.</param>
     public AmbiguousApiVersionException( string message, Exception innerException )
-        : base( message, innerException ) => apiVersions = Array.Empty<string>();
+        : base( message, innerException ) => apiVersions = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AmbiguousApiVersionException"/> class.

src/Abstractions/src/Asp.Versioning.Abstractions/Conventions/ApiVersionConventionBuilderBase.cs

@@ -39,25 +39,25 @@ protected ApiVersionConventionBuilderBase() { }
     /// Gets the collection of API versions supported by the current controller.
     /// </summary>
     /// <value>A <see cref="ICollection{T}">collection</see> of supported <see cref="ApiVersion">API versions</see>.</value>
-    protected ICollection<ApiVersion> SupportedVersions => supported ??= new();
+    protected ICollection<ApiVersion> SupportedVersions => supported ??= [];
 
     /// <summary>
     /// Gets the collection of API versions deprecated by the current controller.
     /// </summary>
     /// <value>A <see cref="ICollection{T}">collection</see> of deprecated <see cref="ApiVersion">API versions</see>.</value>
-    protected ICollection<ApiVersion> DeprecatedVersions => deprecated ??= new();
+    protected ICollection<ApiVersion> DeprecatedVersions => deprecated ??= [];
 
     /// <summary>
     /// Gets the collection of API versions advertised by the current controller.
     /// </summary>
     /// <value>A <see cref="ICollection{T}">collection</see> of advertised <see cref="ApiVersion">API versions</see>.</value>
-    protected ICollection<ApiVersion> AdvertisedVersions => advertised ??= new();
+    protected ICollection<ApiVersion> AdvertisedVersions => advertised ??= [];
 
     /// <summary>
     /// Gets the collection of API versions advertised and deprecated by the current controller.
     /// </summary>
     /// <value>A <see cref="ICollection{T}">collection</see> of advertised and deprecated <see cref="ApiVersion">API versions</see>.</value>
-    protected ICollection<ApiVersion> DeprecatedAdvertisedVersions => deprecatedAdvertised ??= new();
+    protected ICollection<ApiVersion> DeprecatedAdvertisedVersions => deprecatedAdvertised ??= [];
 
     /// <summary>
     /// Merges API version information from the specified attributes with the current conventions.
@@ -99,19 +99,19 @@ protected virtual void MergeAttributesWithConventions( IReadOnlyList<object> att
                     switch ( provider.Options )
                     {
                         case None:
-                            target = newSupported ??= new();
+                            target = newSupported ??= [];
                             source = provider.Versions;
                             break;
                         case Deprecated:
-                            target = newDeprecated ??= new();
+                            target = newDeprecated ??= [];
                             source = provider.Versions;
                             break;
                         case Advertised:
-                            target = newAdvertised ??= new();
+                            target = newAdvertised ??= [];
                             source = provider.Versions;
                             break;
                         case DeprecatedAdvertised:
-                            target = newDeprecatedAdvertised ??= new();
+                            target = newDeprecatedAdvertised ??= [];
                             source = provider.Versions;
                             break;
                         default:

src/Abstractions/src/Asp.Versioning.Abstractions/LinkHeaderValue.cs

@@ -85,7 +85,7 @@ public StringSegment Language
 #endif
             if ( languages is null )
             {
-                languages = new() { value };
+                languages = [value];
             }
             else if ( languages.Count == 0 )
             {
@@ -105,7 +105,7 @@ public StringSegment Language
     /// <remarks>This is only a hint; for example, it does not override the Content-Language header field of
     /// a HTTP response obtained by actually following the link. A single link may indicate that multiple
     /// languages are available from the indicated resource.</remarks>
-    public IList<StringSegment> Languages => languages ??= new();
+    public IList<StringSegment> Languages => languages ??= [];
 
     /// <summary>
     /// Gets or sets the link media.
@@ -206,11 +206,11 @@ public static bool TryParse(
                     type = attribute.Value;
                     break;
                 case "hreflang":
-                    languages ??= new();
+                    languages ??= [];
                     languages.Add( attribute.Value );
                     break;
                 default:
-                    extensions ??= new();
+                    extensions ??= [];
                     extensions.Add( attribute );
                     break;
             }

src/Abstractions/src/Asp.Versioning.Abstractions/NamespaceParser.cs

@@ -92,7 +92,7 @@ public IReadOnlyList<ApiVersion> Parse( Type type )
                 }
                 else if ( versions is null )
                 {
-                    versions = new() { version, result };
+                    versions = [version, result];
                 }
                 else
                 {

src/Abstractions/test/Asp.Versioning.Abstractions.Tests/IApiVersionParameterSourceExtensionsTest.cs

@@ -146,6 +146,7 @@ public void get_parameter_names_should_return_matching_names()
     {
         // arrange
         var source = new Mock<IApiVersionParameterSource>();
+        var expected = new[] { "api-version", "ver" };
 
         source.Setup( s => s.AddParameters( It.IsAny<IApiVersionParameterDescriptionContext>() ) )
               .Callback( ( IApiVersionParameterDescriptionContext context ) =>
@@ -160,6 +161,6 @@ public void get_parameter_names_should_return_matching_names()
         var names = source.Object.GetParameterNames( Query );
 
         // assert
-        names.Should().BeEquivalentTo( new[] { "api-version", "ver" } );
+        names.Should().BeEquivalentTo( expected );
     }
 }

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/ApiExplorer/AdHocEdmScope.cs

@@ -64,7 +64,7 @@ private static IReadOnlyList<VersionedApiDescription> FilterResults(
                 continue;
             }
 
-            results ??= new();
+            results ??= [];
             results.Add( apiDescription );
 
             for ( var j = 0; j < conventions.Count; j++ )
@@ -73,7 +73,7 @@ private static IReadOnlyList<VersionedApiDescription> FilterResults(
             }
         }
 
-        return results?.ToArray() ?? Array.Empty<VersionedApiDescription>();
+        return results?.ToArray() ?? [];
     }
 
     private static void ApplyAdHocEdm(

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/ApiExplorer/ODataApiExplorer.cs

@@ -181,7 +181,7 @@ protected override Collection<VersionedApiDescription> ExploreRouteControllers(
             return apiDescriptions;
         }
 
-        apiDescriptions = new();
+        apiDescriptions = [];
         var modelSelector = Configuration.GetODataRootContainer( route ).GetRequiredService<IEdmModelSelector>();
         var edmModel = modelSelector.SelectModel( apiVersion );
 

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Routing/ODataRouteBuilderContext.cs

@@ -355,7 +355,7 @@ private static bool IsNavigationPropertyLink( IEdmEntitySet? entitySet, IEdmSing
                 {
                     if ( propertyNames is null )
                     {
-                        propertyNames = new();
+                        propertyNames = [];
                     }
                     else
                     {

src/AspNet/OData/src/Asp.Versioning.WebApi.OData/OData/EdmModelSelector.cs

@@ -53,8 +53,8 @@ public EdmModelSelector( IEnumerable<IEdmModel> models, IApiVersionSelector apiV
 
                 break;
             default:
-                versions = new();
-                collection = new();
+                versions = [];
+                collection = [];
 
                 foreach ( var model in models )
                 {

src/AspNet/OData/src/Asp.Versioning.WebApi.OData/OData/VersionedODataModelBuilder.cs

@@ -78,7 +78,7 @@ protected virtual IReadOnlyList<ApiVersion> GetApiVersions()
 
                 if ( versions.Count > 0 && supported == null )
                 {
-                    supported = new();
+                    supported = [];
                 }
 
                 for ( var j = 0; j < versions.Count; j++ )
@@ -90,7 +90,7 @@ protected virtual IReadOnlyList<ApiVersion> GetApiVersions()
 
                 if ( versions.Count > 0 && deprecated == null )
                 {
-                    deprecated = new();
+                    deprecated = [];
                 }
 
                 for ( var j = 0; j < versions.Count; j++ )