Skip to content

Commit 10d2e10

Browse files
bart-vmwarebart-vmware
committed
Refactor tests for health contributors, move availability contributors to matching namespace
1 parent 0f3e74f commit 10d2e10

16 files changed

Lines changed: 797 additions & 214 deletions

src/Management/src/Endpoint/Actuators/Health/Availability/AvailabilityStateHealthContributor.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/AvailabilityStateHealthContributor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
using Microsoft.Extensions.Logging;
66
using Steeltoe.Common.HealthChecks;
7+
using Steeltoe.Management.Endpoint.Actuators.Health.Availability;
78

8-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
9+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
910

1011
internal abstract class AvailabilityStateHealthContributor : IHealthContributor
1112
{

src/Management/src/Endpoint/Actuators/Health/Availability/ConfigureLivenessStateContributorOptions.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigureLivenessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Extensions.Configuration;
66
using Steeltoe.Management.Endpoint.Configuration;
77

8-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
8+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
99

1010
internal sealed class ConfigureLivenessStateContributorOptions : IConfigureOptionsWithKey<LivenessStateContributorOptions>
1111
{

src/Management/src/Endpoint/Actuators/Health/Availability/ConfigureReadinessStateContributorOptions.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/ConfigureReadinessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Extensions.Configuration;
66
using Steeltoe.Management.Endpoint.Configuration;
77

8-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
8+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
99

1010
internal sealed class ConfigureReadinessStateContributorOptions : IConfigureOptionsWithKey<ReadinessStateContributorOptions>
1111
{

src/Management/src/Endpoint/Actuators/Health/Availability/LivenessStateContributorOptions.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/LivenessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
5+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
66

77
public sealed class LivenessStateContributorOptions
88
{

src/Management/src/Endpoint/Actuators/Health/Availability/LivenessStateHealthContributor.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/LivenessStateHealthContributor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
using Microsoft.Extensions.Logging;
66
using Microsoft.Extensions.Options;
77
using Steeltoe.Common.HealthChecks;
8+
using Steeltoe.Management.Endpoint.Actuators.Health.Availability;
89

9-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
10+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
1011

1112
internal sealed class LivenessStateHealthContributor : AvailabilityStateHealthContributor
1213
{

src/Management/src/Endpoint/Actuators/Health/Availability/ReadinessStateContributorOptions.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/ReadinessStateContributorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
5+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
66

77
public sealed class ReadinessStateContributorOptions
88
{

src/Management/src/Endpoint/Actuators/Health/Availability/ReadinessStateHealthContributor.cs renamed to src/Management/src/Endpoint/Actuators/Health/Contributors/ReadinessStateHealthContributor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
using Microsoft.Extensions.Logging;
66
using Microsoft.Extensions.Options;
77
using Steeltoe.Common.HealthChecks;
8+
using Steeltoe.Management.Endpoint.Actuators.Health.Availability;
89

9-
namespace Steeltoe.Management.Endpoint.Actuators.Health.Availability;
10+
namespace Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
1011

1112
internal sealed class ReadinessStateHealthContributor : AvailabilityStateHealthContributor
1213
{

‎src/Management/src/Endpoint/Actuators/Health/PostConfigureHealthEndpointOptions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using Microsoft.Extensions.Options;
66
using Steeltoe.Management.Endpoint.Actuators.Health.Availability;
7+
using Steeltoe.Management.Endpoint.Actuators.Health.Contributors;
78

89
namespace Steeltoe.Management.Endpoint.Actuators.Health;
910

‎src/Management/src/Endpoint/PublicAPI.Unshipped.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,7 @@ Steeltoe.Management.Endpoint.Actuators.Health.Availability.AvailabilityEventArgs
111111
Steeltoe.Management.Endpoint.Actuators.Health.Availability.AvailabilityState
112112
Steeltoe.Management.Endpoint.Actuators.Health.Availability.AvailabilityState.AvailabilityState(string! value) -> void
113113
Steeltoe.Management.Endpoint.Actuators.Health.Availability.LivenessState
114-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.LivenessStateContributorOptions
115-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.LivenessStateContributorOptions.Enabled.get -> bool
116-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.LivenessStateContributorOptions.Enabled.set -> void
117-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.LivenessStateContributorOptions.LivenessStateContributorOptions() -> void
118114
Steeltoe.Management.Endpoint.Actuators.Health.Availability.ReadinessState
119-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.ReadinessStateContributorOptions
120-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.ReadinessStateContributorOptions.Enabled.get -> bool
121-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.ReadinessStateContributorOptions.Enabled.set -> void
122-
Steeltoe.Management.Endpoint.Actuators.Health.Availability.ReadinessStateContributorOptions.ReadinessStateContributorOptions() -> void
123115
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions
124116
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions.DiskSpaceContributorOptions() -> void
125117
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions.Enabled.get -> bool
@@ -128,6 +120,14 @@ Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorO
128120
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions.Path.set -> void
129121
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions.Threshold.get -> long
130122
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.DiskSpaceContributorOptions.Threshold.set -> void
123+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.LivenessStateContributorOptions
124+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.LivenessStateContributorOptions.Enabled.get -> bool
125+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.LivenessStateContributorOptions.Enabled.set -> void
126+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.LivenessStateContributorOptions.LivenessStateContributorOptions() -> void
127+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.ReadinessStateContributorOptions
128+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.ReadinessStateContributorOptions.Enabled.get -> bool
129+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.ReadinessStateContributorOptions.Enabled.set -> void
130+
Steeltoe.Management.Endpoint.Actuators.Health.Contributors.ReadinessStateContributorOptions.ReadinessStateContributorOptions() -> void
131131
Steeltoe.Management.Endpoint.Actuators.Health.EndpointClaim
132132
Steeltoe.Management.Endpoint.Actuators.Health.EndpointClaim.EndpointClaim() -> void
133133
Steeltoe.Management.Endpoint.Actuators.Health.EndpointClaim.Type.get -> string?

‎src/Management/test/Endpoint.Test/Actuators/Health/Availability/LivenessStateHealthContributorTest.cs‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)