Use collection initializers

commonsensesoftware · commonsensesoftware · commit 89cc90c0c770 · 2023-12-07T11:46:45.000-08:00
diff --git a/examples/AspNet/OData/SomeOpenApiODataWebApiExample/BooksController.cs b/examples/AspNet/OData/SomeOpenApiODataWebApiExample/BooksController.cs
@@ -14,15 +14,15 @@
 [RoutePrefix( "api/books" )]
 public class BooksController : ApiController
 {
-    private static readonly Book[] books = new Book[]
-    {
+    private static readonly Book[] books =
+    [
         new() { Id = "9781847490599", Title = "Anna Karenina", Author = "Leo Tolstoy", Published = 1878 },
         new() { Id = "9780198800545", Title = "War and Peace", Author = "Leo Tolstoy", Published = 1869 },
         new() { Id = "9780684801520", Title = "The Great Gatsby", Author = "F. Scott Fitzgerald", Published = 1925 },
         new() { Id = "9780486280615", Title = "The Adventures of Huckleberry Finn", Author = "Mark Twain", Published = 1884 },
         new() { Id = "9780140430820", Title = "Moby Dick", Author = "Herman Melville", Published = 1851 },
         new() { Id = "9780060934347", Title = "Don Quixote", Author = "Miguel de Cervantes", Published = 1605 },
-    };
+    ];
 
     /// <summary>
     /// Gets all books.
diff --git a/examples/AspNetCore/OData/SomeODataOpenApiExample/BooksController.cs b/examples/AspNetCore/OData/SomeODataOpenApiExample/BooksController.cs
@@ -13,15 +13,15 @@
 [Route( "api/[controller]" )]
 public class BooksController : ControllerBase
 {
-    private static readonly Book[] books = new Book[]
-    {
+    private static readonly Book[] books =
+    [
         new() { Id = "9781847490599", Title = "Anna Karenina", Author = "Leo Tolstoy", Published = 1878 },
         new() { Id = "9780198800545", Title = "War and Peace", Author = "Leo Tolstoy", Published = 1869 },
         new() { Id = "9780684801520", Title = "The Great Gatsby", Author = "F. Scott Fitzgerald", Published = 1925 },
         new() { Id = "9780486280615", Title = "The Adventures of Huckleberry Finn", Author = "Mark Twain", Published = 1884 },
         new() { Id = "9780140430820", Title = "Moby Dick", Author = "Herman Melville", Published = 1851 },
         new() { Id = "9780060934347", Title = "Don Quixote", Author = "Miguel de Cervantes", Published = 1605 },
-    };
+    ];
 
     /// <summary>
     /// Gets all books.
diff --git a/src/Abstractions/test/Asp.Versioning.Abstractions.Tests/ApiVersionTest.cs b/src/Abstractions/test/Asp.Versioning.Abstractions.Tests/ApiVersionTest.cs
@@ -595,27 +595,27 @@ public void api_version_1_ge_api_version_2_should_return_expected_result( string
     }
 
     public static IEnumerable<object[]> FormatData =>
-        new[]
+        new object[][]
         {
-            new[] { null, "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha" },
-            new[] { "", "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha" },
-            new[] { "F", "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha" },
-            new[] { "G", "2013-08-06", "2013-08-06" },
-            new[] { "GG", "2013-08-06-Alpha", "2013-08-06-Alpha" },
-            new[] { "G", "1.1", "" },
-            new[] { "G", "1.1-Alpha", "" },
-            new[] { "G", "2013-08-06.1.1", "2013-08-06" },
-            new[] { "GG", "2013-08-06.1.1-Alpha", "2013-08-06-Alpha" },
-            new[] { "V", "2013-08-06", "" },
-            new[] { "VVVV", "2013-08-06-Alpha", "" },
-            new[] { "VV", "1.1", "1.1" },
-            new[] { "VVVV", "1.1-Alpha", "1.1-Alpha" },
-            new[] { "VV", "2013-08-06.1.1", "1.1" },
-            new[] { "VVVV", "2013-08-06.1.1-Alpha", "1.1-Alpha" },
-            new[] { "S", "1.1-Alpha", "Alpha" },
-            new[] { "'v'VVV", "1.1", "v1.1" },
-            new[] { "'Major': %V, 'Minor': %v", "1.1", "Major: 1, Minor: 1" },
-            new[] { "MMM yyyy '('S')'", "2013-08-06-preview.1", "Aug 2013 (preview.1)" },
+            [null, "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha"],
+            ["", "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha"],
+            ["F", "2013-08-06.1.1-Alpha", "2013-08-06.1.1-Alpha"],
+            ["G", "2013-08-06", "2013-08-06"],
+            ["GG", "2013-08-06-Alpha", "2013-08-06-Alpha"],
+            ["G", "1.1", ""],
+            ["G", "1.1-Alpha", ""],
+            ["G", "2013-08-06.1.1", "2013-08-06"],
+            ["GG", "2013-08-06.1.1-Alpha", "2013-08-06-Alpha"],
+            ["V", "2013-08-06", ""],
+            ["VVVV", "2013-08-06-Alpha", ""],
+            ["VV", "1.1", "1.1"],
+            ["VVVV", "1.1-Alpha", "1.1-Alpha"],
+            ["VV", "2013-08-06.1.1", "1.1"],
+            ["VVVV", "2013-08-06.1.1-Alpha", "1.1-Alpha"],
+            ["S", "1.1-Alpha", "Alpha"],
+            ["'v'VVV", "1.1", "v1.1"],
+            ["'Major': %V, 'Minor': %v", "1.1", "Major: 1, Minor: 1"],
+            ["MMM yyyy '('S')'", "2013-08-06-preview.1", "Aug 2013 (preview.1)"],
         };
 
 #if NETFRAMEWORK
diff --git a/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/Simulators/V1/BooksController.cs b/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/Simulators/V1/BooksController.cs
@@ -17,15 +17,15 @@ namespace Asp.Versioning.Simulators.V1;
 [RoutePrefix( "api/books" )]
 public class BooksController : ApiController
 {
-    private static readonly Book[] books = new Book[]
-    {
+    private static readonly Book[] books =
+    [
         new() { Id = "9781847490599", Title = "Anna Karenina", Author = "Leo Tolstoy", Published = 1878 },
         new() { Id = "9780198800545", Title = "War and Peace", Author = "Leo Tolstoy", Published = 1869 },
         new() { Id = "9780684801520", Title = "The Great Gatsby", Author = "F. Scott Fitzgerald", Published = 1925 },
         new() { Id = "9780486280615", Title = "The Adventures of Huckleberry Finn", Author = "Mark Twain", Published = 1884 },
         new() { Id = "9780140430820", Title = "Moby Dick", Author = "Herman Melville", Published = 1851 },
         new() { Id = "9780060934347", Title = "Don Quixote", Author = "Miguel de Cervantes", Published = 1605 },
-    };
+    ];
 
     /// <summary>
     /// Gets all books.
diff --git a/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/System.Web.Http/Description/ApiDescriptionExtensionsTest.cs b/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.ApiExplorer.Tests/System.Web.Http/Description/ApiDescriptionExtensionsTest.cs
@@ -68,7 +68,7 @@ private static VersionedApiDescription CreateApiDescription( IEdmModel model )
     {
         var configuration = new HttpConfiguration();
         var controllerType = typeof( Asp.Versioning.Simulators.V1.OrdersController );
-        var actionMethod = controllerType.GetRuntimeMethod( "Get", new[] { typeof( int ) } );
+        var actionMethod = controllerType.GetRuntimeMethod( "Get", [typeof( int )] );
         var controllerDescriptor = new HttpControllerDescriptor( configuration, "Orders", controllerType );
         var actionDescriptor = new ReflectedHttpActionDescriptor( controllerDescriptor, actionMethod );
         var apiDescription = new VersionedApiDescription()
diff --git a/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/System.Web.Http/HttpConfigurationExtensionsTest.cs b/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/System.Web.Http/HttpConfigurationExtensionsTest.cs
@@ -46,7 +46,7 @@ public void map_versioned_odata_route_should_return_expected_result( string rout
         var selector = GetODataRootContainer( configuration, routeName ).GetRequiredService<IEdmModelSelector>();
         var routingConventions = GetRoutingConventions( configuration, route );
 
-        selector.ApiVersions.Should().Equal( new ApiVersion[] { new( 1, 0 ), new( 2, 0 ) } );
+        selector.ApiVersions.Should().Equal( [new( 1, 0 ), new( 2, 0 )] );
         routingConventions[0].Should().BeOfType<VersionedAttributeRoutingConvention>();
         routingConventions[1].Should().BeOfType<VersionedMetadataRoutingConvention>();
         routingConventions.OfType<MetadataRoutingConvention>().Should().BeEmpty();
diff --git a/src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Description/InternalTypeExtensions.cs b/src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Description/InternalTypeExtensions.cs
@@ -20,9 +20,9 @@ internal static void EnsureInitialized( this IHttpRoute route, Func<IReadOnlyCol
         Debug.Assert( route.GetType().Name == "RouteCollectionRoute", "Extension method only intended to support testing RouteCollectionRoute.EnsureInitialized" );
 
         var type = route.GetType();
-        var method = type.GetRuntimeMethod( nameof( EnsureInitialized ), new[] { initializer.GetType() } );
+        var method = type.GetRuntimeMethod( nameof( EnsureInitialized ), [initializer.GetType()] );
 
-        method.Invoke( route, new object[] { initializer } );
+        method.Invoke( route, [initializer] );
     }
 
     internal static IDirectRouteBuilder NewDirectRouteBuilder( IReadOnlyCollection<HttpActionDescriptor> actions, bool targetIsAction )
diff --git a/src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/V1/BooksController.cs b/src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/Simulators/V1/BooksController.cs
@@ -16,15 +16,15 @@ namespace Asp.Versioning.Simulators.V1;
 [Route( "api/[controller]" )]
 public class BooksController : ControllerBase
 {
-    private static readonly Book[] books = new Book[]
-    {
+    private static readonly Book[] books =
+    [
         new() { Id = "9781847490599", Title = "Anna Karenina", Author = "Leo Tolstoy", Published = 1878 },
         new() { Id = "9780198800545", Title = "War and Peace", Author = "Leo Tolstoy", Published = 1869 },
         new() { Id = "9780684801520", Title = "The Great Gatsby", Author = "F. Scott Fitzgerald", Published = 1925 },
         new() { Id = "9780486280615", Title = "The Adventures of Huckleberry Finn", Author = "Mark Twain", Published = 1884 },
         new() { Id = "9780140430820", Title = "Moby Dick", Author = "Herman Melville", Published = 1851 },
         new() { Id = "9780060934347", Title = "Don Quixote", Author = "Miguel de Cervantes", Published = 1605 },
-    };
+    ];
 
     /// <summary>
     /// Gets all books.
diff --git a/src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/OData/ModelConfigurationFeatureProviderTest.cs b/src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/OData/ModelConfigurationFeatureProviderTest.cs
@@ -28,7 +28,7 @@ public void populate_feature_should_discover_valid_model_configurations()
             provider.PopulateFeature( partManager.ApplicationParts, feature );
 
             // assert
-            feature.ModelConfigurations.Should().Equal( new[] { typeof( PublicModelConfiguration ) } );
+            feature.ModelConfigurations.Should().Equal( [typeof( PublicModelConfiguration )] );
         }
     }
 
diff --git a/src/AspNetCore/WebApi/test/Asp.Versioning.Http.Tests/Routing/ApiVersionMatcherPolicyTest.cs b/src/AspNetCore/WebApi/test/Asp.Versioning.Http.Tests/Routing/ApiVersionMatcherPolicyTest.cs
@@ -97,7 +97,7 @@ public async Task apply_should_have_candidate_for_matched_api_version()
         var model = new ApiVersionModel( new ApiVersion( 1, 0 ) );
         var items = new object[] { new ApiVersionMetadata( model, model ) };
         var endpoint = new Endpoint( Limbo, new( items ), default );
-        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, new[] { 0 } );
+        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, [0] );
         var policy = NewApiVersionMatcherPolicy();
 
         feature.SetupProperty( f => f.RequestedApiVersion, new ApiVersion( 1, 0 ) );
@@ -125,7 +125,7 @@ public async Task apply_should_use_400_endpoint_for_unmatched_api_version()
         var model = new ApiVersionModel( new ApiVersion( 1, 0 ) );
         var items = new object[] { new ApiVersionMetadata( model, model ) };
         var endpoint = new Endpoint( Limbo, new( items ), default );
-        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, new[] { 0 } );
+        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, [0] );
         var httpContext = NewHttpContext( feature );
 
         // act
@@ -192,7 +192,7 @@ public async Task apply_should_use_400_endpoint_for_unspecified_api_version()
         var model = new ApiVersionModel( new ApiVersion( 1, 0 ) );
         var items = new object[] { new ApiVersionMetadata( model, model ) };
         var endpoint = new Endpoint( Limbo, new( items ), "Test" );
-        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, new[] { 0 } );
+        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, [0] );
         var httpContext = NewHttpContext( feature );
 
         // act
@@ -210,7 +210,7 @@ public async Task apply_should_have_candidate_for_unspecified_api_version()
         var model = new ApiVersionModel( new ApiVersion( 1, 0 ) );
         var items = new object[] { new ApiVersionMetadata( model, model ) };
         var endpoint = new Endpoint( Limbo, new( items ), default );
-        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, new[] { 0 } );
+        var candidates = new CandidateSet( new[] { endpoint }, new[] { new RouteValueDictionary() }, [0] );
         var options = new ApiVersioningOptions() { AssumeDefaultVersionWhenUnspecified = true };
         var policy = NewApiVersionMatcherPolicy( options );
 
diff --git a/src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.ApiExplorer.Tests/TestActionDescriptorCollectionProvider.cs b/src/AspNetCore/WebApi/test/Asp.Versioning.Mvc.ApiExplorer.Tests/TestActionDescriptorCollectionProvider.cs
@@ -17,7 +17,7 @@ public TestActionDescriptorCollectionProvider( ActionDescriptor action, params A
 
         if ( otherActions.Length == 0 )
         {
-            actions = new ActionDescriptor[] { action };
+            actions = [action];
         }
         else
         {
diff --git a/src/Common/test/Common.OData.ApiExplorer.Tests/OData/DefaultModelTypeBuilderTest.cs b/src/Common/test/Common.OData.ApiExplorer.Tests/OData/DefaultModelTypeBuilderTest.cs
@@ -383,7 +383,7 @@ public void substitute_should_get_attributes_from_property_that_has_attributes_t
         var property = substitutionType.GetRuntimeProperty( "Salary" );
         var attributeWithParams = property.GetCustomAttribute<AllowedRolesAttribute>();
 
-        attributeWithParams.AllowedRoles.Should().BeEquivalentTo( new[] { "Manager", "Employer" } );
+        attributeWithParams.AllowedRoles.Should().BeEquivalentTo( ["Manager", "Employer"] );
     }
 
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private static VersionedApiDescription CreateApiDescription( IEdmModel model )`
`68`	`68`	`{`
`69`	`69`	`var configuration = new HttpConfiguration();`
`70`	`70`	`var controllerType = typeof( Asp.Versioning.Simulators.V1.OrdersController );`
`71`		`- var actionMethod = controllerType.GetRuntimeMethod( "Get", new[] { typeof( int ) } );`
	`71`	`+ var actionMethod = controllerType.GetRuntimeMethod( "Get", [typeof( int )] );`
`72`	`72`	`var controllerDescriptor = new HttpControllerDescriptor( configuration, "Orders", controllerType );`
`73`	`73`	`var actionDescriptor = new ReflectedHttpActionDescriptor( controllerDescriptor, actionMethod );`
`74`	`74`	`var apiDescription = new VersionedApiDescription()`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ internal static void EnsureInitialized( this IHttpRoute route, Func<IReadOnlyCol`
`20`	`20`	`Debug.Assert( route.GetType().Name == "RouteCollectionRoute", "Extension method only intended to support testing RouteCollectionRoute.EnsureInitialized" );`
`21`	`21`
`22`	`22`	`var type = route.GetType();`
`23`		`- var method = type.GetRuntimeMethod( nameof( EnsureInitialized ), new[] { initializer.GetType() } );`
	`23`	`+ var method = type.GetRuntimeMethod( nameof( EnsureInitialized ), [initializer.GetType()] );`
`24`	`24`
`25`		`- method.Invoke( route, new object[] { initializer } );`
	`25`	`+ method.Invoke( route, [initializer] );`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`internal static IDirectRouteBuilder NewDirectRouteBuilder( IReadOnlyCollection<HttpActionDescriptor> actions, bool targetIsAction )`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void populate_feature_should_discover_valid_model_configurations()`
`28`	`28`	`provider.PopulateFeature( partManager.ApplicationParts, feature );`
`29`	`29`
`30`	`30`	`// assert`
`31`		`- feature.ModelConfigurations.Should().Equal( new[] { typeof( PublicModelConfiguration ) } );`
	`31`	`+ feature.ModelConfigurations.Should().Equal( [typeof( PublicModelConfiguration )] );`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`