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

+2-8
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

+2-8
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

+2-8
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

+1-1
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

+3-3
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

+1-1
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

+3-3
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

+1-1
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

+3-3
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

-5
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.

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

-2
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,7 @@ public virtual int CompareTo( ApiVersion? other )
341341
public virtual string ToString( string? format, IFormatProvider? formatProvider )
342342
{
343343
var provider = ApiVersionFormatProvider.GetInstance( formatProvider );
344-
#pragma warning disable CA1062 // Validate arguments of public methods
345344
return provider.Format( format, this, formatProvider );
346-
#pragma warning restore CA1062 // Validate arguments of public methods
347345
}
348346

349347
private static string? ValidateStatus( string? status, Func<string?, bool> isValid )

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

-5
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 <see cref="ApiVersion">versions</see> associated with an API.
129
/// </summary>
@@ -42,9 +39,7 @@ protected ApiVersionAttribute( IApiVersionParser parser, string version ) : base
4239
/// <param name="version">The API version string.</param>
4340
public ApiVersionAttribute( string version ) : base( version ) { }
4441

45-
#pragma warning disable CA1033 // Interface methods should be callable by child types
4642
ApiVersionProviderOptions IApiVersionProvider.Options => options;
47-
#pragma warning restore CA1033 // Interface methods should be callable by child types
4843

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

33
#pragma warning disable IDE0079
4-
#pragma warning disable SA1121 // Use built-in type alias
4+
#pragma warning disable SA1121
55

66
namespace Asp.Versioning;
77

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

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Asp.Versioning;
44

5-
#pragma warning disable CA1812
6-
75
using static System.String;
86

97
internal sealed class ApiVersionModelDebugView

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

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#pragma warning disable IDE0079
44
#pragma warning disable SA1121
5-
#pragma warning disable SA1114 // Parameter list should follow declaration
65

76
namespace Asp.Versioning;
87

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

33
namespace Asp.Versioning;
4-
#pragma warning disable CA1040
54

65
/// <summary>
76
/// Defines the behavior of an API that is version-neutral.

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3+
#pragma warning disable IDE0079
4+
#pragma warning disable SA1121
5+
36
namespace Asp.Versioning;
47

58
#if !NETSTANDARD1_0
@@ -13,7 +16,6 @@ namespace Asp.Versioning;
1316
#endif
1417

1518
#pragma warning disable IDE0079
16-
#pragma warning disable SA1121
1719

1820
/// <summary>
1921
/// Represents a HTTP Link header value.
@@ -570,13 +572,11 @@ public IEnumerator<KeyValuePair<StringSegment, StringSegment>> GetEnumerator()
570572
}
571573

572574
// REF: https://datatracker.ietf.org/doc/html/rfc8288#appendix-B.3 #9
573-
#pragma warning disable CA1308 // Normalize strings to uppercase
574575
#if NETSTANDARD1_0
575576
var key = remaining.Substring( start, end - start ).ToLowerInvariant();
576577
#else
577578
var key = new StringSegment( remaining.Substring( start, end - start ).ToLowerInvariant() );
578579
#endif
579-
#pragma warning restore CA1308 // Normalize strings to uppercase
580580

581581
start = end;
582582
ConsumeWhitespace();
@@ -649,10 +649,13 @@ private static StringSegment RemoveQuotes( StringSegment input )
649649
return input;
650650
}
651651

652+
#pragma warning disable IDE0056 // Use index operator
652653
private static bool IsQuoted( StringSegment input ) =>
653-
#pragma warning disable IDE0056
654-
!StringSegment.IsNullOrEmpty( input ) && input.Length >= 2 && input[0] == '"' && input[input.Length - 1] == '"';
655-
#pragma warning restore IDE0056
654+
!StringSegment.IsNullOrEmpty( input ) &&
655+
input.Length >= 2 &&
656+
input[0] == '"' &&
657+
input[input.Length - 1] == '"';
658+
#pragma warning restore IDE0056 // Use index operator
656659

657660
private static StringSegment UnescapeAsQuotedString( StringSegment input )
658661
{

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

-5
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 <see cref="ApiVersion">version</see>-specific implementation of an API.
129
/// </summary>
@@ -38,7 +35,5 @@ public MapToApiVersionAttribute( double version ) : base( version ) { }
3835
/// <param name="version">The API version string.</param>
3936
public MapToApiVersionAttribute( string version ) : base( version ) { }
4037

41-
#pragma warning disable CA1033
4238
ApiVersionProviderOptions IApiVersionProvider.Options => ApiVersionProviderOptions.Mapped;
43-
#pragma warning restore CA1033
4439
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

33
#pragma warning disable IDE0079
4+
#pragma warning disable SA1114
45
#pragma warning disable SA1121
5-
#pragma warning disable SA1114 // Parameter list should follow declaration
66

77
namespace Asp.Versioning;
88

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

33
#pragma warning disable IDE0079
4-
#pragma warning disable SA1121 // Use built-in type alias
4+
#pragma warning disable SA1121
55

66
namespace Asp.Versioning;
77

‎src/Abstractions/src/Asp.Versioning.Abstractions/net7.0/ApiVersion.cs

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ public partial class ApiVersion : ISpanFormattable
1111
public virtual bool TryFormat( Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider )
1212
{
1313
var instance = ApiVersionFormatProvider.GetInstance( provider );
14-
#pragma warning disable CA1062 // Validate arguments of public methods
1514
return instance.TryFormat( destination, out charsWritten, format, this, provider );
16-
#pragma warning restore CA1062 // Validate arguments of public methods
1715
}
1816
}

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/Basic/Controllers/OrdersController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3+
#pragma warning disable IDE0060
4+
35
namespace Asp.Versioning.Http.Basic.Controllers;
46

57
using Asp.Versioning.Http.Basic.Models;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/Basic/Controllers/OverlappingRouteTemplateController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3+
#pragma warning disable IDE0060
4+
35
namespace Asp.Versioning.Http.Basic.Controllers;
46

57
using System.Web.Http;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/UsingConventions/Controllers/OrdersController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3+
#pragma warning disable IDE0060
4+
35
namespace Asp.Versioning.Http.UsingConventions.Controllers;
46

57
using Asp.Versioning.Http.UsingConventions.Models;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/Http/UsingNamespace/Controllers/V1/OrdersController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3+
#pragma warning disable IDE0060
4+
35
namespace Asp.Versioning.Http.UsingNamespace.Controllers.V1;
46

57
using Asp.Versioning.Http.UsingNamespace.Models;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/OData/Basic/Controllers/WeatherForecastsController.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

33
#pragma warning disable IDE0060 // Remove unused parameter
4-
#pragma warning disable CA1822 // Mark members as static
54

65
namespace Asp.Versioning.OData.Basic.Controllers;
76

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/OData/Configuration/CustomerModelConfiguration.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3-
#pragma warning disable CA1062 // Validate arguments of public methods
4-
53
namespace Asp.Versioning.OData.Configuration;
64

75
using Asp.Versioning.OData.Models;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/OData/Configuration/OrderModelConfiguration.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3-
#pragma warning disable CA1062 // Validate arguments of public methods
4-
53
namespace Asp.Versioning.OData.Configuration;
64

75
using Asp.Versioning.OData.Models;

‎src/AspNet/Acceptance/Asp.Versioning.WebApi.Acceptance.Tests/OData/Configuration/PersonModelConfiguration.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22

3-
#pragma warning disable CA1062 // Validate arguments of public methods
4-
53
namespace Asp.Versioning.OData.Configuration;
64

75
using Asp.Versioning.OData.Models;

0 commit comments

Comments
 (0)