Simplify internal types with default constructors

Author: commonsensesoftware

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/DependencyInjection/IApiVersioningBuilderExtensions.cs

@@ -60,12 +60,9 @@ private static void AddApiExplorerServices( IApiVersioningBuilder builder )
 #pragma warning disable IDE0079
 #pragma warning disable CA1812
 
-    private sealed class ODataApiExplorerOptionsAdapter : IOptionsFactory<ApiExplorerOptions>
+    private sealed class ODataApiExplorerOptionsAdapter( IOptionsFactory<ODataApiExplorerOptions> factory )
+        : IOptionsFactory<ApiExplorerOptions>
     {
-        private readonly IOptionsFactory<ODataApiExplorerOptions> factory;
-
-        public ODataApiExplorerOptionsAdapter( IOptionsFactory<ODataApiExplorerOptions> factory ) => this.factory = factory;
-
         public ApiExplorerOptions Create( string name ) => factory.Create( name );
     }
 }

src/AspNetCore/OData/src/Asp.Versioning.OData/DependencyInjection/IApiVersioningBuilderExtensions.cs

@@ -161,12 +161,8 @@ IHttpContextFactory NewFactory( IServiceProvider serviceProvider )
         return Describe( typeof( IHttpContextFactory ), NewFactory, lifetime );
     }
 
-    private sealed class HttpContextFactoryDecorator : IHttpContextFactory
+    private sealed class HttpContextFactoryDecorator( IHttpContextFactory decorated ) : IHttpContextFactory
     {
-        private readonly IHttpContextFactory decorated;
-
-        public HttpContextFactoryDecorator( IHttpContextFactory decorated ) => this.decorated = decorated;
-
         public HttpContext Create( IFeatureCollection featureCollection )
         {
             // features do not support cloning or DI, which is precisely why ASP.NET Core no longer supports

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Builder/VersionedEndpointRouteBuilder.cs

@@ -59,20 +59,12 @@ public virtual IApplicationBuilder CreateApplicationBuilder() =>
     public virtual void Add( Action<EndpointBuilder> convention ) =>
         conventionBuilder.Add( convention );
 
-    private sealed class ServiceProviderDecorator : IServiceProvider
+    private sealed class ServiceProviderDecorator(
+        IServiceProvider decorated,
+        ApiVersionSetBuilder versionSetBuilder ) : IServiceProvider
     {
-        private readonly IServiceProvider decorated;
-        private readonly ApiVersionSetBuilder versionSetBuilder;
         private ApiVersionSet? versionSet;
 
-        internal ServiceProviderDecorator(
-            IServiceProvider decorated,
-            ApiVersionSetBuilder versionSetBuilder )
-        {
-            this.decorated = decorated;
-            this.versionSetBuilder = versionSetBuilder;
-        }
-
         public object? GetService( Type serviceType )
         {
             if ( typeof( ApiVersionSetBuilder ).Equals( serviceType ) )
@@ -89,19 +81,10 @@ internal ServiceProviderDecorator(
         }
     }
 
-    private sealed class EndpointDataSourceDecorator : EndpointDataSource
-    {
-        private readonly EndpointDataSource decorated;
-        private readonly ApiVersionSetBuilder versionSetBuilder;
-
-        internal EndpointDataSourceDecorator(
+    private sealed class EndpointDataSourceDecorator(
             EndpointDataSource decorated,
-            ApiVersionSetBuilder versionSetBuilder )
-        {
-            this.decorated = decorated;
-            this.versionSetBuilder = versionSetBuilder;
-        }
-
+            ApiVersionSetBuilder versionSetBuilder ) : EndpointDataSource
+    {
         public override IReadOnlyList<Endpoint> Endpoints => decorated.Endpoints;
 
         public override IChangeToken GetChangeToken() => decorated.GetChangeToken();
@@ -175,19 +158,10 @@ private void CollateGroupApiVersions()
         }
     }
 
-    private sealed class EndpointDataSourceCollectionAdapter : ICollection<EndpointDataSource>
-    {
-        private readonly ICollection<EndpointDataSource> adapted;
-        private readonly ApiVersionSetBuilder versionSetBuilder;
-
-        internal EndpointDataSourceCollectionAdapter(
+    private sealed class EndpointDataSourceCollectionAdapter(
             ICollection<EndpointDataSource> adapted,
-            ApiVersionSetBuilder versionSetBuilder )
-        {
-            this.adapted = adapted;
-            this.versionSetBuilder = versionSetBuilder;
-        }
-
+            ApiVersionSetBuilder versionSetBuilder ) : ICollection<EndpointDataSource>
+    {
         public int Count => adapted.Count;
 
         public bool IsReadOnly => adapted.IsReadOnly;

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Routing/ApiVersionMatcherPolicy.cs

@@ -479,18 +479,11 @@ private ApiVersion TrySelectApiVersion( HttpContext httpContext, CandidateSet ca
     bool INodeBuilderPolicy.AppliesToEndpoints( IReadOnlyList<Endpoint> endpoints ) =>
         !ContainsDynamicEndpoints( endpoints ) && AppliesToEndpoints( endpoints );
 
-    private readonly struct Match
+    private readonly struct Match( int index, int score, bool isExplicit )
     {
-        internal readonly int Index;
-        internal readonly int Score;
-        internal readonly bool IsExplicit;
-
-        internal Match( int index, int score, bool isExplicit )
-        {
-            Index = index;
-            Score = score;
-            IsExplicit = isExplicit;
-        }
+        internal readonly int Index = index;
+        internal readonly int Score = score;
+        internal readonly bool IsExplicit = isExplicit;
 
         internal int CompareTo( in Match other )
         {
@@ -499,22 +492,15 @@ internal int CompareTo( in Match other )
         }
     }
 
-    private sealed class ApiVersionCollator
+    private sealed class ApiVersionCollator(
+            IEnumerable<IApiVersionMetadataCollationProvider> providers,
+            IOptions<ApiVersioningOptions> options )
     {
-        private readonly IApiVersionMetadataCollationProvider[] providers;
-        private readonly IOptions<ApiVersioningOptions> options;
+        private readonly IApiVersionMetadataCollationProvider[] providers = providers.ToArray();
         private readonly object syncRoot = new();
         private IReadOnlyList<ApiVersion>? items;
         private int version;
 
-        internal ApiVersionCollator(
-            IEnumerable<IApiVersionMetadataCollationProvider> providers,
-            IOptions<ApiVersioningOptions> options )
-        {
-            this.providers = providers.ToArray();
-            this.options = options;
-        }
-
         public IReadOnlyList<ApiVersion> Items
         {
             get

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/DefaultApiVersionDescriptionProvider.cs

@@ -125,22 +125,16 @@ private void AppendDescriptions( ICollection<ApiVersionDescription> descriptions
         }
     }
 
-    private sealed class ApiVersionDescriptionCollection
+    private sealed class ApiVersionDescriptionCollection(
+        DefaultApiVersionDescriptionProvider provider,
+        IEnumerable<IApiVersionMetadataCollationProvider> collators )
     {
         private readonly object syncRoot = new();
-        private readonly DefaultApiVersionDescriptionProvider provider;
-        private readonly IApiVersionMetadataCollationProvider[] collators;
+        private readonly DefaultApiVersionDescriptionProvider provider = provider;
+        private readonly IApiVersionMetadataCollationProvider[] collators = collators.ToArray();
         private IReadOnlyList<ApiVersionDescription>? items;
         private int version;
 
-        public ApiVersionDescriptionCollection(
-            DefaultApiVersionDescriptionProvider provider,
-            IEnumerable<IApiVersionMetadataCollationProvider> collators )
-        {
-            this.provider = provider;
-            this.collators = collators.ToArray();
-        }
-
         public IReadOnlyList<ApiVersionDescription> Items
         {
             get

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/GroupedApiVersionDescriptionProvider.cs

@@ -143,22 +143,16 @@ private void AppendDescriptions(
         }
     }
 
-    private sealed class ApiVersionDescriptionCollection
+    private sealed class ApiVersionDescriptionCollection(
+            GroupedApiVersionDescriptionProvider provider,
+            IEnumerable<IApiVersionMetadataCollationProvider> collators )
     {
         private readonly object syncRoot = new();
-        private readonly GroupedApiVersionDescriptionProvider provider;
-        private readonly IApiVersionMetadataCollationProvider[] collators;
+        private readonly GroupedApiVersionDescriptionProvider provider = provider;
+        private readonly IApiVersionMetadataCollationProvider[] collators = collators.ToArray();
         private IReadOnlyList<ApiVersionDescription>? items;
         private int version;
 
-        public ApiVersionDescriptionCollection(
-            GroupedApiVersionDescriptionProvider provider,
-            IEnumerable<IApiVersionMetadataCollationProvider> collators )
-        {
-            this.provider = provider;
-            this.collators = collators.ToArray();
-        }
-
         public IReadOnlyList<ApiVersionDescription> Items
         {
             get

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs

@@ -320,12 +320,8 @@ private ApiVersion[] FlattenApiVersions( IList<ApiDescription> descriptions )
         return [.. versions];
     }
 
-    private sealed class SimpleConstraintResolver : IInlineConstraintResolver
+    private sealed class SimpleConstraintResolver( IOptions<ApiExplorerOptions> options ) : IInlineConstraintResolver
     {
-        private readonly IOptions<ApiExplorerOptions> options;
-
-        internal SimpleConstraintResolver( IOptions<ApiExplorerOptions> options ) => this.options = options;
-
         public IRouteConstraint? ResolveConstraint( string inlineConstraint )
         {
             if ( options.Value.RouteConstraintName == inlineConstraint )

src/Client/src/Asp.Versioning.Http.Client/ApiVersionWriter.cs

@@ -55,13 +55,8 @@ public static IApiVersionWriter Combine( IEnumerable<IApiVersionWriter> apiVersi
         return new CombinedApiVersionWriter( writers );
     }
 
-    private sealed class CombinedApiVersionWriter : IApiVersionWriter
+    private sealed class CombinedApiVersionWriter( IApiVersionWriter[] apiVersionWriters ) : IApiVersionWriter
     {
-        private readonly IApiVersionWriter[] apiVersionWriters;
-
-        public CombinedApiVersionWriter( IApiVersionWriter[] apiVersionWriters ) =>
-            this.apiVersionWriters = apiVersionWriters;
-
         public void Write( HttpRequestMessage request, ApiVersion apiVersion )
         {
             for ( var i = 0; i < apiVersionWriters.Length; i++ )