Resharper: use primary constructors

bkoelman · bkoelman · commit d23ac6704a6f · 2023-12-27T11:48:57.000+01:00
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/Exceptions/ApiException.cs b/src/JsonApiDotNetCore.OpenApi.Client/Exceptions/ApiException.cs
@@ -6,19 +6,11 @@
 namespace JsonApiDotNetCore.OpenApi.Client.Exceptions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class ApiException : Exception
+public sealed class ApiException(
+    string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception? innerException)
+    : Exception($"{message}\n\nStatus: {statusCode}\nResponse: \n{response ?? "(null)"}", innerException)
 {
-    public int StatusCode { get; }
-
-    public string? Response { get; }
-
-    public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; }
-
-    public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception? innerException)
-        : base($"{message}\n\nStatus: {statusCode}\nResponse: \n{response ?? "(null)"}", innerException)
-    {
-        StatusCode = statusCode;
-        Response = response;
-        Headers = headers;
-    }
+    public int StatusCode { get; } = statusCode;
+    public string? Response { get; } = response;
+    public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; } = headers;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/UnreachableCodeException.cs b/src/JsonApiDotNetCore.OpenApi.Client/UnreachableCodeException.cs
@@ -1,9 +1,3 @@
 namespace JsonApiDotNetCore.OpenApi.Client;
 
-internal sealed class UnreachableCodeException : Exception
-{
-    public UnreachableCodeException()
-        : base("This code should not be reachable.")
-    {
-    }
-}
+internal sealed class UnreachableCodeException() : Exception("This code should not be reachable.");
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
@@ -3,15 +3,8 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 /// <summary>
 /// Metadata available at runtime about a JsonApiDotNetCore endpoint.
 /// </summary>
-internal sealed class JsonApiEndpointMetadataContainer
+internal sealed class JsonApiEndpointMetadataContainer(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
 {
-    public IJsonApiRequestMetadata? RequestMetadata { get; }
-
-    public IJsonApiResponseMetadata? ResponseMetadata { get; }
-
-    public JsonApiEndpointMetadataContainer(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
-    {
-        RequestMetadata = requestMetadata;
-        ResponseMetadata = responseMetadata;
-    }
+    public IJsonApiRequestMetadata? RequestMetadata { get; } = requestMetadata;
+    public IJsonApiResponseMetadata? ResponseMetadata { get; } = responseMetadata;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
@@ -1,9 +1,4 @@
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-internal sealed class RelationshipRequestMetadata : NonPrimaryEndpointMetadata, IJsonApiRequestMetadata
-{
-    public RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-        : base(documentTypesByRelationshipName)
-    {
-    }
-}
+internal sealed class RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiRequestMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
@@ -1,9 +1,4 @@
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-internal sealed class RelationshipResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
-{
-    public RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-        : base(documentTypesByRelationshipName)
-    {
-    }
-}
+internal sealed class RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
@@ -1,9 +1,4 @@
 namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-internal sealed class SecondaryResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
-{
-    public SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-        : base(documentTypesByRelationshipName)
-    {
-    }
-}
+internal sealed class SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs b/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
@@ -1,9 +1,3 @@
 namespace JsonApiDotNetCore.OpenApi;
 
-internal sealed class UnreachableCodeException : Exception
-{
-    public UnreachableCodeException()
-        : base("This code should not be reachable.")
-    {
-    }
-}
+internal sealed class UnreachableCodeException() : Exception("This code should not be reachable.");
diff --git a/test/OpenApiClientTests/FakeHttpClientWrapper.cs b/test/OpenApiClientTests/FakeHttpClientWrapper.cs
@@ -73,23 +73,16 @@ public void Dispose()
         _handler.Dispose();
     }
 
-    private sealed class FakeHttpMessageHandler : HttpMessageHandler
+    private sealed class FakeHttpMessageHandler(HttpResponseMessage response) : HttpMessageHandler
     {
-        private HttpResponseMessage _response;
-
         public HttpRequestMessage? Request { get; private set; }
         public string? RequestBody { get; private set; }
 
-        public FakeHttpMessageHandler(HttpResponseMessage response)
-        {
-            _response = response;
-        }
-
-        public void SetResponse(HttpResponseMessage response)
+        public void SetResponse(HttpResponseMessage newResponse)
         {
-            ArgumentGuard.NotNull(response);
+            ArgumentGuard.NotNull(newResponse);
 
-            _response = response;
+            response = newResponse;
         }
 
         protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
@@ -104,12 +97,12 @@ protected override HttpResponseMessage Send(HttpRequestMessage request, Cancella
                 RequestBody = reader.ReadToEnd();
             }
 
-            return _response;
+            return response;
         }
 
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            HttpResponseMessage response = Send(request, cancellationToken);
+            Send(request, cancellationToken);
             return Task.FromResult(response);
         }
     }
diff --git a/test/OpenApiTests/DocComments/DocCommentsDbContext.cs b/test/OpenApiTests/DocComments/DocCommentsDbContext.cs
@@ -7,17 +7,12 @@
 namespace OpenApiTests.DocComments;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class DocCommentsDbContext : TestableDbContext
+public sealed class DocCommentsDbContext(DbContextOptions<DocCommentsDbContext> options) : TestableDbContext(options)
 {
     public DbSet<Skyscraper> Skyscrapers => Set<Skyscraper>();
     public DbSet<Elevator> Elevators => Set<Elevator>();
     public DbSet<Space> Spaces => Set<Space>();
 
-    public DocCommentsDbContext(DbContextOptions<DocCommentsDbContext> options)
-        : base(options)
-    {
-    }
-
     protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<Skyscraper>()
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
@@ -7,17 +7,12 @@
 namespace OpenApiTests.LegacyOpenApiIntegration;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class LegacyIntegrationDbContext : TestableDbContext
+public sealed class LegacyIntegrationDbContext(DbContextOptions<LegacyIntegrationDbContext> options) : TestableDbContext(options)
 {
     public DbSet<Airplane> Airplanes => Set<Airplane>();
     public DbSet<Flight> Flights => Set<Flight>();
     public DbSet<FlightAttendant> FlightAttendants => Set<FlightAttendant>();
 
-    public LegacyIntegrationDbContext(DbContextOptions<LegacyIntegrationDbContext> options)
-        : base(options)
-    {
-    }
-
     protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<Flight>()
diff --git a/test/OpenApiTests/NamingConventions/NamingConventionsDbContext.cs b/test/OpenApiTests/NamingConventions/NamingConventionsDbContext.cs
@@ -5,12 +5,7 @@
 namespace OpenApiTests.NamingConventions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class NamingConventionsDbContext : TestableDbContext
+public sealed class NamingConventionsDbContext(DbContextOptions<NamingConventionsDbContext> options) : TestableDbContext(options)
 {
     public DbSet<Supermarket> Supermarkets => Set<Supermarket>();
-
-    public NamingConventionsDbContext(DbContextOptions<NamingConventionsDbContext> options)
-        : base(options)
-    {
-    }
 }
diff --git a/test/OpenApiTests/QueryStrings/QueryStringsDbContext.cs b/test/OpenApiTests/QueryStrings/QueryStringsDbContext.cs
@@ -5,12 +5,7 @@
 namespace OpenApiTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class QueryStringsDbContext : TestableDbContext
+public sealed class QueryStringsDbContext(DbContextOptions<QueryStringsDbContext> options) : TestableDbContext(options)
 {
     public DbSet<Node> Nodes => Set<Node>();
-
-    public QueryStringsDbContext(DbContextOptions<QueryStringsDbContext> options)
-        : base(options)
-    {
-    }
 }
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/NrtOffDbContext.cs b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/NrtOffDbContext.cs
@@ -7,16 +7,11 @@ namespace OpenApiTests.ResourceFieldValidation.NullableReferenceTypesOff;
 // @formatter:wrap_chained_method_calls chop_always
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class NrtOffDbContext : TestableDbContext
+public sealed class NrtOffDbContext(DbContextOptions<NrtOffDbContext> options) : TestableDbContext(options)
 {
     public DbSet<NrtOffResource> Resources => Set<NrtOffResource>();
     public DbSet<NrtOffEmpty> Empties => Set<NrtOffEmpty>();
 
-    public NrtOffDbContext(DbContextOptions<NrtOffDbContext> options)
-        : base(options)
-    {
-    }
-
     protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<NrtOffResource>()
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/NrtOnDbContext.cs b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/NrtOnDbContext.cs
@@ -7,16 +7,11 @@ namespace OpenApiTests.ResourceFieldValidation.NullableReferenceTypesOn;
 // @formatter:wrap_chained_method_calls chop_always
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-public sealed class NrtOnDbContext : TestableDbContext
+public sealed class NrtOnDbContext(DbContextOptions<NrtOnDbContext> options) : TestableDbContext(options)
 {
     public DbSet<NrtOnResource> Resources => Set<NrtOnResource>();
     public DbSet<NrtOnEmpty> Empties => Set<NrtOnEmpty>();
 
-    public NrtOnDbContext(DbContextOptions<NrtOnDbContext> options)
-        : base(options)
-    {
-    }
-
     protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity<NrtOnResource>()

Original file line number	Diff line number	Diff line change
`@@ -73,23 +73,16 @@ public void Dispose()`
`73`	`73`	`_handler.Dispose();`
`74`	`74`	`}`
`75`	`75`
`76`		`- private sealed class FakeHttpMessageHandler : HttpMessageHandler`
	`76`	`+ private sealed class FakeHttpMessageHandler(HttpResponseMessage response) : HttpMessageHandler`
`77`	`77`	`{`
`78`		`- private HttpResponseMessage _response;`
`79`		`-`
`80`	`78`	`public HttpRequestMessage? Request { get; private set; }`
`81`	`79`	`public string? RequestBody { get; private set; }`
`82`	`80`
`83`		`- public FakeHttpMessageHandler(HttpResponseMessage response)`
`84`		`- {`
`85`		`- _response = response;`
`86`		`- }`
`87`		`-`
`88`		`- public void SetResponse(HttpResponseMessage response)`
	`81`	`+ public void SetResponse(HttpResponseMessage newResponse)`
`89`	`82`	`{`
`90`		`- ArgumentGuard.NotNull(response);`
	`83`	`+ ArgumentGuard.NotNull(newResponse);`
`91`	`84`
`92`		`- _response = response;`
	`85`	`+ response = newResponse;`
`93`	`86`	`}`
`94`	`87`
`95`	`88`	`protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)`
`@@ -104,12 +97,12 @@ protected override HttpResponseMessage Send(HttpRequestMessage request, Cancella`
`104`	`97`	`RequestBody = reader.ReadToEnd();`
`105`	`98`	`}`
`106`	`99`
`107`		`- return _response;`
	`100`	`+ return response;`
`108`	`101`	`}`
`109`	`102`
`110`	`103`	`protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)`
`111`	`104`	`{`
`112`		`- HttpResponseMessage response = Send(request, cancellationToken);`
	`105`	`+ Send(request, cancellationToken);`
`113`	`106`	`return Task.FromResult(response);`
`114`	`107`	`}`
`115`	`108`	`}`