Skip to content

Commit 26f80e5

Browse files
Chris Martinezcommonsensesoftware
Chris Martinez
authored and
commonsensesoftware
committed
Code cleanup from multiple, manual analysis runs
1 parent 2c04584 commit 26f80e5

File tree

121 files changed

+68
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+68
-259
lines changed

‎examples/AspNet/OData/OpenApiODataWebApiExample/SwaggerDefaultValues.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ public void Apply( Operation operation, SchemaRegistry schemaRegistry, ApiDescri
3030
var description = apiDescription.ParameterDescriptions.First( p => p.Name == parameter.name );
3131

3232
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1101
33-
if ( parameter.description == null )
34-
{
35-
parameter.description = description.Documentation;
36-
}
33+
parameter.description ??= description.Documentation;
3734

3835
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1089
3936
// REF: https://github.com/domaindrivendev/Swashbuckle/pull/1090
40-
if ( parameter.@default == null )
41-
{
42-
parameter.@default = description.ParameterDescriptor?.DefaultValue;
43-
}
37+
parameter.@default ??= description.ParameterDescriptor?.DefaultValue;
4438
}
4539
}
4640
}

‎examples/AspNet/OData/SomeOpenApiODataWebApiExample/SwaggerDefaultValues.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ public void Apply( Operation operation, SchemaRegistry schemaRegistry, ApiDescri
3030
var description = apiDescription.ParameterDescriptions.First( p => p.Name == parameter.name );
3131

3232
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1101
33-
if ( parameter.description == null )
34-
{
35-
parameter.description = description.Documentation;
36-
}
33+
parameter.description ??= description.Documentation;
3734

3835
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1089
3936
// REF: https://github.com/domaindrivendev/Swashbuckle/pull/1090
40-
if ( parameter.@default == null )
41-
{
42-
parameter.@default = description.ParameterDescriptor?.DefaultValue;
43-
}
37+
parameter.@default ??= description.ParameterDescriptor?.DefaultValue;
4438
}
4539
}
4640
}

‎examples/AspNet/WebApi/OpenApiWebApiExample/SwaggerDefaultValues.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ public void Apply( Operation operation, SchemaRegistry schemaRegistry, ApiDescri
3030
var description = apiDescription.ParameterDescriptions.First( p => p.Name == parameter.name );
3131

3232
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1101
33-
if ( parameter.description == null )
34-
{
35-
parameter.description = description.Documentation;
36-
}
33+
parameter.description ??= description.Documentation;
3734

3835
// REF: https://github.com/domaindrivendev/Swashbuckle/issues/1089
3936
// REF: https://github.com/domaindrivendev/Swashbuckle/pull/1090
40-
if ( parameter.@default == null )
41-
{
42-
parameter.@default = description.ParameterDescriptor?.DefaultValue;
43-
}
37+
parameter.@default ??= description.ParameterDescriptor?.DefaultValue;
4438
}
4539
}
4640
}

‎examples/AspNetCore/OData/ODataAdvancedExample/Configuration/OrderModelConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class OrderModelConfiguration : IModelConfiguration
99
{
1010
private static readonly ApiVersion V2 = new( 2, 0 );
1111

12-
private EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
12+
private static EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
1313
{
1414
var order = builder.EntitySet<Order>( "Orders" ).EntityType;
1515

‎examples/AspNetCore/OData/ODataAdvancedExample/Configuration/PersonModelConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
public class PersonModelConfiguration : IModelConfiguration
99
{
10-
private void ConfigureV1( ODataModelBuilder builder )
10+
private static void ConfigureV1( ODataModelBuilder builder )
1111
{
1212
var person = ConfigureCurrent( builder );
1313
person.Ignore( p => p.Email );
1414
person.Ignore( p => p.Phone );
1515
}
1616

17-
private void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
17+
private static void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
1818

19-
private EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
19+
private static EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
2020
{
2121
var person = builder.EntitySet<Person>( "People" ).EntityType;
2222

‎examples/AspNetCore/OData/ODataBasicExample/Configuration/OrderModelConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class OrderModelConfiguration : IModelConfiguration
99
{
1010
private static readonly ApiVersion V1 = new( 1, 0 );
1111

12-
private EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
12+
private static EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
1313
{
1414
var order = builder.EntitySet<Order>( "Orders" ).EntityType;
1515

‎examples/AspNetCore/OData/ODataBasicExample/Configuration/PersonModelConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
public class PersonModelConfiguration : IModelConfiguration
99
{
10-
private void ConfigureV1( ODataModelBuilder builder )
10+
private static void ConfigureV1( ODataModelBuilder builder )
1111
{
1212
var person = ConfigureCurrent( builder );
1313
person.Ignore( p => p.Email );
1414
person.Ignore( p => p.Phone );
1515
}
1616

17-
private void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
17+
private static void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
1818

19-
private EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
19+
private static EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
2020
{
2121
var person = builder.EntitySet<Person>( "People" ).EntityType;
2222

‎examples/AspNetCore/OData/ODataConventionsExample/Configuration/OrderModelConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class OrderModelConfiguration : IModelConfiguration
99
{
1010
private static readonly ApiVersion V1 = new( 1, 0 );
1111

12-
private EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
12+
private static EntityTypeConfiguration<Order> ConfigureCurrent( ODataModelBuilder builder )
1313
{
1414
var order = builder.EntitySet<Order>( "Orders" ).EntityType;
1515

‎examples/AspNetCore/OData/ODataConventionsExample/Configuration/PersonModelConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
public class PersonModelConfiguration : IModelConfiguration
99
{
10-
private void ConfigureV1( ODataModelBuilder builder )
10+
private static void ConfigureV1( ODataModelBuilder builder )
1111
{
1212
var person = ConfigureCurrent( builder );
1313
person.Ignore( p => p.Email );
1414
person.Ignore( p => p.Phone );
1515
}
1616

17-
private void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
17+
private static void ConfigureV2( ODataModelBuilder builder ) => ConfigureCurrent( builder ).Ignore( p => p.Phone );
1818

19-
private EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
19+
private static EntityTypeConfiguration<Person> ConfigureCurrent( ODataModelBuilder builder )
2020
{
2121
var person = builder.EntitySet<Person>( "People" ).EntityType;
2222

‎src/Abstractions/src/Asp.Versioning.Abstractions/AdvertiseApiVersionsAttribute.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace Asp.Versioning;
44

55
using static System.AttributeTargets;
66

7-
#pragma warning disable CA1019
8-
#pragma warning disable CA1813
9-
107
/// <summary>
118
/// Represents the metadata that describes the advertised <see cref="ApiVersion">API versions</see>.
129
/// </summary>
@@ -71,9 +68,7 @@ public AdvertiseApiVersionsAttribute( string version ) : base( version ) { }
7168
public AdvertiseApiVersionsAttribute( string version, params string[] otherVersions )
7269
: base( version, otherVersions ) { }
7370

74-
#pragma warning disable CA1033 // Interface methods should be callable by child types
7571
ApiVersionProviderOptions IApiVersionProvider.Options => options;
76-
#pragma warning restore CA1033 // Interface methods should be callable by child types
7772

7873
/// <summary>
7974
/// Gets or sets a value indicating whether the specified set of API versions are deprecated.

0 commit comments

Comments
 (0)