Skip to content

Commit ad41366

Browse files
committed
Adapt configuration key names to .NET naming convention, inline constants
1 parent e070a2a commit ad41366

21 files changed

+34
-72
lines changed

src/Management/src/Endpoint/Actuators/CloudFoundry/ConfigureCloudFoundryEndpointOptions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
namespace Steeltoe.Management.Endpoint.Actuators.CloudFoundry;
99

1010
internal sealed class ConfigureCloudFoundryEndpointOptions(IConfiguration configuration)
11-
: ConfigureEndpointOptions<CloudFoundryEndpointOptions>(configuration, ManagementInfoPrefix, string.Empty)
11+
: ConfigureEndpointOptions<CloudFoundryEndpointOptions>(configuration, "Management:Endpoints:CloudFoundry", string.Empty)
1212
{
13-
private const string ManagementInfoPrefix = "management:endpoints:cloudfoundry";
1413
private const string VcapApplicationIdKey = "vcap:application:application_id";
1514
private const string VcapApplicationCloudfoundryApiKey = "vcap:application:cf_api";
1615

src/Management/src/Endpoint/Actuators/DbMigrations/ConfigureDbMigrationsEndpointOptions.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,4 @@
88
namespace Steeltoe.Management.Endpoint.Actuators.DbMigrations;
99

1010
internal sealed class ConfigureDbMigrationsEndpointOptions(IConfiguration configuration)
11-
: ConfigureEndpointOptions<DbMigrationsEndpointOptions>(configuration, ManagementInfoPrefix, "dbmigrations")
12-
{
13-
private const string ManagementInfoPrefix = "management:endpoints:dbmigrations";
14-
}
11+
: ConfigureEndpointOptions<DbMigrationsEndpointOptions>(configuration, "Management:Endpoints:DbMigrations", "dbmigrations");

src/Management/src/Endpoint/Actuators/Environment/ConfigureEnvironmentEndpointOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
namespace Steeltoe.Management.Endpoint.Actuators.Environment;
99

1010
internal sealed class ConfigureEnvironmentEndpointOptions(IConfiguration configuration)
11-
: ConfigureEndpointOptions<EnvironmentEndpointOptions>(configuration, ManagementInfoPrefix, "env")
11+
: ConfigureEndpointOptions<EnvironmentEndpointOptions>(configuration, "Management:Endpoints:Env", "env")
1212
{
13-
private const string ManagementInfoPrefix = "management:endpoints:env";
14-
1513
private static readonly string[] DefaultKeysToSanitize =
1614
[
1715
"password",

src/Management/src/Endpoint/Actuators/Health/ConfigureHealthEndpointOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
namespace Steeltoe.Management.Endpoint.Actuators.Health;
1010

1111
internal sealed class ConfigureHealthEndpointOptions(IConfiguration configuration)
12-
: ConfigureEndpointOptions<HealthEndpointOptions>(configuration, HealthOptionsPrefix, "health")
12+
: ConfigureEndpointOptions<HealthEndpointOptions>(configuration, "Management:Endpoints:Health", "health")
1313
{
14-
private const string HealthOptionsPrefix = "management:endpoints:health";
15-
1614
public override void Configure(HealthEndpointOptions options)
1715
{
1816
ArgumentNullException.ThrowIfNull(options);

src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigureDiskSpaceContributorOptions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
99

1010
internal sealed class ConfigureDiskSpaceContributorOptions : IConfigureOptionsWithKey<DiskSpaceContributorOptions>
1111
{
12-
private const string ManagementInfoPrefix = "management:endpoints:health:diskspace";
1312
private readonly IConfiguration _configuration;
1413

15-
public string ConfigurationKey => ManagementInfoPrefix;
14+
public string ConfigurationKey => "Management:Endpoints:Health:DiskSpace";
1615

1716
public ConfigureDiskSpaceContributorOptions(IConfiguration configuration)
1817
{
@@ -25,6 +24,6 @@ public void Configure(DiskSpaceContributorOptions options)
2524
{
2625
ArgumentNullException.ThrowIfNull(options);
2726

28-
_configuration.GetSection(ManagementInfoPrefix).Bind(options);
27+
_configuration.GetSection(ConfigurationKey).Bind(options);
2928
}
3029
}

src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigureLivenessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal sealed class ConfigureLivenessStateContributorOptions : IConfigureOptio
1111
{
1212
private readonly IConfiguration _configuration;
1313

14-
public string ConfigurationKey => "management:endpoints:health:liveness";
14+
public string ConfigurationKey => "Management:Endpoints:Health:Liveness";
1515

1616
public ConfigureLivenessStateContributorOptions(IConfiguration configuration)
1717
{

src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigurePingContributorOptions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
99

1010
internal sealed class ConfigurePingContributorOptions : IConfigureOptionsWithKey<PingContributorOptions>
1111
{
12-
private const string ManagementInfoPrefix = "management:endpoints:health:ping";
1312
private readonly IConfiguration _configuration;
1413

15-
public string ConfigurationKey => ManagementInfoPrefix;
14+
public string ConfigurationKey => "Management:Endpoints:Health:Ping";
1615

1716
public ConfigurePingContributorOptions(IConfiguration configuration)
1817
{
@@ -25,6 +24,6 @@ public void Configure(PingContributorOptions options)
2524
{
2625
ArgumentNullException.ThrowIfNull(options);
2726

28-
_configuration.GetSection(ManagementInfoPrefix).Bind(options);
27+
_configuration.GetSection(ConfigurationKey).Bind(options);
2928
}
3029
}

src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigureReadinessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal sealed class ConfigureReadinessStateContributorOptions : IConfigureOpti
1111
{
1212
private readonly IConfiguration _configuration;
1313

14-
public string ConfigurationKey => "management:endpoints:health:readiness";
14+
public string ConfigurationKey => "Management:Endpoints:Health:Readiness";
1515

1616
public ConfigureReadinessStateContributorOptions(IConfiguration configuration)
1717
{

src/Management/src/Endpoint/Actuators/HeapDump/ConfigureHeapDumpEndpointOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
namespace Steeltoe.Management.Endpoint.Actuators.HeapDump;
1010

1111
internal sealed class ConfigureHeapDumpEndpointOptions(IConfiguration configuration)
12-
: ConfigureEndpointOptions<HeapDumpEndpointOptions>(configuration, ManagementInfoPrefix, "heapdump")
12+
: ConfigureEndpointOptions<HeapDumpEndpointOptions>(configuration, "Management:Endpoints:Heapdump", "heapdump")
1313
{
14-
private const string ManagementInfoPrefix = "management:endpoints:heapdump";
15-
1614
public override void Configure(HeapDumpEndpointOptions options)
1715
{
1816
base.Configure(options);

src/Management/src/Endpoint/Actuators/HttpExchanges/ConfigureHttpExchangesEndpointOptions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
namespace Steeltoe.Management.Endpoint.Actuators.HttpExchanges;
1010

1111
internal sealed class ConfigureHttpExchangesEndpointOptions(IConfiguration configuration)
12-
: ConfigureEndpointOptions<HttpExchangesEndpointOptions>(configuration, ManagementInfoPrefix, "httpexchanges")
12+
: ConfigureEndpointOptions<HttpExchangesEndpointOptions>(configuration, "Management:Endpoints:HttpExchanges", "httpexchanges")
1313
{
14-
private const string ManagementInfoPrefix = "management:endpoints:httpexchanges";
1514
private const int DefaultCapacity = 100;
1615

1716
private static readonly string[] DefaultAllowedRequestHeaders =

0 commit comments

Comments
 (0)